nixosModules: simplify options

homeManagerModules/desktop/default.nix

@@ -14,7 +14,13 @@
     ./waylandComp.nix
   ];
 
-  config = lib.mkIf config.ar.home.desktop.enable {
+  config =
+    lib.mkIf (
+      config.ar.home.desktop.cinnamon.enable
+      || config.ar.home.desktop.gnome.enable
+      || config.ar.home.desktop.hyprland.enable
+      || config.ar.home.desktop.sway.enable
+    ) {
       dconf = {
         enable = true;
         settings = {

homeManagerModules/options.nix

@@ -49,11 +49,8 @@
       wlogout.enable = lib.mkEnableOption "Wlogout session prompt.";
     };
     defaultApps = {
-      enable = lib.mkOption {
+      enable = lib.mkEnableOption "Declaratively set default apps and file associations.";
-        description = "Declaratively set default apps and file associations.";
+
-        default = config.ar.home.desktop.enable;
-        type = lib.types.bool;
-      };
       audioPlayer = {
         exe = lib.mkOption {
           description = "Default audio player executable.";
@@ -209,11 +206,6 @@
       };
     };
     desktop = {
-      enable = lib.mkOption {
-        description = "Graphical desktop.";
-        default = osConfig.ar.desktop.enable;
-        type = lib.types.bool;
-      };
       cinnamon.enable = lib.mkOption {
         description = "Cinnamon with sane defaults";
         default = osConfig.ar.desktop.cinnamon.enable;
@@ -315,12 +307,10 @@
         };
       };
     };
+
     theme = {
-      enable = lib.mkOption {
+      enable = lib.mkEnableOption "Gtk, Qt, and application colors.";
-        description = "Gtk, Qt, and application colors.";
+
-        default = config.ar.home.desktop.enable;
-        type = lib.types.bool;
-      };
       gtk = {
         name = lib.mkOption {
           description = "GTK theme name.";

homes/aly/default.nix

@@ -115,6 +115,8 @@
       vsCodium.enable = true;
     };
 
+    defaultApps.enable = true;
+
     desktop = {
       startupApps = [(lib.getExe' pkgs.keepassxc "keepassxc")];
     };
@@ -124,6 +126,7 @@
     };
 
     theme = {
+      enable = true;
       wallpaper = "${config.xdg.dataHome}/backgrounds/wallhaven-3led2d.jpg";
     };
   };

homes/dustin/default.nix

@@ -38,14 +38,21 @@
       firefox.enable = true;
       vsCodium.enable = true;
     };
+
+    defaultApps.enable = true;
+
     desktop = {
       hyprland = {
         randomWallpaper = true;
       };
     };
+
     theme = {
+      enable = true;
+
       gtk = {
         name = "catppuccin-frappe-mauve-compact+normal";
+
         package = pkgs.catppuccin-gtk.override {
           accents = ["mauve"];
           size = "compact";
@@ -53,35 +60,43 @@
           tweaks = ["normal"];
         };
       };
+
       qt = {
         name = "Catppuccin-Frappe-Mauve";
+
         package = pkgs.catppuccin-kvantum.override {
           accent = "Mauve";
           variant = "Frappe";
         };
       };
+
       iconTheme = {
         name = "Papirus-Dark";
+
         package = pkgs.catppuccin-papirus-folders.override {
           flavor = "frappe";
           accent = "mauve";
         };
       };
+
       cursorTheme = {
         name = "Catppuccin-Frappe-Dark-Cursors";
         size = 24;
         package = pkgs.catppuccin-cursors.frappeDark;
       };
+
       font = {
         name = "NotoSans Nerd Font";
         size = 11;
         package = pkgs.nerdfonts.override {fonts = ["Noto"];};
       };
+
       terminalFont = {
         name = "NotoSansM Nerd Font";
         size = 11;
         package = pkgs.nerdfonts.override {fonts = ["Noto"];};
       };
+
       colors = {
         text = "#FAFAFA";
         background = "#232634";
@@ -90,6 +105,7 @@
         inactive = "#626880";
         shadow = "#1A1A1A";
       };
+
       wallpaper = "${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
     };
   };

homes/morgan/default.nix

@@ -36,9 +36,15 @@
       firefox.enable = true;
       vsCodium.enable = true;
     };
+
+    defaultApps.enable = true;
+
     theme = {
+      enable = true;
+
       gtk = {
         name = "catppuccin-frappe-mauve-compact+normal";
+
         package = pkgs.catppuccin-gtk.override {
           accents = ["mauve"];
           size = "compact";
@@ -46,35 +52,43 @@
           tweaks = ["normal"];
         };
       };
+
       qt = {
         name = "Catppuccin-Frappe-Mauve";
+
         package = pkgs.catppuccin-kvantum.override {
           accent = "Mauve";
           variant = "Frappe";
         };
       };
+
       iconTheme = {
         name = "Papirus-Dark";
+
         package = pkgs.catppuccin-papirus-folders.override {
           flavor = "frappe";
           accent = "mauve";
         };
       };
+
       cursorTheme = {
         name = "Catppuccin-Frappe-Dark-Cursors";
         size = 24;
         package = pkgs.catppuccin-cursors.frappeDark;
       };
+
       font = {
         name = "NotoSans Nerd Font";
         size = 11;
         package = pkgs.nerdfonts.override {fonts = ["Noto"];};
       };
+
       terminalFont = {
         name = "NotoSansM Nerd Font";
         size = 11;
         package = pkgs.nerdfonts.override {fonts = ["Noto"];};
       };
+
       colors = {
         text = "#FAFAFA";
         background = "#232634";
@@ -83,6 +97,7 @@
         inactive = "#626880";
         shadow = "#1A1A1A";
       };
+
       wallpaper = "${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
     };
   };

hosts/fallarbor/default.nix

@@ -19,18 +19,20 @@
   };
 
   networking.hostName = "fallarbor";
