rrvsh/pantheon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(homeModules/desktop): rm option declarations

Browse source
This commit is contained in:
Mohammad Rafiq 2025-05-21 09:52:57 +08:00
parent ccdd8d19d9
commit aa9a28fa1c
No known key found for this signature in database
9 changed files with 16 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
homes/x86_64-linux/rafiq/default.nix
View file

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

4
modules/home/desktop/browser/firefox/default.nix
View file

@ -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.persistence."/persist/home/rafiq".directories = [ ".mozilla/firefox" ];
home.sessionVariables.BROWSER = "firefox"; home.sessionVariables.BROWSER = "firefox";
programs.firefox = { programs.firefox = {

16
modules/home/desktop/default.nix
View file

@ -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 [ 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") { (lib.mkIf (osConfig.hardware.gpu == "nvidia") {
home.packages = [ pkgs.stable-diffusion-webui.forge.cuda ]; home.packages = [ pkgs.stable-diffusion-webui.forge.cuda ];
home.persistence."/persist/home/${config.snowfallorg.user.name}".directories = [ home.persistence."/persist/home/${config.snowfallorg.user.name}".directories = [

4
modules/home/desktop/lockscreen/default.nix
View file

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

4
modules/home/desktop/notification-daemon/default.nix
View file

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

6
modules/home/desktop/terminal/default.nix
View file

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

3
modules/home/desktop/windowManager/hyprland/default.nix
View file

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

3
modules/nixos/desktop/default.nix
View file

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

3
systems/x86_64-linux/nemesis/default.nix
View file

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