Reorganize modules

hosts/balrog/default.nix

@@ -12,21 +12,21 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../modules/home-manager.nix
-    ../modules/common.nix
-    ../modules/users.nix
-    ../modules/locales.nix
-    ../modules/services.nix
-    ../modules/programs.nix
-    ../modules/docker.nix
-    ../modules/printing.nix
-    ../modules/bambu-studio-flatpak.nix
-    ../modules/arduino-ide.nix
-    ../modules/devenv.nix
-    ../modules/vlc.nix
-    ../modules/btop.nix
-    ../modules/lazygit.nix
-    #    ../modules/bitwarden.nix
+    ../../modules/home-manager.nix
+    ../../modules/common.nix
+    ../../modules/users.nix
+    ../../modules/locales.nix
+    ../../modules/services.nix
+    ../../modules/programs.nix
+    ../../modules/docker.nix
+    ../../modules/printing.nix
+    ../../modules/bambu-studio-flatpak.nix
+    ../../modules/arduino-ide.nix
+    ../../modules/devenv.nix
+    ../../modules/vlc.nix
+    ../../modules/btop.nix
+    ../../modules/lazygit.nix
+    #    ../../modules/bitwarden.nix
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;

hosts/frodo/default.nix

@@ -8,11 +8,11 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../modules/common.nix
-    ../modules/users.nix
-    ../modules/locales.nix
-    ../modules/services.nix
-    ../modules/programs.nix
+    ../../modules/common.nix
+    ../../modules/users.nix
+    ../../modules/locales.nix
+    ../../modules/services.nix
+    ../../modules/programs.nix
   ];
 
   # Bootloader.

hosts/gandalf/default.nix

@@ -3,34 +3,34 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../modules/home-manager.nix
-    ../modules/common.nix
-    ../modules/users.nix
-    ../modules/locales.nix
-    ../modules/services.nix
-    ../modules/programs.nix
-    ../modules/gaming.nix
-    ../modules/obs-studio.nix
-    ../modules/garbage-collection.nix
-    ../modules/printing.nix
-    ../modules/docker.nix
-    ../modules/matrix.nix
-    ../modules/kdenlive.nix
-    ../modules/audacity.nix
-    ../modules/ollama.nix
-    ../modules/wireguard.nix
-    ../modules/qbittorrent.nix
-    ../modules/gimp.nix
-    ../modules/openscad.nix
-    ../modules/bambu-studio-flatpak.nix
-    ../modules/arduino-ide.nix
-    ../modules/bitwarden.nix
-    ../modules/vlc.nix
-    ../modules/devenv.nix
-    ../modules/btop.nix
-    ../modules/discord.nix
-    ../modules/lazygit.nix
-    ../modules/yazi.nix
+    ../../modules/home-manager.nix
+    ../../modules/common.nix
+    ../../modules/users.nix
+    ../../modules/locales.nix
+    ../../modules/services.nix
+    ../../modules/programs.nix
+    ../../modules/gaming.nix
+    ../../modules/obs-studio.nix
+    ../../modules/garbage-collection.nix
+    ../../modules/printing.nix
+    ../../modules/docker.nix
+    ../../modules/matrix.nix
+    ../../modules/kdenlive.nix
+    ../../modules/audacity.nix
+    ../../modules/ollama.nix
+    ../../modules/wireguard.nix
+    ../../modules/qbittorrent.nix
+    ../../modules/gimp.nix
+    ../../modules/openscad.nix
+    ../../modules/bambu-studio-flatpak.nix
+    ../../modules/arduino-ide.nix
+    ../../modules/bitwarden.nix
+    ../../modules/vlc.nix
+    ../../modules/devenv.nix
+    ../../modules/btop.nix
+    ../../modules/discord.nix
+    ../../modules/lazygit.nix
+    ../../modules/yazi.nix
     ./mtp-fix.nix
   ];
 

hosts/legolas/default.nix

@@ -3,12 +3,12 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../modules/common.nix
-    ../modules/users.nix
-    ../modules/locales.nix
-    ../modules/services.nix
-    ../modules/programs.nix
-    ../modules/gaming.nix
+    ../../modules/common.nix
+    ../../modules/users.nix
+    ../../modules/locales.nix
+    ../../modules/services.nix
+    ../../modules/programs.nix
+    ../../modules/gaming.nix
   ];
 
   boot.loader.systemd-boot.enable = true;

