move fish

5 files changed, 5 insertions, 4 deletions

diff --git a/hosts/tiamat/configuration.nix b/hosts/tiamat/configuration.nix
index 9f2d780..3e39067 100644
--- a/hosts/tiamat/configuration.nix
+++ b/hosts/tiamat/configuration.nix
@@ -88,6 +88,7 @@
     isNormalUser = true;
     description = "jck";
     extraGroups = [ "networkmanager" "wheel" ];
+    shell = pkgs.fish;
   };
 
   nixpkgs.config.allowUnfree = true;
diff --git a/hosts/vecna/configuration.nix b/hosts/vecna/configuration.nix
index 3284a04..fb6b0ed 100644
--- a/hosts/vecna/configuration.nix
+++ b/hosts/vecna/configuration.nix
@@ -86,6 +86,7 @@
     isNormalUser = true;
     description = "jck";
     extraGroups = [ "networkmanager" "wheel" ];
+    shell = pkgs.fish;
   };
 
   nixpkgs.config.allowUnfree = true;
diff --git a/modules/home-manager/kitty.nix b/modules/home-manager/kitty.nix
index b7d9f0b..1f44982 100644
--- a/modules/home-manager/kitty.nix
+++ b/modules/home-manager/kitty.nix
@@ -1,10 +1,6 @@
 { pkgs, ... }:
 
 {
-  imports = [
-    ./fish.nix
-  ];
-
   programs.kitty = {
     enable = true;
 
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 9babfdb..2c7123a 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -13,6 +13,7 @@
     # ./nordvpn.nix
     # ./ly.nix
     ./nas.nix
+    ./fish.nix
   ];
 
   users.users.jck.packages = with pkgs; [
@@ -75,4 +76,6 @@
   services.mullvad-vpn.enable = true;
   services.mullvad-vpn.package = pkgs.mullvad-vpn;
   services.mullvad-vpn.enableExcludeWrapper = true;
+
+  programs.fish.enable = true;
 }
diff --git a/modules/home-manager/fish.nix b/modules/nixos/fish.nix
index e38d149..e38d149 100644
--- a/modules/home-manager/fish.nix
+++ b/modules/nixos/fish.nix