Tidying up dir hierarchy

flake.nix

@@ -25,7 +25,7 @@
         specialArgs.inputs = inputs;
 
         modules = [
-          ./system/ritchie.nix
+          ./system/ritchie/ritchie.nix
 
           hyprland.nixosModules.default
           {
@@ -55,7 +55,7 @@
         specialArgs.inputs = inputs;
 
         modules = [
-          ./system/thompson.nix
+          ./system/thompson/thompson.nix
 
           hyprland.nixosModules.default
           { programs.hyprland.enable = true; }
@@ -76,7 +76,7 @@
         specialArgs.inputs = inputs;
 
         modules = [
-          ./system/miyamoto.nix
+          ./system/miyamoto/miyamoto.nix
         ];
       };
 
@@ -86,7 +86,7 @@
         specialArgs.inputs = inputs;
 
         modules = [
-          ./system/kernighan.nix
+          ./system/kernighan/kernighan.nix
         ];
       };
     };

system/kernighan/kernighan.nix

@@ -4,8 +4,8 @@
 {
   imports =
     [
-      ./shared-configuration.nix
-      ./kernighan-hardware.nix
+      ../shared-configuration.nix
+      ./hardware.nix
     ];
 
   networking = {

system/miyamoto/miyamoto.nix

@@ -4,8 +4,8 @@
 {
   imports =
     [
-      ./shared-configuration.nix
-      ./desktop-configuration.nix
+      ../shared/shared-configuration.nix
+      ../shared/desktop-configuration.nix
       ./miyamoto-hardware.nix
     ];
 

system/ritchie/ritchie.nix

@@ -13,11 +13,11 @@ in
 {
   imports =
     [
-      ./shared-configuration.nix
-      ./desktop-configuration.nix
-      ./desktop.nix
+      ../shared/shared-configuration.nix
+      ../shared/desktop-configuration.nix
+      ../shared/desktop.nix
       ./ritchie-hardware.nix
-      ./filesystem.nix
+      ../shared/filesystem.nix
     ];
 
   networking.hostName = "ritchie";
@@ -28,7 +28,7 @@ in
       "tmux"
     ];
     openssh.authorizedKeys.keyFiles = [
-      ../users/foxsoft/authorized_keys
+      ../../users/foxsoft/authorized_keys
     ];
   };
 

system/shared/shared-configuration.nix

@@ -33,7 +33,7 @@
     ];
     initialPassword = "password";
     openssh.authorizedKeys.keyFiles = [
-      ../users/tsv/authorized_keys
+      ../../users/tsv/authorized_keys
     ];
   };
 

system/thompson/thompson.nix

@@ -13,11 +13,11 @@ in
 {
   imports =
     [
-      ./shared-configuration.nix
-      ./desktop-configuration.nix
-      ./desktop.nix
+      ../shared/shared-configuration.nix
+      ../shared/desktop-configuration.nix
+      ../shared/desktop.nix
       ./thompson-hardware.nix
-      ./filesystem.nix
+      ../shared/filesystem.nix
     ];
 
   networking.hostName = "thompson";