got it working even more

configuration.nix

@@ -16,7 +16,7 @@
   ];
   imports = [
     # Include the results of the hardware scan.
-    ./system/import_system.nix
+    ./system
     ./user/marty.nix
 
   ];

flake.nix

@@ -31,7 +31,7 @@
           system = "x86_64-linux";
           specialArgs = { inherit inputs; };
           modules = [
-            ./hosts/marty-pc.nix
+            ./hosts/marty-pc
             ./configuration.nix
             home-manager.nixosModules.home-manager
           ];
@@ -40,7 +40,7 @@
           system = "x86_64-linux";
           specialArgs = { inherit inputs; };
           modules = [
-            ./hosts/marty-server.nix
+            ./hosts/marty-server
             ./configuration.nix
             home-manager.nixosModules.home-manager
 
@@ -50,7 +50,7 @@
           system = "x86_64-linux";
           specialArgs = { inherit inputs; };
           modules = [
-            ./hosts/marty-latitude.nix
+            ./hosts/marty-latitude
             ./configuration.nix
             home-manager.nixosModules.home-manager
           ];

hosts/marty-latitude/default.nix

@@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  pkgs,
+  home-manager,
+  inputs,
+  ...
+}:
+
+{
+  networking = {
+    hostName = "marty-latitude";
+  };
+
+  home-manager = {
+    extraSpecialArgs = { inherit inputs; };
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users = {
+      marty = import ./home.nix;
+    };
+  };
+
+  imports = [ ./hardware.nix ];
+}

hosts/marty-latitude/hardware.nix

@@ -3,27 +3,10 @@
   lib,
   pkgs,
   modulesPath,
-  home-manager,
-  inputs,
   ...
 }:
 
 {
-  networking = {
-    hostName = "marty-latitude";
-  };
-
-
-  home-manager = {
-    extraSpecialArgs = { inherit inputs; };
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    users = {
-      marty = import ./../modules/home.nix;
-    };
-  };
-
-  # PREVIOUSLY HARDWARE-CONFIGURATION.NIX
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];

hosts/marty-latitude/home.nix

@@ -82,7 +82,6 @@
     EDITOR = "codium";
   };
 
-
   development = {
     vscodium.enable = true;
     git.enable = true;
@@ -98,10 +97,8 @@
   };
 
   imports = [
-    ./window_manager
-    ./development
-    ./terminal
     inputs.walker.homeManagerModules.default
+    ./../../modules
 
   ];
   # Let Home Manager install and manage itself.

hosts/marty-pc.nix

@@ -1,87 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  home-manager,
-  inputs,
-  ...
-}:
-
-{
-  networking = {
-    hostName = "marty-pc";
-    interfaces = {
-      enp42s0 = {
-        wakeOnLan = {
-          enable = true;
-          policy = [ "magic" ];
-        };
-      };
-    };
-  };
-
-  development = {
-    vscodium.enable = true;
-    git.enable = true;
-  };
-  terminal = {
-    kitty.enable = true;
-  };
-  window_manager = {
-    hyprland.enable = true;
-    waybar.enable = true;
-    walker.enable = true;
-  };
-
-  home-manager = {
-    extraSpecialArgs = { inherit inputs; };
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    users = {
-      marty = import ./../modules/home.nix;
-    };
-  };
-
-  # PREVIOUSLY HARDWARE-CONFIGURATION.NIX
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "ahci"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/a26cdc8b-abc9-47cf-ad33-c81e56e56d22";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/C9B2-7254";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
-    ];
-  };
-  fileSystems = {
-    "/mnt/SSD" = {
-      device = "/dev/disk/by-uuid/af5282f0-0e02-4532-902f-97509af70d11";
-      fsType = "ext4";
-    };
-    "/mnt/HDD" = {
-      device = "/dev/disk/by-uuid/41e7ec41-2e43-4254-9f00-f4be98cddc6e";
-      fsType = "ext4";
-    };
-  };
-
-}

hosts/marty-pc/default.nix

@@ -0,0 +1,35 @@
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  home-manager,
+  inputs,
+  ...
+}:
+
+{
+  networking = {
+    hostName = "marty-pc";
+    interfaces = {
+      enp42s0 = {
+        wakeOnLan = {
+          enable = true;
+          policy = [ "magic" ];
+        };
+      };
+    };
+  };
+
+  home-manager = {
+    extraSpecialArgs = { inherit inputs; };
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users = {
+      marty = import ./home.nix;
+    };
+  };
+
+  imports = [ ./hardware.nix ];
+
+}

hosts/marty-pc/hardware.nix

