Rename directories for better organization

hosts/gaming.nix

@@ -6,7 +6,7 @@
     ../shared/base.nix
     ../shared/hardware/nvidia.nix
 
-    ../personal-machines/desktop.nix
+    ../personal/desktop.nix
 
     ../servers/gaming-server.nix
   ];

hosts/helium.nix

@@ -48,25 +48,25 @@
   imports = [
     ../shared/base.nix
 
-    ../personal-machines/desktop.nix
-    ../personal-machines/development.nix
+    ../personal/desktop.nix
+    ../personal/development.nix
 
-    ../personal-machines/hardware/amd-laptop.nix
-    ../personal-machines/hardware/hibernate.nix
-    ../personal-machines/hardware/keychron-q11.nix
-    ../personal-machines/hardware/onlykey.nix
-    ../personal-machines/hardware/trackball.nix
+    ../personal/hardware/amd-laptop.nix
+    ../personal/hardware/hibernate.nix
+    ../personal/hardware/keychron-q11.nix
+    ../personal/hardware/onlykey.nix
+    ../personal/hardware/trackball.nix
 
-    ../personal-machines/networking/home-wg.nix
-    ../personal-machines/networking/printing.nix
+    ../personal/networking/home-wg.nix
+    ../personal/networking/printing.nix
 
-    ../personal-machines/programs/bitwarden.nix
-    ../personal-machines/programs/communication.nix
-    ../personal-machines/programs/firefox.nix
-    ../personal-machines/programs/i3.nix
-    ../personal-machines/programs/moonlight.nix
-    ../personal-machines/programs/redshift.nix
-    ../personal-machines/programs/study.nix
-    ../personal-machines/programs/usb-automount.nix
+    ../personal/programs/bitwarden.nix
+    ../personal/programs/communication.nix
+    ../personal/programs/firefox.nix
+    ../personal/programs/i3.nix
+    ../personal/programs/moonlight.nix
+    ../personal/programs/redshift.nix
+    ../personal/programs/study.nix
+    ../personal/programs/usb-automount.nix
   ];
 }

hosts/lithium.nix

@@ -0,0 +1,32 @@
+{ lib, ... }:
+{
+  system.stateVersion = 24.05;
+  networking.hostName = "lithium";
+
+  custom.home_wg_suffix = "3";
+  system.autoUpgrade.allowReboot = lib.mkForce false;
+  # boot.kernelParams = [ "resume_offset=39292928" ];
+
+  imports = [
+    ../shared/base.nix
+
+    ../personal/desktop.nix
+    ../personal/development.nix
+
+    ../personal/hardware/hibernate.nix
+    ../personal/hardware/intel-laptop.nix
+    ../personal/hardware/onlykey.nix
+
+    ../personal/networking/home-wg.nix
+    ../personal/networking/printing.nix
+
+    ../personal/programs/bitwarden.nix
+    ../personal/programs/communication.nix
+    ../personal/programs/firefox.nix
+    ../personal/programs/i3.nix
+    ../personal/programs/moonlight.nix
+    ../personal/programs/redshift.nix
+    ../personal/programs/study.nix
+    ../personal/programs/usb-automount.nix
+  ];
+}

installer/base.nix

@@ -46,7 +46,7 @@ let
 
     nixos-generate-config --root /mnt
     mv /mnt/etc/nixos/configuration.nix configuration.nix.old
-    curl https://forgejo.sinerva.eu/VSinerva/nixos-conf/raw/branch/main/custom-installer/template-configuration.nix -o /mnt/etc/nixos/configuration.nix
+    curl https://forgejo.sinerva.eu/VSinerva/nixos-conf/raw/branch/main/installer/template-configuration.nix -o /mnt/etc/nixos/configuration.nix
   '';
 in
 {

installer/template-configuration.nix

@@ -12,7 +12,7 @@ in
 {
   imports = [
     ./hardware-configuration.nix
-    "${repo}/machine-confs/${host}.nix"
+    "${repo}/hosts/${host}.nix"
   ];
 
   # This value determines the NixOS release from which the default

machine-confs/lithium.nix

@@ -1,32 +0,0 @@
-{ lib, ... }:
-{
-  system.stateVersion = 24.05;
-  networking.hostName = "lithium";
-
-  custom.home_wg_suffix = "3";
-  system.autoUpgrade.allowReboot = lib.mkForce false;
-  # boot.kernelParams = [ "resume_offset=39292928" ];
-
-  imports = [
-    ../shared/base.nix
-
-    ../personal-machines/desktop.nix
-    ../personal-machines/development.nix
-
-    ../personal-machines/hardware/hibernate.nix
-    ../personal-machines/hardware/intel-laptop.nix
-    ../personal-machines/hardware/onlykey.nix
-
-    ../personal-machines/networking/home-wg.nix
-    ../personal-machines/networking/printing.nix
-
-    ../personal-machines/programs/bitwarden.nix
-    ../personal-machines/programs/communication.nix
-    ../personal-machines/programs/firefox.nix
-    ../personal-machines/programs/i3.nix
-    ../personal-machines/programs/moonlight.nix
-    ../personal-machines/programs/redshift.nix
-    ../personal-machines/programs/study.nix
-    ../personal-machines/programs/usb-automount.nix
-  ];
-}