From aa9a28fa1c4163a4eeab7034f7405ae840b67ec8 Mon Sep 17 00:00:00 2001 From: Mohammad Rafiq Date: Wed, 21 May 2025 09:52:57 +0800 Subject: [PATCH] refactor(homeModules/desktop): rm option declarations --- homes/x86_64-linux/rafiq/default.nix | 5 ----- modules/home/desktop/browser/firefox/default.nix | 4 ++-- modules/home/desktop/default.nix | 16 ---------------- modules/home/desktop/lockscreen/default.nix | 4 ++-- .../home/desktop/notification-daemon/default.nix | 4 ++-- modules/home/desktop/terminal/default.nix | 6 +++--- .../desktop/windowManager/hyprland/default.nix | 3 +-- modules/nixos/desktop/default.nix | 3 +++ systems/x86_64-linux/nemesis/default.nix | 3 +++ 9 files changed, 16 insertions(+), 32 deletions(-) diff --git a/homes/x86_64-linux/rafiq/default.nix b/homes/x86_64-linux/rafiq/default.nix index 99f2f3e..9d5a060 100644 --- a/homes/x86_64-linux/rafiq/default.nix +++ b/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"; diff --git a/modules/home/desktop/browser/firefox/default.nix b/modules/home/desktop/browser/firefox/default.nix index f485f5b..ab4f2e0 100644 --- a/modules/home/desktop/browser/firefox/default.nix +++ b/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 = { diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix index 5843d57..2f81b61 100644 --- a/modules/home/desktop/default.nix +++ b/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 = [ diff --git a/modules/home/desktop/lockscreen/default.nix b/modules/home/desktop/lockscreen/default.nix index 920d2ff..8003c52 100644 --- a/modules/home/desktop/lockscreen/default.nix +++ b/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; diff --git a/modules/home/desktop/notification-daemon/default.nix b/modules/home/desktop/notification-daemon/default.nix index 1d39da2..c6bb63f 100644 --- a/modules/home/desktop/notification-daemon/default.nix +++ b/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; diff --git a/modules/home/desktop/terminal/default.nix b/modules/home/desktop/terminal/default.nix index aa268e8..f3af070 100644 --- a/modules/home/desktop/terminal/default.nix +++ b/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; diff --git a/modules/home/desktop/windowManager/hyprland/default.nix b/modules/home/desktop/windowManager/hyprland/default.nix index 45c753c..e94fd7c 100644 --- a/modules/home/desktop/windowManager/hyprland/default.nix +++ b/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; diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 6e8fbc4..2f77231 100644 --- a/modules/nixos/desktop/default.nix +++ b/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; }; } diff --git a/systems/x86_64-linux/nemesis/default.nix b/systems/x86_64-linux/nemesis/default.nix index e7573b4..dfa70f0 100644 --- a/systems/x86_64-linux/nemesis/default.nix +++ b/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";