feat: migrate fish

modules/base/default.nix

@@ -5,6 +5,8 @@
     ./nix.nix
     ./stylix
 
+    ./programs
+
     ./home.nix
   ];
 }

modules/base/programs/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./fish.nix
+  ];
+}

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];
   };
 }

modules/darwin/default.nix

@@ -4,5 +4,7 @@
 
     ../base
     ./base
+
+    ./programs
   ];
 }

modules/darwin/programs/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./fish.nix
+  ];
+}

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];
+  };
+}

modules/nixos/default.nix

@@ -6,5 +6,7 @@
 
     ./base
     ./hardware
+
+    ./programs
   ];
 }

modules/nixos/programs/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./fish.nix
+  ];
+}

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;
   };
 }