Restructured to use a profiles directory for cleaner structure.

configuration/hosts/beltane/configuration.nix

@@ -3,7 +3,7 @@
 let unstable = import <nixos-unstable> {}; in {
   imports =
     [
-      ../../common
+      ../../profiles/common
       ./hardware-configuration.nix
       #./services/postgres.nix
       ./services/znc.nix

configuration/hosts/litha/configuration.nix

@@ -8,9 +8,9 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../../common
+      ../../profiles/common
-      ../../desktop
+      ../../profiles/desktop
-      ../../xfce
+      ../../profiles/xfce
     ];
 
   # Use the systemd-boot EFI boot loader.

configuration/hosts/samhain/configuration.nix

@@ -4,11 +4,11 @@
   imports =
     [
       ./hardware-configuration.nix
-      ../../common
+      ../../profiles/common
-      ../../desktop
+      ../../profiles/desktop
-      ../../gnome
+      ../../profiles/gnome
-      ../../gaming
+      ../../profiles/gaming
-      ../../development
+      ../../profiles/development
     ];
 
   boot.loader.systemd-boot.enable = true;

configuration/hosts/yule/configuration.nix

@@ -4,11 +4,11 @@
   imports =
     [
       ./hardware-configuration.nix
-      ../../common
+      ../../profiles/common
-      ../../desktop
+      ../../profiles/desktop
-      ../../gnome
+      ../../profiles/gnome
-      ../../gaming
+      ../../profiles/gaming
-      ../../development
+      ../../profiles/development
     ];
 
   boot.loader.systemd-boot.enable = true;

configuration/profiles/common/default.nix

@@ -7,14 +7,14 @@ let
   };
 in {
   imports = [
-    ../../modules
+    ../../../modules
     "${home-manager}/nixos"
     ./pbb.nix
     ./users.nix
   ];
 
   nixpkgs.overlays = [
-    (self: super: import ../../pkgs { nixpkgs = super.path; })
+    (self: super: import ../../../pkgs { nixpkgs = super.path; })
   ];
 
   boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;