hosts/work/default.nix

@@ -3,30 +3,30 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../modules/home-manager.nix
-    ../modules/common.nix
-    ../modules/users.nix
-    ../modules/locales.nix
-    ../modules/services.nix
-    ../modules/programs.nix
-    ../modules/garbage-collection.nix
-    ../modules/printing.nix
-    ../modules/docker.nix
-    ../modules/teams-for-linux.nix
-    ../modules/azure-data-studio.nix
-    ../modules/filezilla.nix
-    ../modules/wireguard.nix
-    ../modules/remmina.nix
-    ../modules/postman.nix
-    ../modules/gimp.nix
-    ../modules/jq.nix
-    ../modules/enova.nix
-    ../modules/devenv.nix
-    ../modules/bitwarden.nix
-    ../modules/btop.nix
-    ../modules/vlc.nix
-    ../modules/lazygit.nix
-    ../modules/yazi.nix
+    ../../modules/home-manager.nix
+    ../../modules/common.nix
+    ../../modules/users.nix
+    ../../modules/locales.nix
+    ../../modules/services.nix
+    ../../modules/programs.nix
+    ../../modules/garbage-collection.nix
+    ../../modules/printing.nix
+    ../../modules/docker.nix
+    ../../modules/teams-for-linux.nix
+    ../../modules/azure-data-studio.nix
+    ../../modules/filezilla.nix
+    ../../modules/wireguard.nix
+    ../../modules/remmina.nix
+    ../../modules/postman.nix
+    ../../modules/gimp.nix
+    ../../modules/jq.nix
+    ../../modules/enova.nix
+    ../../modules/devenv.nix
+    ../../modules/bitwarden.nix
+    ../../modules/btop.nix
+    ../../modules/vlc.nix
+    ../../modules/lazygit.nix
+    ../../modules/yazi.nix
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;

outputs.nix

@@ -6,75 +6,37 @@
 }:
 
 let
-  mkPkgsUnstable =
-    system:
-    import nixpkgs-unstable {
-      inherit system;
-      config.allowUnfree = true;
-    };
-in
+  system = "x86_64-linux";
 
+  pkgsUnstable = import nixpkgs-unstable {
+    inherit system;
+    config.allowUnfree = true;
+  };
+
+  mkHost =
+    name:
+    nixpkgs.lib.nixosSystem {
+      inherit system;
+
+      specialArgs = {
+        inherit pkgsUnstable;
+        nixFlatpak = nix-flatpak;
+      };
+
+      modules = [
+        nix-flatpak.nixosModules.nix-flatpak
+        home-manager.nixosModules.home-manager
+        ./hosts/${name}
+      ];
+    };
+
+in
 {
   nixosConfigurations = {
-    "gandalf" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
-      };
-      modules = [
-        nix-flatpak.nixosModules.nix-flatpak
-        home-manager.nixosModules.home-manager
-        ./systems/gandalf
-      ];
-    };
-    "frodo" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
-      };
-      modules = [
-        nix-flatpak.nixosModules.nix-flatpak
-        home-manager.nixosModules.home-manager
-        ./systems/frodo
-      ];
-    };
-    "legolas" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
-      };
-      modules = [
-        nix-flatpak.nixosModules.nix-flatpak
-        home-manager.nixosModules.home-manager
-        ./systems/legolas
-      ];
-    };
-    "balrog" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
-      };
-      modules = [
-        nix-flatpak.nixosModules.nix-flatpak
-        home-manager.nixosModules.home-manager
-        ./systems/balrog
-      ];
-    };
-    "work" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
-      };
-      modules = [
-        nix-flatpak.nixosModules.nix-flatpak
-        home-manager.nixosModules.home-manager
-        ./systems/work
-      ];
-    };
+    gandalf = mkHost "gandalf";
+    frodo = mkHost "frodo";
+    legolas = mkHost "legolas";
+    balrog = mkHost "balrog";
+    work = mkHost "work";
   };
 }