@@ -0,0 +1,53 @@
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/a26cdc8b-abc9-47cf-ad33-c81e56e56d22";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/C9B2-7254";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/24ecde92-b41b-4e41-8ebc-950d321db477"; }
+  ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp42s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/marty-pc/home.nix

@@ -0,0 +1,105 @@
+{
+  config,
+  pkgs,
+  inputs,
+  lib,
+  ...
+}:
+
+{
+  # Home Manager needs a bit of information about you and the paths it should
+  # manage.
+  home.username = "marty";
+  home.homeDirectory = "/home/marty";
+
+  # This value determines the Home Manager release that your configuration is
+  # compatible with. This helps avoid breakage when a new Home Manager release
+  # introduces backwards incompatible changes.
+  #
+  # You should not change this value, even if you update Home Manager. If you do
+  # want to update the value, then make sure to first check the Home Manager
+  # release notes.
+  home.stateVersion = "25.11"; # Please read the comment before changing.
+
+  # The home.packages option allows you to install Nix packages into your
+  # environment.
+
+  programs.fish.enable = true;
+
+  home.packages = with pkgs; [
+    # # Adds the 'hello' command to your environment. It prints a friendly
+    # # "Hello, world!" when run.
+    hello
+    rbw
+    pinentry-curses
+
+    # # It is sometimes useful to fine-tune packages, for example, by applying
+    # # overrides. You can do that directly here, just don't forget the
+    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
+    # # fonts?
+    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
+
+    # # You can also create simple shell scripts directly inside your
+    # # configuration. For example, this adds a command 'my-hello' to your
+    # # environment:
+    # (pkgs.writeShellScriptBin "my-hello" ''
+    #   echo "Hello, ${config.home.username}!"
+    # '')
+  ];
+
+  # Home Manager is pretty good at managing dotfiles. The primary way to manage
+  # plain files is through 'home.file'.
+  home.file = {
+    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
+    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
+    # # symlink to the Nix store copy.
+    # ".screenrc".source = dotfiles/screenrc;
+
+    # # You can also set the file content immediately.
+    # ".gradle/gradle.properties".text = ''
+    #   org.gradle.console=verbose
+    #   org.gradle.daemon.idletimeout=3600000
+    # '';
+  };
+
+  # Home Manager can also manage your environment variables through
+  # 'home.sessionVariables'. These will be explicitly sourced when using a
+  # shell provided by Home Manager. If you don't want to manage your shell
+  # through Home Manager then you have to manually source 'hm-session-vars.sh'
+  # located at either
+  #
+  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  /etc/profiles/per-user/marty/etc/profile.d/hm-session-vars.sh
+  #
+  home.sessionVariables = {
+    EDITOR = "codium";
+  };
+
+  development = {
+    vscodium.enable = true;
+    git.enable = true;
+  };
+  terminal = {
+    kitty.enable = true;
+  };
+  window_manager = {
+    hyprland.enable = true;
+    waybar.enable = true;
+    walker.enable = true;
+  };
+
+  imports = [
+    inputs.walker.homeManagerModules.default
+    ./../../modules
+
+  ];
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+}

hosts/marty-server.nix

@@ -1,83 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  home-manager,
-  inputs,
-  ...
-}:
-
-{
-  networking = {
-    hostName = "marty-server";
-    interfaces = {
-      eno1 = {
-        wakeOnLan = {
-          enable = true;
-          policy = [ "magic" ];
-        };
-      };
-    };
-  };
-
-  development = {
-    vscodium.enable = false;
-    git.enable = true;
-  };
-  terminal = {
-    kitty.enable = false;
-  };
-  window_manager = {
-    hyprland.enable = false;
-    waybar.enable = false;
-    walker.enable = false;
-  };
-
-  home-manager = {
-    extraSpecialArgs = { inherit inputs; };
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    users = {
-      marty = import ./../modules/home.nix;
-    };
-  };
-
-  # PREVIOUSLY HARDWARE-CONFIGURATION.NIX
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/a804bdf0-194c-4fe4-a451-64620d3d293d";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/44A5-B01F";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
-    ];
-  };
-
-  fileSystems = {
-    "/mnt/Data" = {
-      device = "/dev/disk/by-uuid/20eaea9c-6924-40c6-a784-cd5018d8fabb";
-      fsType = "ext4";
-    };
-  };
-}

hosts/marty-server/default.nix

@@ -0,0 +1,33 @@
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  home-manager,
+  inputs,
+  ...
+}:
+
+{
+  networking = {
+    hostName = "marty-server";
+    interfaces = {
+      eno1 = {
+        wakeOnLan = {
+          enable = true;
+          policy = [ "magic" ];
+        };
+      };
+    };
+  };
+
+  home-manager = {
+    extraSpecialArgs = { inherit inputs; };
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users = {
+      marty = import ./home.nix;
+    };
+  };
+  imports = [ ./hardware.nix ];
+}

