beautifuru

flake.nix

@@ -75,20 +75,20 @@
         configName:
         nixpkgs.lib.nixosSystem {
           specialArgs = { inherit inputs outputs; };
-          modules = [ ./hosts/${configName}/configuration.nix ];
+          modules = [ ./hosts/nixos/${configName}/configuration.nix ];
         };
-      configNames = builtins.attrNames (builtins.readDir ./hosts);
+      nixosConfigNames = builtins.attrNames (builtins.readDir ./hosts/nixos);
     in
     {
-      nixosConfigurations = nixpkgs.lib.genAttrs configNames (name: makeNixosConfig name);
+      nixosConfigurations = nixpkgs.lib.genAttrs nixosConfigNames (name: makeNixosConfig name);
       nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
         extraSpecialArgs = { inherit inputs outputs; };
         pkgs = import nixpkgs { system = "aarch64-linux"; };
-        modules = [ ./nixOnDroidHosts/atreus/configuration.nix ];
+        modules = [ ./hosts/nixOnDroidHosts/atreus/configuration.nix ];
       };
       darwinConfigurations.prometheus = nix-darwin.lib.darwinSystem {
         system = "x86_64-darwin";
-        modules = [ ./darwinHosts/prometheus/configuration.nix ];
+        modules = [ ./hosts/darwinHosts/prometheus/configuration.nix ];
         specialArgs = { inherit inputs outputs; };
       };
       lib = import ./lib { inherit (nixpkgs) lib; };
@@ -108,7 +108,7 @@
             nixpkgs.lib.nixosSystem {
               specialArgs = { inherit inputs outputs; };
               modules = [
-                ./hosts/${configName}/configuration.nix
+                ./hosts/nixos/${configName}/configuration.nix
                 { nixpkgs.hostPlatform = nixpkgs.lib.mkForce system; }
               ];
             };

hosts/nixos/apollo/configuration.nix

@@ -6,10 +6,10 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../modules/common-packages.nix
+    ../../../modules/common-packages.nix
     # ../../modules/services/tailscale.nix
     # ../../modules/services/openssh.nix
-    ../../modules/nix-settings.nix
+    ../../../modules/nix-settings.nix
     inputs.disko.nixosModules.disko
     inputs.impermanence.nixosModules.impermanence
   ];
@@ -56,7 +56,7 @@
       # Network driver for initrd - change to match your hardware
       # Common options: "virtio_pci" (VMs), "e1000e", "igb", "r8169"
       availableKernelModules = [ "virtio_pci" ];
-      
+
       network = {
         enable = true;
         ssh = {
@@ -65,7 +65,7 @@
           # Generate with: ssh-keygen -t ed25519 -N "" -f /persist/etc/ssh/ssh_host_ed25519_key_initrd
           hostKeys = [ "/persist/etc/ssh/ssh_host_ed25519_key_initrd" ];
           # Add your SSH public key here
-          authorizedKeys = [ 
+          authorizedKeys = [
             "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k"
           ];
         };

hosts/nixos/harmonica-sd/configuration.nix

@@ -8,7 +8,7 @@
     ./sd-image.nix
     "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
     ./hardware-configuration.nix
-    ../../modules
+    ../../../modules
   ];
 
   myModules = {

hosts/nixos/harmonica/configuration.nix

@@ -6,7 +6,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../modules
+    ../../../modules
   ];
 
   myModules = {

hosts/nixos/pochita/configuration.nix

@@ -7,7 +7,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../modules
+    ../../../modules
     inputs.raspberry-pi-nix.nixosModules.raspberry-pi
     inputs.nixos-hardware.nixosModules.raspberry-pi-5
   ];

hosts/nixos/tartarus/configuration.nix

@@ -7,7 +7,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../modules
+    ../../../modules
   ];
 
   myModules = {

hosts/nixos/wallfacer/configuration.nix

@@ -2,7 +2,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../modules
+    ../../../modules
   ];
   myModules = {
     enableKDE = false;

hosts/nixos/ymir/configuration.nix

@@ -6,7 +6,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../modules
+    ../../../modules
   ];
 
   myModules = {