refactor(homeModules/desktop): rm option declarations

homes/x86_64-linux/rafiq/default.nix

@@ -12,11 +12,6 @@
   cli.git.name = "Mohammad Rafiq";
   cli.git.email = "rafiq@rrv.sh";
   cli.git.defaultBranch = "prime";
-  desktop.windowManager = "hyprland";
-  desktop.browser = "firefox";
-  desktop.terminal = "ghostty";
-  desktop.lockscreen = "hyprlock";
-  desktop.notification-daemon = "mako";
 
   home.shellAliases = {
     v = "nvim";

modules/home/desktop/browser/firefox/default.nix

@@ -1,6 +1,6 @@
-{ config, lib, ... }:
+{ osConfig, lib, ... }:
 {
-  config = lib.mkIf (config.desktop.browser == "firefox") {
+  config = lib.mkIf (osConfig.desktop.browser == "firefox") {
     home.persistence."/persist/home/rafiq".directories = [ ".mozilla/firefox" ];
     home.sessionVariables.BROWSER = "firefox";
     programs.firefox = {

modules/home/desktop/default.nix

@@ -6,23 +6,7 @@
   ...
 }:
 {
-  options.desktop = {
-    windowManager = lib.pantheon.mkStrOption;
-    lockscreen = lib.pantheon.mkStrOption;
-    browser = lib.pantheon.mkStrOption;
-    terminal = lib.pantheon.mkStrOption;
-    notification-daemon = lib.pantheon.mkStrOption;
-  };
-
   config = lib.mkMerge [
-    {
-      assertions = [
-        {
-          assertion = (osConfig.desktop.windowManager == config.desktop.windowManager);
-          message = "You have set your home window manager to one that is not installed on this system.";
-        }
-      ];
-    }
     (lib.mkIf (osConfig.hardware.gpu == "nvidia") {
       home.packages = [ pkgs.stable-diffusion-webui.forge.cuda ];
       home.persistence."/persist/home/${config.snowfallorg.user.name}".directories = [

modules/home/desktop/lockscreen/default.nix

@@ -1,11 +1,11 @@
 {
-  config,
+  osConfig,
   lib,
   ...
 }:
 {
   config = lib.mkMerge [
-    (lib.mkIf (config.desktop.lockscreen == "hyprlock") {
+    (lib.mkIf (osConfig.desktop.lockscreen == "hyprlock") {
       home.sessionVariables.LOCKSCREEN = "hyprlock";
       programs.hyprlock = {
         enable = true;

modules/home/desktop/notification-daemon/default.nix

@@ -1,7 +1,7 @@
-{ config, lib, ... }:
+{ osConfig, lib, ... }:
 {
   config = lib.mkMerge [
-    (lib.mkIf (config.desktop.notification-daemon == "mako") {
+    (lib.mkIf (osConfig.desktop.notification-daemon == "mako") {
       home.sessionVariables.NOTIFICATION_DAEMON = "mako";
       services.mako = {
         enable = true;

modules/home/desktop/terminal/default.nix

@@ -1,16 +1,16 @@
 {
-  config,
+  osConfig,
   lib,
   pkgs,
   ...
 }:
 {
   config = lib.mkMerge [
-    (lib.mkIf (config.desktop.terminal == "kitty") {
+    (lib.mkIf (osConfig.desktop.terminal == "kitty") {
       home.packages = with pkgs; [ kitty ];
       home.sessionVariables.TERMINAL = "kitty";
     })
-    (lib.mkIf (config.desktop.terminal == "ghostty") {
+    (lib.mkIf (osConfig.desktop.terminal == "ghostty") {
       home.sessionVariables.TERMINAL = "ghostty -e";
       programs.ghostty = {
         enable = true;

modules/home/desktop/windowManager/hyprland/default.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  config,
   lib,
   osConfig,
   ...
@@ -9,7 +8,7 @@ let
   mainMonitor = osConfig.desktop.mainMonitor;
 in
 {
-  config = lib.mkIf (config.desktop.windowManager == "hyprland") {
+  config = lib.mkIf (osConfig.desktop.windowManager == "hyprland") {
     wayland.windowManager.hyprland = {
       enable = true;
       systemd.enable = false;

modules/nixos/desktop/default.nix

@@ -13,5 +13,8 @@
     };
     windowManager = lib.pantheon.mkStrOption;
     lockscreen = lib.pantheon.mkStrOption;
+    browser = lib.pantheon.mkStrOption;
+    terminal = lib.pantheon.mkStrOption;
+    notification-daemon = lib.pantheon.mkStrOption;
   };
 }

systems/x86_64-linux/nemesis/default.nix

@@ -16,7 +16,10 @@
   hardware.gpu = "nvidia";
 
   desktop.windowManager = "hyprland";
+  desktop.browser = "firefox";
+  desktop.terminal = "ghostty";
   desktop.lockscreen = "hyprlock";
+  desktop.notification-daemon = "mako";
   desktop.mainMonitor = {
     id = "desc:OOO AN-270W04K";
     scale = "2";