From 5536aaa46674b7b43db3171e43fe0e440ed9a48d Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Wed, 17 Apr 2024 21:22:22 -0400 Subject: [PATCH] reorganized module structure --- .../wallpapers/jr-korpa-9XngoIpxcEo-unsplash.jpg | Bin .../files => files}/wallpapers/wallhaven-285rjm.jpg | Bin .../files => files}/wallpapers/wallhaven-4219wy.jpg | Bin .../files => files}/wallpapers/wallhaven-4267k6.jpg | Bin .../files => files}/wallpapers/wallhaven-5gpv25.jpg | Bin .../files => files}/wallpapers/wallhaven-6d7xmx.jpg | Bin .../files => files}/wallpapers/wallhaven-83v96o.png | Bin .../files => files}/wallpapers/wallhaven-d6ggel.jpg | Bin .../files => files}/wallpapers/wallhaven-l8vp7y.jpg | Bin .../files => files}/wallpapers/wallhaven-p9lo39.png | Bin .../files => files}/wallpapers/wallhaven-q2o2w5.jpg | Bin .../files => files}/wallpapers/wallhaven-vqo7k8.png | Bin .../files => files}/wallpapers/wallhaven-zm7x5o.jpg | Bin homeManagerModules/default.nix | 4 ++-- hosts/lavaridge/default.nix | 4 ++-- hosts/mauville/default.nix | 2 +- hosts/petalburg/default.nix | 4 ++-- hosts/rustboro/default.nix | 4 ++-- nixosModules/default.nix | 2 +- nixosModules/{desktopConfig => desktop}/default.nix | 10 +++++----- .../gnome/default.nix | 6 +++--- .../gnome/fprintdFix.nix | 4 ++-- .../gnome/tripleBuffering.nix | 0 .../windowManagers => desktop}/hyprland/default.nix | 7 ++++--- .../displayManagers => desktop}/lightdm/default.nix | 4 ++-- .../plasma/default.nix | 6 +++--- .../desktopConfig/desktopEnvironments/default.nix | 8 -------- .../desktopConfig/displayManagers/default.nix | 8 -------- .../desktopConfig/windowManagers/default.nix | 10 ---------- 29 files changed, 29 insertions(+), 54 deletions(-) rename {homeManagerModules/files => files}/wallpapers/jr-korpa-9XngoIpxcEo-unsplash.jpg (100%) rename {homeManagerModules/files => files}/wallpapers/wallhaven-285rjm.jpg (100%) rename {homeManagerModules/files => files}/wallpapers/wallhaven-4219wy.jpg (100%) rename {homeManagerModules/files => files}/wallpapers/wallhaven-4267k6.jpg (100%) rename {homeManagerModules/files => files}/wallpapers/wallhaven-5gpv25.jpg (100%) rename {homeManagerModules/files => files}/wallpapers/wallhaven-6d7xmx.jpg (100%) rename {homeManagerModules/files => files}/wallpapers/wallhaven-83v96o.png (100%) rename {homeManagerModules/files => files}/wallpapers/wallhaven-d6ggel.jpg (100%) rename {homeManagerModules/files => files}/wallpapers/wallhaven-l8vp7y.jpg (100%) rename {homeManagerModules/files => files}/wallpapers/wallhaven-p9lo39.png (100%) rename {homeManagerModules/files => files}/wallpapers/wallhaven-q2o2w5.jpg (100%) rename {homeManagerModules/files => files}/wallpapers/wallhaven-vqo7k8.png (100%) rename {homeManagerModules/files => files}/wallpapers/wallhaven-zm7x5o.jpg (100%) rename nixosModules/{desktopConfig => desktop}/default.nix (65%) rename nixosModules/{desktopConfig/desktopEnvironments => desktop}/gnome/default.nix (82%) rename nixosModules/{desktopConfig/desktopEnvironments => desktop}/gnome/fprintdFix.nix (89%) rename nixosModules/{desktopConfig/desktopEnvironments => desktop}/gnome/tripleBuffering.nix (100%) rename nixosModules/{desktopConfig/windowManagers => desktop}/hyprland/default.nix (82%) rename nixosModules/{desktopConfig/displayManagers => desktop}/lightdm/default.nix (90%) rename nixosModules/{desktopConfig/desktopEnvironments => desktop}/plasma/default.nix (85%) delete mode 100644 nixosModules/desktopConfig/desktopEnvironments/default.nix delete mode 100644 nixosModules/desktopConfig/displayManagers/default.nix delete mode 100644 nixosModules/desktopConfig/windowManagers/default.nix diff --git a/homeManagerModules/files/wallpapers/jr-korpa-9XngoIpxcEo-unsplash.jpg b/files/wallpapers/jr-korpa-9XngoIpxcEo-unsplash.jpg similarity index 100% rename from homeManagerModules/files/wallpapers/jr-korpa-9XngoIpxcEo-unsplash.jpg rename to files/wallpapers/jr-korpa-9XngoIpxcEo-unsplash.jpg diff --git a/homeManagerModules/files/wallpapers/wallhaven-285rjm.jpg b/files/wallpapers/wallhaven-285rjm.jpg similarity index 100% rename from homeManagerModules/files/wallpapers/wallhaven-285rjm.jpg rename to files/wallpapers/wallhaven-285rjm.jpg diff --git a/homeManagerModules/files/wallpapers/wallhaven-4219wy.jpg b/files/wallpapers/wallhaven-4219wy.jpg similarity index 100% rename from homeManagerModules/files/wallpapers/wallhaven-4219wy.jpg rename to files/wallpapers/wallhaven-4219wy.jpg diff --git a/homeManagerModules/files/wallpapers/wallhaven-4267k6.jpg b/files/wallpapers/wallhaven-4267k6.jpg similarity index 100% rename from homeManagerModules/files/wallpapers/wallhaven-4267k6.jpg rename to files/wallpapers/wallhaven-4267k6.jpg diff --git a/homeManagerModules/files/wallpapers/wallhaven-5gpv25.jpg b/files/wallpapers/wallhaven-5gpv25.jpg similarity index 100% rename from homeManagerModules/files/wallpapers/wallhaven-5gpv25.jpg rename to files/wallpapers/wallhaven-5gpv25.jpg diff --git a/homeManagerModules/files/wallpapers/wallhaven-6d7xmx.jpg b/files/wallpapers/wallhaven-6d7xmx.jpg similarity index 100% rename from homeManagerModules/files/wallpapers/wallhaven-6d7xmx.jpg rename to files/wallpapers/wallhaven-6d7xmx.jpg diff --git a/homeManagerModules/files/wallpapers/wallhaven-83v96o.png b/files/wallpapers/wallhaven-83v96o.png similarity index 100% rename from homeManagerModules/files/wallpapers/wallhaven-83v96o.png rename to files/wallpapers/wallhaven-83v96o.png diff --git a/homeManagerModules/files/wallpapers/wallhaven-d6ggel.jpg b/files/wallpapers/wallhaven-d6ggel.jpg similarity index 100% rename from homeManagerModules/files/wallpapers/wallhaven-d6ggel.jpg rename to files/wallpapers/wallhaven-d6ggel.jpg diff --git a/homeManagerModules/files/wallpapers/wallhaven-l8vp7y.jpg b/files/wallpapers/wallhaven-l8vp7y.jpg similarity index 100% rename from homeManagerModules/files/wallpapers/wallhaven-l8vp7y.jpg rename to files/wallpapers/wallhaven-l8vp7y.jpg diff --git a/homeManagerModules/files/wallpapers/wallhaven-p9lo39.png b/files/wallpapers/wallhaven-p9lo39.png similarity index 100% rename from homeManagerModules/files/wallpapers/wallhaven-p9lo39.png rename to files/wallpapers/wallhaven-p9lo39.png diff --git a/homeManagerModules/files/wallpapers/wallhaven-q2o2w5.jpg b/files/wallpapers/wallhaven-q2o2w5.jpg similarity index 100% rename from homeManagerModules/files/wallpapers/wallhaven-q2o2w5.jpg rename to files/wallpapers/wallhaven-q2o2w5.jpg diff --git a/homeManagerModules/files/wallpapers/wallhaven-vqo7k8.png b/files/wallpapers/wallhaven-vqo7k8.png similarity index 100% rename from homeManagerModules/files/wallpapers/wallhaven-vqo7k8.png rename to files/wallpapers/wallhaven-vqo7k8.png diff --git a/homeManagerModules/files/wallpapers/wallhaven-zm7x5o.jpg b/files/wallpapers/wallhaven-zm7x5o.jpg similarity index 100% rename from homeManagerModules/files/wallpapers/wallhaven-zm7x5o.jpg rename to files/wallpapers/wallhaven-zm7x5o.jpg diff --git a/homeManagerModules/default.nix b/homeManagerModules/default.nix index 75747ffb..19956f45 100644 --- a/homeManagerModules/default.nix +++ b/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; } diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix index 219dc695..7595803b 100644 --- a/hosts/lavaridge/default.nix +++ b/hosts/lavaridge/default.nix @@ -34,9 +34,9 @@ zramSwap = {enable = true;}; }; - desktopConfig = { + desktop = { enable = true; - windowManagers.hyprland.enable = true; + hyprland.enable = true; }; apps = { diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix index 3726dceb..18cddf8c 100644 --- a/hosts/mauville/default.nix +++ b/hosts/mauville/default.nix @@ -26,7 +26,7 @@ }; homeLab.enable = true; - desktopConfig.enable = true; + desktop.enable = true; apps = { flatpak.enable = true; diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix index c929daa7..2933bdfe 100644 --- a/hosts/petalburg/default.nix +++ b/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 = { diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix index 95a9c38f..da82a2d5 100644 --- a/hosts/rustboro/default.nix +++ b/hosts/rustboro/default.nix @@ -52,9 +52,9 @@ }; }; - desktopConfig = { + desktop = { enable = true; - windowManagers.hyprland.enable = true; + hyprland.enable = true; }; apps = { diff --git a/nixosModules/default.nix b/nixosModules/default.nix index aeea0513..a8d20bdb 100644 --- a/nixosModules/default.nix +++ b/nixosModules/default.nix @@ -3,5 +3,5 @@ pkgs, ... }: { - imports = [./desktopConfig ./homeLab ./apps ./systemConfig ./userConfig]; + imports = [./apps ./desktop ./homeLab ./systemConfig ./userConfig]; } diff --git a/nixosModules/desktopConfig/default.nix b/nixosModules/desktop/default.nix similarity index 65% rename from nixosModules/desktopConfig/default.nix rename to nixosModules/desktop/default.nix index 0bae4810..f243ee86 100644 --- a/nixosModules/desktopConfig/default.nix +++ b/nixosModules/desktop/default.nix @@ -4,14 +4,14 @@ config, ... }: { - imports = [./displayManagers/lightdm ./desktopEnvironments ./windowManagers]; + imports = [./gnome ./hyprland ./lightdm ./plasma]; options = { - desktopConfig.enable = - lib.mkEnableOption "Enables basic GUI X11 and Wayland environment."; + desktop.enable = + 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; }; } diff --git a/nixosModules/desktopConfig/desktopEnvironments/gnome/default.nix b/nixosModules/desktop/gnome/default.nix similarity index 82% rename from nixosModules/desktopConfig/desktopEnvironments/gnome/default.nix rename to nixosModules/desktop/gnome/default.nix index 3d81f24b..32463539 100644 --- a/nixosModules/desktopConfig/desktopEnvironments/gnome/default.nix +++ b/nixosModules/desktop/gnome/default.nix @@ -11,11 +11,11 @@ ]; options = { - desktopConfig.desktopEnvironments.gnome.enable = - lib.mkEnableOption "Enables GNOME desktop session."; + desktop.gnome.enable = + 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 diff --git a/nixosModules/desktopConfig/desktopEnvironments/gnome/fprintdFix.nix b/nixosModules/desktop/gnome/fprintdFix.nix similarity index 89% rename from nixosModules/desktopConfig/desktopEnvironments/gnome/fprintdFix.nix rename to nixosModules/desktop/gnome/fprintdFix.nix index 25098730..8f608ba3 100644 --- a/nixosModules/desktopConfig/desktopEnvironments/gnome/fprintdFix.nix +++ b/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; diff --git a/nixosModules/desktopConfig/desktopEnvironments/gnome/tripleBuffering.nix b/nixosModules/desktop/gnome/tripleBuffering.nix similarity index 100% rename from nixosModules/desktopConfig/desktopEnvironments/gnome/tripleBuffering.nix rename to nixosModules/desktop/gnome/tripleBuffering.nix diff --git a/nixosModules/desktopConfig/windowManagers/hyprland/default.nix b/nixosModules/desktop/hyprland/default.nix similarity index 82% rename from nixosModules/desktopConfig/windowManagers/hyprland/default.nix rename to nixosModules/desktop/hyprland/default.nix index 527cb876..fbc1ab17 100644 --- a/nixosModules/desktopConfig/windowManagers/hyprland/default.nix +++ b/nixosModules/desktop/hyprland/default.nix @@ -6,11 +6,11 @@ ... }: { options = { - desktopConfig.windowManagers.hyprland.enable = - lib.mkEnableOption "Enables hyprland window manager session."; + desktop.hyprland.enable = + 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 = diff --git a/nixosModules/desktopConfig/displayManagers/lightdm/default.nix b/nixosModules/desktop/lightdm/default.nix similarity index 90% rename from nixosModules/desktopConfig/displayManagers/lightdm/default.nix rename to nixosModules/desktop/lightdm/default.nix index 0f4475d7..741e4dc0 100644 --- a/nixosModules/desktopConfig/displayManagers/lightdm/default.nix +++ b/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; diff --git a/nixosModules/desktopConfig/desktopEnvironments/plasma/default.nix b/nixosModules/desktop/plasma/default.nix similarity index 85% rename from nixosModules/desktopConfig/desktopEnvironments/plasma/default.nix rename to nixosModules/desktop/plasma/default.nix index 9bc8b42c..adb12548 100644 --- a/nixosModules/desktopConfig/desktopEnvironments/plasma/default.nix +++ b/nixosModules/desktop/plasma/default.nix @@ -5,11 +5,11 @@ ... }: { options = { - desktopConfig.plasma.enable = - lib.mkEnableOption "Enables plasma desktop session."; + desktop.plasma.enable = + 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; diff --git a/nixosModules/desktopConfig/desktopEnvironments/default.nix b/nixosModules/desktopConfig/desktopEnvironments/default.nix deleted file mode 100644 index 5f49e305..00000000 --- a/nixosModules/desktopConfig/desktopEnvironments/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - imports = [./gnome ./plasma]; -} diff --git a/nixosModules/desktopConfig/displayManagers/default.nix b/nixosModules/desktopConfig/displayManagers/default.nix deleted file mode 100644 index aad1486a..00000000 --- a/nixosModules/desktopConfig/displayManagers/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - imports = [./lightdm]; -} diff --git a/nixosModules/desktopConfig/windowManagers/default.nix b/nixosModules/desktopConfig/windowManagers/default.nix deleted file mode 100644 index e43291ac..00000000 --- a/nixosModules/desktopConfig/windowManagers/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - imports = [./hyprland]; - - security.pam.services.swaylock = {}; -}