reorganized module structure

homeManagerModules/default.nix

@@ -9,7 +9,7 @@
   nixpkgs = {
     # Configure nixpkgs instance
     config = {
-      # Enableunfree packages
+      # Enable unfree packages
       allowUnfree = true;
     };
   };
@@ -28,5 +28,5 @@
     extraConfig = {XDG_SRC_DIR = "${config.home.homeDirectory}/src";};
   };
 
-  xdg.dataFile."backgrounds/".source = ./files/wallpapers;
+  xdg.dataFile."backgrounds/".source = ../files/wallpapers;
 }

hosts/lavaridge/default.nix

@@ -34,9 +34,9 @@
     zramSwap = {enable = true;};
   };
 
-  desktopConfig = {
+  desktop = {
     enable = true;
-    windowManagers.hyprland.enable = true;
+    hyprland.enable = true;
   };
 
   apps = {

hosts/mauville/default.nix

@@ -26,7 +26,7 @@
   };
 
   homeLab.enable = true;
-  desktopConfig.enable = true;
+  desktop.enable = true;
 
   apps = {
     flatpak.enable = true;

hosts/petalburg/default.nix

@@ -71,9 +71,9 @@ in {
 
   environment.systemPackages = [cs-adjuster cs-adjuster-plasma pp-adjuster];
 
-  desktopConfig = {
+  desktop = {
     enable = true;
-    windowManagers.hyprland.enable = true;
+    hyprland.enable = true;
   };
 
   systemConfig = {

hosts/rustboro/default.nix

@@ -52,9 +52,9 @@
     };
   };
 
-  desktopConfig = {
+  desktop = {
     enable = true;
-    windowManagers.hyprland.enable = true;
+    hyprland.enable = true;
   };
 
   apps = {

nixosModules/default.nix

@@ -3,5 +3,5 @@
   pkgs,
   ...
 }: {
-  imports = [./desktopConfig ./homeLab ./apps ./systemConfig ./userConfig];
+  imports = [./apps ./desktop ./homeLab ./systemConfig ./userConfig];
 }

nixosModules/desktop/default.nix

@@ -4,14 +4,14 @@
   config,
   ...
 }: {
-  imports = [./displayManagers/lightdm ./desktopEnvironments ./windowManagers];
+  imports = [./gnome ./hyprland ./lightdm ./plasma];
 
   options = {
-    desktopConfig.enable =
+    desktop.enable =
-      lib.mkEnableOption "Enables basic GUI X11 and Wayland environment.";
+      lib.mkEnableOption "Enable basic GUI X11 and Wayland environment.";
   };
 
-  config = lib.mkIf config.desktopConfig.enable {
+  config = lib.mkIf config.desktop.enable {
     services = {
       gnome.gnome-keyring.enable = true;
       gvfs.enable = true; # Mount, trash, etc.
@@ -32,6 +32,6 @@
       })
     ];
 
-    desktopConfig.windowManagers.hyprland.enable = lib.mkDefault true;
+    desktop.hyprland.enable = lib.mkDefault true;
   };
 }

nixosModules/desktop/gnome/default.nix

@@ -11,11 +11,11 @@
   ];
 
   options = {
-    desktopConfig.desktopEnvironments.gnome.enable =
+    desktop.gnome.enable =
-      lib.mkEnableOption "Enables GNOME desktop session.";
+      lib.mkEnableOption "Enable GNOME desktop session.";
   };
 
-  config = lib.mkIf config.desktopConfig.desktopEnvironments.gnome.enable {
+  config = lib.mkIf config.desktop.gnome.enable {
     environment.systemPackages = with pkgs; [
       gnomeExtensions.appindicator
       gnomeExtensions.blur-my-shell

nixosModules/desktop/gnome/fprintdFix.nix

@@ -5,12 +5,12 @@
   ...
 }: {
   options = {
-    desktopConfig.desktopEnvironments.gnome.fprintdFix.enable =
+    desktop.gnome.fprintdFix.enable =
       lib.mkEnableOption
       "Fixes fprintd and pam issues with GNOME Display Manager.";
   };
 
-  config = lib.mkIf config.desktopConfig.desktopEnvironments.gnome.fprintdFix.enable {
+  config = lib.mkIf config.desktop.gnome.fprintdFix.enable {
     # Need to change the order pam loads its modules
     # to get proper fingerprint behavior on GDM and the lockscreen.
     security.pam.services.login.fprintAuth = false;

nixosModules/desktop/hyprland/default.nix

@@ -6,11 +6,11 @@
   ...
 }: {
   options = {
-    desktopConfig.windowManagers.hyprland.enable =
+    desktop.hyprland.enable =
-      lib.mkEnableOption "Enables hyprland window manager session.";
+      lib.mkEnableOption "Enable hyprland and greetd.";
   };
 
-  config = lib.mkIf config.desktopConfig.windowManagers.hyprland.enable {
+  config = lib.mkIf config.desktop.hyprland.enable {
     services.greetd = {
       enable = true;
       settings = rec {
@@ -22,6 +22,7 @@
 
     security.pam.services.greetd.enableKwallet = true;
     security.pam.services.greetd.enableGnomeKeyring = true;
+    security.pam.services.swaylock = {};
 
     programs.hyprland.enable = true;
     programs.hyprland.package =

nixosModules/desktop/lightdm/default.nix

@@ -5,12 +5,12 @@
   ...
 }: {
   options = {
-    desktopConfig.displayManagers.lightdm.enable =
+    desktop.lightdm.enable =
       lib.mkEnableOption
       "Enables lightdm and slick greeter with Catppuccin theme.";
   };
 
-  config = lib.mkIf config.desktopConfig.displayManagers.lightdm.enable {
+  config = lib.mkIf config.desktop.lightdm.enable {
     security.pam.services.lightdm.enableKwallet = true;
     security.pam.services.lightdm.enableGnomeKeyring = true;
 

nixosModules/desktop/plasma/default.nix

@@ -5,11 +5,11 @@
   ...
 }: {
   options = {
-    desktopConfig.plasma.enable =
+    desktop.plasma.enable =
-      lib.mkEnableOption "Enables plasma desktop session.";
+      lib.mkEnableOption "Enable plasma desktop session.";
   };
 
-  config = lib.mkIf config.desktopConfig.plasma.enable {
+  config = lib.mkIf config.desktop.plasma.enable {
     # Enable SDDM + Plasma Desktop.
     services = {
       desktopManager.plasma6.enable = true;

nixosModules/desktopConfig/desktopEnvironments/default.nix

@@ -1,8 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
-  imports = [./gnome ./plasma];
-}

nixosModules/desktopConfig/displayManagers/default.nix

@@ -1,8 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
-  imports = [./lightdm];
-}

nixosModules/desktopConfig/windowManagers/default.nix

@@ -1,10 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
-  imports = [./hyprland];
-
-  security.pam.services.swaylock = {};
-}