hosts/marty-server/hardware.nix

@@ -0,0 +1,53 @@
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/a804bdf0-194c-4fe4-a451-64620d3d293d";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/44A5-B01F";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/1c087bce-8d50-4bb7-b84a-418e3fb7d359"; }
+  ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/marty-server/home.nix

@@ -0,0 +1,105 @@
+{
+  config,
+  pkgs,
+  inputs,
+  lib,
+  ...
+}:
+
+{
+  # Home Manager needs a bit of information about you and the paths it should
+  # manage.
+  home.username = "marty";
+  home.homeDirectory = "/home/marty";
+
+  # This value determines the Home Manager release that your configuration is
+  # compatible with. This helps avoid breakage when a new Home Manager release
+  # introduces backwards incompatible changes.
+  #
+  # You should not change this value, even if you update Home Manager. If you do
+  # want to update the value, then make sure to first check the Home Manager
+  # release notes.
+  home.stateVersion = "25.11"; # Please read the comment before changing.
+
+  # The home.packages option allows you to install Nix packages into your
+  # environment.
+
+  programs.fish.enable = true;
+
+  home.packages = with pkgs; [
+    # # Adds the 'hello' command to your environment. It prints a friendly
+    # # "Hello, world!" when run.
+    hello
+    rbw
+    pinentry-curses
+
+    # # It is sometimes useful to fine-tune packages, for example, by applying
+    # # overrides. You can do that directly here, just don't forget the
+    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
+    # # fonts?
+    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
+
+    # # You can also create simple shell scripts directly inside your
+    # # configuration. For example, this adds a command 'my-hello' to your
+    # # environment:
+    # (pkgs.writeShellScriptBin "my-hello" ''
+    #   echo "Hello, ${config.home.username}!"
+    # '')
+  ];
+
+  # Home Manager is pretty good at managing dotfiles. The primary way to manage
+  # plain files is through 'home.file'.
+  home.file = {
+    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
+    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
+    # # symlink to the Nix store copy.
+    # ".screenrc".source = dotfiles/screenrc;
+
+    # # You can also set the file content immediately.
+    # ".gradle/gradle.properties".text = ''
+    #   org.gradle.console=verbose
+    #   org.gradle.daemon.idletimeout=3600000
+    # '';
+  };
+
+  # Home Manager can also manage your environment variables through
+  # 'home.sessionVariables'. These will be explicitly sourced when using a
+  # shell provided by Home Manager. If you don't want to manage your shell
+  # through Home Manager then you have to manually source 'hm-session-vars.sh'
+  # located at either
+  #
+  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  /etc/profiles/per-user/marty/etc/profile.d/hm-session-vars.sh
+  #
+  home.sessionVariables = {
+    EDITOR = "codium";
+  };
+
+  development = {
+    vscodium.enable = false;
+    git.enable = true;
+  };
+  terminal = {
+    kitty.enable = false;
+  };
+  window_manager = {
+    hyprland.enable = false;
+    waybar.enable = false;
+    walker.enable = false;
+  };
+
+  imports = [
+    inputs.walker.homeManagerModules.default
+    ./../../modules
+
+  ];
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+}

modules/default.nix

@@ -0,0 +1,14 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [
+    ./development
+    ./terminal
+    ./window_manager
+  ];
+}

modules/terminal/default.nix

@@ -9,6 +9,7 @@
   imports = [
     ./kitty.nix
     ./ranger.nix
+    ./fish.nix
 
   ];
 }

modules/terminal/fish.nix

@@ -0,0 +1,22 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options = {
+    terminal = {
+      fish.enable = lib.mkEnableOption "enable fish";
+    };
+  };
+
+  config = lib.mkIf config.terminal.fish.enable {
+    programs = {
+      fish = {
+        enable = true;
+      };
+    };
+  };
+}

system/dm.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ...}:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
   services = {
@@ -15,4 +20,3 @@ autoSuspend = false;
     };
   };
 }
-

system/networking.nix

@@ -21,11 +21,3 @@
     };
   };
 }
-
-
-
-
-
-
-
-

system/shell.nix

@@ -3,13 +3,8 @@
 {
   environment = {
     systemPackages = with pkgs; [
-      fish
       coreutils
     ];
   };
-  # programs = {
-  #   fish = {
-  #     enable = true;
-  #   };
-  # };
+  programs.fish.enable = true;
 }

user/marty.nix

@@ -16,7 +16,7 @@
       "audio"
       "render"
     ];
-    # shell = pkgs.fish;
+    shell = pkgs.fish;
   };
 
   security.sudo = {