diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index 68fb6f7..2bdf81b 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -21,16 +21,15 @@ in
     users.${v.username}.imports = [ ../../home ];
   };
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.${v.username} = {
     isNormalUser = true;
     description = "Lars Tveito";
     home = v.userHome;
+    shell = pkgs.fish;
     extraGroups = [
       "networkmanager"
       "wheel"
     ];
-    packages = with pkgs; [ ]; # keep empty; HM will provide user packages
   };
 
   networking.hostName = v.hostName;
diff --git a/system/nixos/default.nix b/system/nixos/default.nix
index 346550e..857bfad 100644
--- a/system/nixos/default.nix
+++ b/system/nixos/default.nix
@@ -1,4 +1,7 @@
 { pkgs, ... }:
 {
   fonts.packages = import ../../home/fonts { inherit pkgs; };
+
+  programs.fish.enable = true;
+  environment.shells = [ pkgs.fish ];
 }