simplified directory structure

desktop/gnome/default.nix

@@ -3,7 +3,7 @@
 {
   imports =
     [ # Include X settings.
-      ../.
+      ../common.nix
     ];
 
   # Enable Gnome and GDM.

desktop/kde.nix

@@ -3,7 +3,7 @@
 {
   imports =
     [ # Include X settings.
-      ../.
+      ./common.nix
     ];
 
   # Enable the KDE Plasma Desktop Environment.

flake.nix

@@ -59,7 +59,7 @@
         system = "x86_64-linux";
         modules = [
           ./hosts/rustboro
-          ./desktop/kde
+          ./desktop/kde.nix
           home-manager-unstable.nixosModules.home-manager
           nixos-hardware.nixosModules.lenovo-thinkpad-t440p
         ];
@@ -84,7 +84,7 @@
           ./hosts/mauville
           ./desktop/gnome
           ./modules/homelab
-          ./modules/steam
+          ./modules/steam.nix
           home-manager-unstable.nixosModules.home-manager
         ];
       };

home/aly.nix

@@ -2,7 +2,7 @@
 
 {
     imports = [
-        ../common.nix
+        ./common.nix
     ];
 
     # TODO please change the username & home directory to your own

home/nixos/default.nix

@@ -1,23 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-    imports = [
-        ../common.nix
-    ];
-
-    home.username = "nixos";
-    home.homeDirectory = "/home/nixos";
-
-    # Packages that should be installed to the user profile.
-    home.packages = with pkgs; [
-        gparted
-        gnomeExtensions.appindicator
-        gnomeExtensions.blur-my-shell
-        gnomeExtensions.gsconnect
-        gnomeExtensions.light-shell
-        gnomeExtensions.night-theme-switcher
-        gnomeExtensions.noannoyance-fork
-        gnomeExtensions.tailscale-status
-        gnomeExtensions.tiling-assistant
-    ];
-}

hosts/lavaridge/default.nix

@@ -6,7 +6,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../../users/aly
+      ../../users/aly.nix
       ../../system
     ];
 

hosts/mauville/default.nix

@@ -6,7 +6,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../../users/aly
+      ../../users/aly.nix
       ../../system
     ];
 

hosts/petalburg/default.nix

@@ -43,7 +43,7 @@ in {
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../../users/aly
+      ../../users/aly.nix
       ../../system
     ];
 

hosts/rustboro/default.nix

@@ -6,7 +6,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../../users/aly
+      ../../users/aly.nix
       ../../system
     ];
 

modules/homelab/default.nix

@@ -2,8 +2,8 @@
 
 {
     imports = [
-        ./virtualization
-        ./reverse_proxy
+        ./virtualization.nix
+        ./nginx_proxy.nix
     ];
 
     # services.ddclient.enable = true;

system/default.nix

@@ -3,8 +3,8 @@
 {
   imports =
     [
-      ./network
-      ./sound
+      ./network.nix
+      ./sound.nix
     ];
   # Set your time zone.
   time.timeZone = "America/New_York";

users/aly.nix

@@ -8,5 +8,5 @@
     extraGroups = [ "networkmanager" "wheel" "docker" "libvirtd" ];
   };
 
-  home-manager.users.aly = import ../../home/aly;
+  home-manager.users.aly = import ../home/aly.nix;
 }