diff --git a/modules/base/default.nix b/modules/base/default.nix
index 91409b4..91c58be 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -5,6 +5,8 @@
     ./nix.nix
     ./stylix
 
+    ./programs
+
     ./home.nix
   ];
 }
diff --git a/modules/base/programs/default.nix b/modules/base/programs/default.nix
new file mode 100644
index 0000000..56cb916
--- /dev/null
+++ b/modules/base/programs/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./fish.nix
+  ];
+}
diff --git a/snowflake/modules/darwin/programs/fish/default.nix b/modules/base/programs/fish.nix
similarity index 81%
rename from snowflake/modules/darwin/programs/fish/default.nix
rename to modules/base/programs/fish.nix
index dc14592..578bf5a 100644
--- a/snowflake/modules/darwin/programs/fish/default.nix
+++ b/modules/base/programs/fish.nix
@@ -10,10 +10,7 @@ in {
   config = lib.mkIf cfg.enable {
     programs.fish = {
       enable = true;
-
       useBabelfish = true;
     };
-
-    environment.shells = [config.programs.fish.package];
   };
 }
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index f7de3ff..95bdaf3 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -4,5 +4,7 @@
 
     ../base
     ./base
+
+    ./programs
   ];
 }
diff --git a/modules/darwin/programs/default.nix b/modules/darwin/programs/default.nix
new file mode 100644
index 0000000..56cb916
--- /dev/null
+++ b/modules/darwin/programs/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./fish.nix
+  ];
+}
diff --git a/modules/darwin/programs/fish.nix b/modules/darwin/programs/fish.nix
new file mode 100644
index 0000000..cd4cee4
--- /dev/null
+++ b/modules/darwin/programs/fish.nix
@@ -0,0 +1,11 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.marleyos.programs.fish;
+in {
+  config = lib.mkIf cfg.enable {
+    environment.shells = [config.programs.fish.package];
+  };
+}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 79e9b48..976843e 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -6,5 +6,7 @@
 
     ./base
     ./hardware
+
+    ./programs
   ];
 }
diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix
new file mode 100644
index 0000000..56cb916
--- /dev/null
+++ b/modules/nixos/programs/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./fish.nix
+  ];
+}
diff --git a/snowflake/modules/nixos/programs/cli/fish/default.nix b/modules/nixos/programs/fish.nix
similarity index 54%
rename from snowflake/modules/nixos/programs/cli/fish/default.nix
rename to modules/nixos/programs/fish.nix
index 972fdfd..8a70cd6 100644
--- a/snowflake/modules/nixos/programs/cli/fish/default.nix
+++ b/modules/nixos/programs/fish.nix
@@ -5,14 +5,7 @@
 }: let
   cfg = config.marleyos.programs.fish;
 in {
-  options.marleyos.programs.fish.enable = lib.mkEnableOption "fish";
-
   config = lib.mkIf cfg.enable {
-    programs.fish = {
-      enable = true;
-      useBabelfish = true;
-    };
-
     users.defaultUserShell = config.programs.fish.package;
   };
 }