properly assigns the custom shell

modules/default.nix

@@ -7,7 +7,6 @@
     ./boot.nix
     ./docker.nix
     ./env.nix
-    ./fish.nix
     ./fonts.nix
     ./home-manager.nix
     ./i3-xfce.nix

modules/fish.nix

@@ -1,18 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  fish-rust = pkgs.callPackage ../pkgs/fish-rust { };
-in
-{
-  programs.fish = {
-    enable = true;
-    package = fish-rust;
-  };
-  environment.systemPackages = with pkgs; [
-    starship
-    fzf
-    bat
-    eza
-    fd
-    ripgrep
-  ];
-}

modules/user.nix

@@ -1,12 +1,16 @@
 { config, pkgs, lib, ... }:
 
+let
+  fish-rust = pkgs.callPackage ../pkgs/fish-rust { };
+in
+
 {
   # Define a user account. Don't forget to set a password with 'passwd'.
   users.users.cobray = {
     isNormalUser = true;
     description = "Mon Aie";
     extraGroups = [ "networkmanager" "wheel" "docker" "video" ];
-    shell = pkgs.fish;
+    shell = fish-rust;
     packages = with pkgs; [
       # User-specific packages can be defined here
       # or through home-manager
@@ -17,4 +21,9 @@
     enable = true;
     wheelNeedsPassword = true;
   };
+
+  programs.fish = {
+    enable = true;
+    package = fish-rust;
+  };
 }