move each machine configuration to a folder

This will give me a bit more flexibility to configure things per machine
in the future.

6 files changed, 51 insertions, 66 deletions

diff --git a/flake/hosts.nix b/flake/hosts.nix
index d855a4a..41e983d 100644
--- a/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -15,7 +15,6 @@ let
     mkIf
     nixosSystem
     readDir
-    replaceStrings
     substring
     ;
 
@@ -33,37 +32,25 @@ let
   mapHosts = foldl' (
     hosts: system:
     hosts
-    // (mapAttrs' (
-      filename: _:
-      let
-        name = replaceStrings [ ".nix" ] [ "" ] filename;
-      in
-      {
-        inherit name;
-        value = {
-          inherit system;
-          hostconf = "${self}/machines/nixos/${system}/${filename}";
-        };
-      }
-    ) (builtins.readDir "${self}/machines/nixos/${system}"))
+    // (mapAttrs' (name: _: {
+      inherit name;
+      value = {
+        inherit system;
+        hostconf = "${self}/machines/nixos/${system}/${name}";
+      };
+    }) (builtins.readDir "${self}/machines/nixos/${system}"))
   ) { };
 
   mapMacs = foldl' (
     hosts: system:
     hosts
-    // (mapAttrs' (
-      filename: _:
-      let
-        name = replaceStrings [ ".nix" ] [ "" ] filename;
-      in
-      {
-        inherit name;
-        value = {
-          inherit system;
-          hostconf = "${self}/machines/darwin/${system}/${filename}";
-        };
-      }
-    ) (builtins.readDir "${self}/machines/darwin/${system}"))
+    // (mapAttrs' (name: _: {
+      inherit name;
+      value = {
+        inherit system;
+        hostconf = "${self}/machines/darwin/${system}/${name}";
+      };
+    }) (builtins.readDir "${self}/machines/darwin/${system}"))
   ) { };
 
   defaultModules = [
@@ -105,22 +92,21 @@ let
             inherit self;
             inherit inputs;
           };
-          modules =
-            [
-              { inherit adminUser; }
-              {
-                nixpkgs.pkgs = pkgs;
-                nixpkgs.hostPlatform = system;
-                system.stateVersion = 5;
-                environment.systemPackages = [
-                  pkgs.git
-                ];
-              }
-            ]
-            ++ darwinDefaultModules
-            ++ [
-              hostconf
-            ];
+          modules = [
+            { inherit adminUser; }
+            {
+              nixpkgs.pkgs = pkgs;
+              nixpkgs.hostPlatform = system;
+              system.stateVersion = 5;
+              environment.systemPackages = [
+                pkgs.git
+              ];
+            }
+          ]
+          ++ darwinDefaultModules
+          ++ [
+            hostconf
+          ];
         }
       );
     }
@@ -155,22 +141,21 @@ let
             }) nixosConfigurations;
             inherit inputs;
           };
-          modules =
-            [
-              { inherit adminUser; }
-              {
-                system.configurationRevision = mkIf (self ? rev) self.rev;
-                system.nixos.versionSuffix = mkForce "git.${substring 0 11 inputs.nixpkgs.rev}";
-                nixpkgs.pkgs = pkgs;
-                environment.systemPackages = [
-                  pkgs.git
-                ];
-              }
-            ]
-            ++ defaultModules
-            ++ [
-              hostconf
-            ];
+          modules = [
+            { inherit adminUser; }
+            {
+              system.configurationRevision = mkIf (self ? rev) self.rev;
+              system.nixos.versionSuffix = mkForce "git.${substring 0 11 inputs.nixpkgs.rev}";
+              nixpkgs.pkgs = pkgs;
+              environment.systemPackages = [
+                pkgs.git
+              ];
+            }
+          ]
+          ++ defaultModules
+          ++ [
+            hostconf
+          ];
         }
       );
     }
diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix
index 3b8cab7..3b8cab7 100644
--- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix
+++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix
diff --git a/machines/darwin/aarch64-darwin/mba-m2.nix b/machines/darwin/aarch64-darwin/mba-m2/default.nix
index 737c4a4..737c4a4 100644
--- a/machines/darwin/aarch64-darwin/mba-m2.nix
+++ b/machines/darwin/aarch64-darwin/mba-m2/default.nix
diff --git a/machines/nixos/x86_64-linux/digitalocean.nix b/machines/nixos/x86_64-linux/do-rproxy/default.nix
index 1a011e1..1a011e1 100644
--- a/machines/nixos/x86_64-linux/digitalocean.nix
+++ b/machines/nixos/x86_64-linux/do-rproxy/default.nix
diff --git a/machines/nixos/x86_64-linux/vm-synology.nix b/machines/nixos/x86_64-linux/synology-vm/default.nix
index 05d4d8c..05d4d8c 100644
--- a/machines/nixos/x86_64-linux/vm-synology.nix
+++ b/machines/nixos/x86_64-linux/synology-vm/default.nix
diff --git a/scripts/darwin.nix b/scripts/darwin.nix
index ec97d20..44a0fcd 100644
--- a/scripts/darwin.nix
+++ b/scripts/darwin.nix
@@ -18,28 +18,28 @@
     echo "> macOS config was successfully applied 🚀"
   '')
 
-  (pkgs.writeScriptBin "build-vm-synology" ''
+  (pkgs.writeScriptBin "build-synology-vm" ''
     set -e
     echo "> Running nixos-rebuild build ..."
-    ${pkgs.nixos-rebuild}/bin/nixos-rebuild build --keep-going --flake .#vm-synology --target-host vm-synology --build-host vm-synology --fast --use-remote-sudo --use-substitutes
+    ${pkgs.nixos-rebuild}/bin/nixos-rebuild build --keep-going --flake .#synology-vm --target-host 192.168.1.151 --build-host 192.168.1.151 --fast --use-remote-sudo --use-substitutes
     echo "> nixos-rebuild build was successful ✅"
   '')
 
-  (pkgs.writeScriptBin "switch-vm-synology" ''
+  (pkgs.writeScriptBin "switch-synology-vm" ''
     set -e
     echo "> Running nixos-rebuild switch ..."
-    ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --keep-going --flake .#vm-synology --target-host vm-synology --build-host vm-synology --fast --use-remote-sudo --use-substitutes
+    ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --keep-going --flake .#synology-vm --target-host 192.168.1.151 --build-host 192.168.1.151 --fast --use-remote-sudo --use-substitutes
     echo "> nixos config successfully applied 🚀"
   '')
 
-  (pkgs.writeScriptBin "build-do" ''
+  (pkgs.writeScriptBin "build-do-rproxy" ''
     set -e
     echo "> Running nixos-rebuild build ..."
-    ${pkgs.nixos-rebuild}/bin/nixos-rebuild build --keep-going --flake .#digitalocean --target-host 165.232.158.110 --build-host 165.232.158.110 --fast --use-remote-sudo --use-substitutes
+    ${pkgs.nixos-rebuild}/bin/nixos-rebuild build --keep-going --flake .#do-rproxy --target-host 165.232.158.110 --build-host 165.232.158.110 --fast --use-remote-sudo --use-substitutes
     echo "> nixos-rebuild build was successful ✅"
   '')
 
-  (pkgs.writeScriptBin "switch-do" ''
+  (pkgs.writeScriptBin "switch-do-rproxy" ''
     set -e
     echo "> Running nixos-rebuild switch ..."
     ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --keep-going --flake .#digitalocean --target-host 165.232.158.110 --build-host 165.232.158.110 --fast --use-remote-sudo --use-substitutes