-
   system.stateVersion = "24.05";
 
   ar = {
-    apps.steam.enable = true;
+    apps = {
+      firefox.enable = true;
+      steam.enable = true;
+    };
+
     base = {
       enable = true;
       sambaAutoMount = false;
     };
 
     desktop = {
-      enable = true;
       greetd.enable = true;
       hyprland.enable = true;
     };

hosts/lavaridge/default.nix

@@ -24,16 +24,15 @@
 
   ar = {
     apps = {
-      steam.enable = true;
+      firefox.enable = true;
       podman.enable = true;
+      steam.enable = true;
       virt-manager.enable = true;
     };
 
     base.enable = true;
 
     desktop = {
-      enable = true;
-
       greetd = {
         enable = true;
 

hosts/mandarin/default.nix

@@ -24,6 +24,7 @@
 
   ar = {
     apps = {
+      firefox.enable = true;
       podman.enable = true;
       steam.enable = true;
       virt-manager.enable = true;
@@ -32,8 +33,6 @@
     base.enable = true;
 
     desktop = {
-      enable = true;
-
       greetd = {
         enable = true;
 

hosts/mauville/default.nix

@@ -161,6 +161,12 @@ in {
         };
       };
     };
+
+    nix-serve = {
+      enable = true;
+      secretKeyFile = "/var/cache-priv-key.pem";
+    };
+
     samba = {
       enable = true;
       openFirewall = true;
@@ -197,6 +203,7 @@ in {
 
   ar = {
     apps = {
+      firefox.enable = true;
       nicotine-plus.enable = true;
       podman.enable = true;
       steam.enable = true;
@@ -220,8 +227,6 @@ in {
     };
 
     desktop = {
-      enable = true;
-
       greetd = {
         enable = true;
 
@@ -248,8 +253,6 @@ in {
     };
 
     services = {
-      binaryCache.enable = true;
-
       ollama = {
         enable = true;
         gpu = "amd";

hosts/petalburg/default.nix

@@ -23,13 +23,15 @@
   system.stateVersion = "24.05";
 
   ar = {
-    apps.steam.enable = true;
+    apps = {
+      firefox.enable = true;
+      podman.enable = true;
+      steam.enable = true;
+    };
 
     base.enable = true;
 
     desktop = {
-      enable = true;
-
       greetd = {
         enable = true;
 

hosts/rustboro/default.nix

@@ -23,13 +23,14 @@
   system.stateVersion = "24.05";
 
   ar = {
+    apps.firefox.enable = true;
+
     base = {
       enable = true;
       zramSwap.size = 100;
     };
 
     desktop = {
-      enable = true;
       cinnamon.enable = true;
       lightdm.enable = true;
     };

nixosModules/apps/steam/default.nix

@@ -1,10 +1,14 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
-  config = lib.mkIf config.ar.apps.steam.enable {
+  config =
+    lib.mkIf (
+      config.ar.apps.steam.enable
+      || config.ar.desktop.steam.enable
+    ) {
       programs = {
         gamescope.enable = config.ar.desktop.steam.enable;
 

nixosModules/desktop/default.nix

@@ -15,7 +15,15 @@
     ./waylandComp.nix
   ];
 
-  config = lib.mkIf config.ar.desktop.enable {
+  config =
+    lib.mkIf (
+      config.ar.desktop.cinnamon.enable
+      || config.ar.desktop.gnome.enable
+      || config.ar.desktop.hyprland.enable
+      || config.ar.desktop.plasma.enable
+      || config.ar.desktop.steam.enable
+      || config.ar.desktop.sway.enable
+    ) {
       environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
       fonts.packages = with pkgs; [

nixosModules/desktop/gnome/fprintdFix.nix

@@ -4,7 +4,7 @@
   config,
   ...
 }: {
-  config = lib.mkIf config.ar.desktop.gnome.fprintdFix.enable {
+  config = lib.mkIf config.ar.desktop.gnome.fprintdFix {
     # Need to change the order pam loads its modules
     # to get proper fingerprint behavior on GDM and the lockscreen.
     security.pam.services = {

nixosModules/options.nix

@@ -8,48 +8,40 @@
 }: {
   options.ar = {
     apps = {
-      firefox.enable = lib.mkOption {
+      firefox.enable = lib.mkEnableOption "Firefox Web Browser.";
-        description = "Firefox Web Browser.";
+      nicotine-plus.enable = lib.mkEnableOption "Nicotine+ Soulseek client.";
-        default = config.ar.desktop.enable;
+      podman.enable = lib.mkEnableOption "Podman for OCI container support.";
-        type = lib.types.bool;
+      steam.enable = lib.mkEnableOption "Valve's Steam for video games.";
-      };
+      virt-manager.enable = lib.mkEnableOption "Virtual machine client.";
-      nicotine-plus.enable =
-        lib.mkEnableOption "Nicotine+ Soulseek client.";
-      podman.enable =
-        lib.mkEnableOption "Podman for OCI container support.";
-      steam.enable = lib.mkOption {
-        description = "Valve's Steam for video games.";
-        default = config.ar.desktop.steam.enable;
-        type = lib.types.bool;
-      };
-      virt-manager.enable =
-        lib.mkEnableOption "Virt-manager for virtual machines with TPM and EFI support.";
     };
 
     containers = {
       nixos = {
         audiobookshelf = {
-          enable =
+          enable = lib.mkEnableOption "audiobookshelf server in NixOS container.";
-            lib.mkEnableOption "audiobookshelf audiobook and podcast server in NixOS container.";
+
           mediaDirectory = lib.mkOption {
             description = "Media directory for audiobookshelf.";
             default = "/mnt/Media";
             type = lib.types.str;
           };
+
           port = lib.mkOption {
             description = "Port for audiobookshelf.";
             default = 13378;
             type = lib.types.int;
           };
         };
+
         navidrome = {
-          enable =
+          enable = lib.mkEnableOption "Navidrome music server in NixOS container.";
-            lib.mkEnableOption "Navidrome music server in NixOS container.";
+
           musicDirectory = lib.mkOption {
             description = "Music directory for Navidrome.";
             default = "/mnt/Media/Music";
             type = lib.types.str;
           };
+
           port = lib.mkOption {
             description = "Port for Navidrome.";
             default = 4533;
@@ -57,86 +49,99 @@
           };
         };
       };
+
       oci = {
         audiobookshelf = {
-          enable =
+          enable = lib.mkEnableOption "audiobookshelf server in OCI container.";
-            lib.mkEnableOption "audiobookshelf podcast and audiobook server in OCI container.";
+
           mediaDirectory = lib.mkOption {
             description = "Media directory for audiobookshelf.";
             default = "/mnt/Media";
             type = lib.types.str;
           };
+
           port = lib.mkOption {
             description = "Port for audiobookshelf.";
             default = 13378;
             type = lib.types.int;
           };
         };
+
         freshRSS = {
-          enable =
+          enable = lib.mkEnableOption "FreshRSS news client in OCI container.";
-            lib.mkEnableOption "FreshRSS news client in OCI container.";
+
           port = lib.mkOption {
             description = "Port for FreshRSS.";
             default = 8080;
             type = lib.types.int;
           };
         };
+
         jellyfin = {
-          enable =
+          enable = lib.mkEnableOption "Jellyfin media server in OCI container.";
-            lib.mkEnableOption "Jellyfin media server in OCI container.";
+
           archiveDirectory = lib.mkOption {
             description = "Archive directory for Jellyfin.";
             default = "/mnt/Archive";
             type = lib.types.str;
           };
+
           mediaDirectory = lib.mkOption {
             description = "Media directory for Jellyfin.";
             default = "/mnt/Media";
             type = lib.types.str;
           };
+
           port = lib.mkOption {
             description = "Port for Jellyfin.";
             default = 8096;
             type = lib.types.int;
           };
         };
+
         plexMediaServer = {
-          enable =
+          enable = lib.mkEnableOption "Plex Media Server in OCI container.";
-            lib.mkEnableOption "Plex Media Server in OCI container.";
+
           archiveDirectory = lib.mkOption {
             description = "Archive directory for Plex Media Server.";
             default = "/mnt/Archive";
             type = lib.types.str;
           };
+
           mediaDirectory = lib.mkOption {
             description = "Media directory for Plex Media Server.";
             default = "/mnt/Media";
             type = lib.types.str;
           };
+
           port = lib.mkOption {
             description = "Port for Plex Media Server.";
             default = 32400;
             type = lib.types.int;
           };
         };
+
         transmission = {
-          enable =
+          enable = lib.mkEnableOption "Transmission client in OCI container.";
-            lib.mkEnableOption "Transmission Bittorrent client in OCI container.";
+
           archiveDirectory = lib.mkOption {
             description = "Archive directory for Transmission.";
             default = "/mnt/Archive";
             type = lib.types.str;
           };
+
           bitTorrentPort = lib.mkOption {
-            description = "Port for BitTorrent p2p services..";
+            description = "Port for BitTorrent p2p services.";
             default = 5143;
             type = lib.types.int;
           };
+
           mediaDirectory = lib.mkOption {
             description = "Media directory for Transmission.";
             default = "/mnt/Media";
             type = lib.types.str;
           };
+
           port = lib.mkOption {
             description = "Port for Transmission.";
             default = 9091;
@@ -145,110 +150,111 @@
         };
       };
     };
+
     desktop = {
-      enable =
+      cinnamon.enable = lib.mkEnableOption "Cinnamon desktop session.";
-        lib.mkEnableOption "Enable basic GUI X11 and Wayland environment.";
+
-      cinnamon.enable =
-        lib.mkEnableOption "Cinnamon desktop session.";
       gnome = {
-        enable =
+        enable = lib.mkEnableOption "GNOME desktop session.";
-          lib.mkEnableOption "GNOME desktop session.";
+        fprintdFix = lib.mkEnableOption "Fingerprint login fix for GDM";
-        fprintdFix.enable =
-          lib.mkEnableOption
-          "Fix fprintd & pam issues with GNOME Display Manager.";
       };
+
       greetd = {
-        enable =
+        enable = lib.mkEnableOption "Greetd display manager.";
-          lib.mkEnableOption "Greetd display manager.";
 
         autologin = {
-          enable = lib.mkOption {
+          enable = lib.mkEnableOption "Whether to enable autologin.";
-            description = "Whether to enable autologin.";
+
-            default = false;
-            type = lib.types.bool;
-          };
           user = lib.mkOption {
             description = "User to autologin.";
             default = "aly";
             type = lib.types.str;
           };
         };
+
         session = lib.mkOption {
           description = "Default command to execute on login.";
           default = lib.getExe config.programs.hyprland.package;
           type = lib.types.str;
         };
       };
-      hyprland.enable =
+
-        lib.mkEnableOption "Hyprland wayland session.";
+      hyprland.enable = lib.mkEnableOption "Hyprland wayland session.";
-      lightdm.enable =
+      lightdm.enable = lib.mkEnableOption "Lightdm with Catppuccin theme.";
-        lib.mkEnableOption
+      plasma.enable = lib.mkEnableOption "Plasma desktop session.";
-        "Lightdm and slick greeter with Catppuccin theme.";
+      steam.enable = lib.mkEnableOption "Steam + Gamescope session.";
-      plasma.enable =
+      sway.enable = lib.mkEnableOption "Sway wayland session.";
-        lib.mkEnableOption "Plasma desktop session.";
-      steam.enable =
-        lib.mkEnableOption "Steam + Gamescope session.";
-      sway.enable =
-        lib.mkEnableOption "Sway wayland session.";
     };
 
     services = {
-      binaryCache.enable = lib.mkEnableOption "nixpkgs cache server.";
+      flatpak.enable = lib.mkEnableOption "Flatpak support with GUI.";
-      flatpak.enable =
+
-        lib.mkEnableOption "Flatpak support with GUI.";
       ollama = {
         enable = lib.mkEnableOption "Ollama interface for LLMs.";
+
         listenAddress = lib.mkOption {
           description = "Listen Address for Ollama.";
           default = "127.0.0.1:11434";
           type = lib.types.str;
         };
+
         gpu = lib.mkOption {
           description = "Type of GPU for enabling GPU acceleration.";
           default = null;
           type = lib.types.str;
         };
       };
+
       syncthing = {
         enable = lib.mkEnableOption "Syncthing sync service.";
+
         user = lib.mkOption {
           description = "Specify user Syncthing runs as.";
           default = "aly";
           type = lib.types.str;
         };
+
         syncMusic = lib.mkOption {
           description = "Whether to sync music folder.";
           default = config.ar.services.syncthing.enable;
           type = lib.types.bool;
         };
+
         musicPath = lib.mkOption {
           description = "Whether to sync music folder.";
           default = "/home/${config.ar.services.syncthing.user}/music";
           type = lib.types.str;
         };
       };
+
       tailscale.enable = lib.mkEnableOption "Tailscale WireGuard VPN.";
     };
+
     base = {
       enable =
         lib.mkEnableOption "Basic system configuration and sane defaults.";
+
       sambaAutoMount = lib.mkOption {
         description = "Automounting of mauville Samba Shares.";
         default =
-          config.ar.services.tailscale.enable && !(config.networking.hostName == "mauville");
+          config.ar.services.tailscale.enable
+          && !(config.networking.hostName == "mauville");
         type = lib.types.bool;
       };
+
       plymouth.enable = lib.mkOption {
         description = "Plymouth boot screen with catppuccin theme.";
         default = config.ar.base.enable;
         type = lib.types.bool;
       };
+
       zramSwap = {
         enable = lib.mkOption {
           description = "zram swap.";
           default = config.ar.base.enable;
           type = lib.types.bool;
         };
+
         size = lib.mkOption {
           description = "zram swap size relative to RAM.";
           default = 50;

nixosModules/services/binaryCache/default.nix

@@ -1,13 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
-  config = lib.mkIf config.ar.services.binaryCache.enable {
-    services.nix-serve = {
-      enable = true;
-      secretKeyFile = "/var/cache-priv-key.pem";
-    };
-  };
-}

nixosModules/services/default.nix

@@ -5,7 +5,6 @@
   ...
 }: {
   imports = [
-    ./binaryCache
     ./flatpak
     ./ollama
     ./syncthing