From 50506d6fda7d721a7996194ff7350634b650b00a Mon Sep 17 00:00:00 2001
From: scouckel <james.krinsky@gmail.com>
Date: Sun, 25 Jan 2026 12:15:23 -0600
Subject: move fish

---
 hosts/tiamat/configuration.nix |  1 +
 hosts/vecna/configuration.nix  |  1 +
 modules/home-manager/fish.nix  | 18 ------------------
 modules/home-manager/kitty.nix |  4 ----
 modules/nixos/default.nix      |  3 +++
 modules/nixos/fish.nix         | 18 ++++++++++++++++++
 6 files changed, 23 insertions(+), 22 deletions(-)
 delete mode 100644 modules/home-manager/fish.nix
 create mode 100644 modules/nixos/fish.nix

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/fish.nix b/modules/home-manager/fish.nix
deleted file mode 100644
index e38d149..0000000
--- a/modules/home-manager/fish.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.fish = {
-    enable = true;
-
-    shellInit = ''
-      function fish_greeting
-        fastfetch
-      end
-    '';
-
-    plugins = [
-      { name = "grc"; src = pkgs.fishPlugins.grc; }
-      { name = "bang-bang"; src = pkgs.fishPlugins.bang-bang; }
-    ];
-  };
-}
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/nixos/fish.nix b/modules/nixos/fish.nix
new file mode 100644
index 0000000..e38d149
--- /dev/null
+++ b/modules/nixos/fish.nix
@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+
+{
+  programs.fish = {
+    enable = true;
+
+    shellInit = ''
+      function fish_greeting
+        fastfetch
+      end
+    '';
+
+    plugins = [
+      { name = "grc"; src = pkgs.fishPlugins.grc; }
+      { name = "bang-bang"; src = pkgs.fishPlugins.bang-bang; }
+    ];
+  };
+}
-- 
cgit v1.3