style(desktop): reformat nix code and simplify module logic

Refactor `modules/desktop/options.nix` to improve code readability through
consistent indentation and whitespace management. Simplified the
conditional logic for `home-manager.extraSpecialArgs` to remove
unnecessary complexity.

Clean up host configurations by removing commented-out code, removing
unnecessary whitespace, and flattening nested attribute sets into
single-line declarations where appropriate.
This commit is contained in:
2026-07-15 22:20:07 -03:00
parent e2fd47aa58
commit a787840ce2
5 changed files with 32 additions and 44 deletions
+18 -11
View File
@@ -34,11 +34,13 @@
{ {
options.chiasson.desktop = { options.chiasson.desktop = {
defaultSession = lib.mkOption { defaultSession = lib.mkOption {
type = lib.types.nullOr (lib.types.enum [ type = lib.types.nullOr (
lib.types.enum [
"hyprland" "hyprland"
"niri" "niri"
"plasma" "plasma"
]); ]
);
default = null; default = null;
example = "niri"; example = "niri";
description = '' description = ''
@@ -56,10 +58,12 @@
displayManager = { displayManager = {
variant = lib.mkOption { variant = lib.mkOption {
type = lib.types.nullOr (lib.types.enum [ type = lib.types.nullOr (
lib.types.enum [
"sddm" "sddm"
"dankgreeter" "dankgreeter"
]); ]
);
default = null; default = null;
description = '' description = ''
SDDM vs DankGreeter (greetd + DMS [docs](https://danklinux.com/docs/dankgreeter/nixos-flake)). SDDM vs DankGreeter (greetd + DMS [docs](https://danklinux.com/docs/dankgreeter/nixos-flake)).
@@ -80,9 +84,11 @@
}; };
displayManager.sddm = { displayManager.sddm = {
wayland.enable = lib.mkEnableOption '' wayland.enable =
lib.mkEnableOption ''
SDDM greeter on Wayland (nicer on HiDPI; turn off if the greeter glitches on your GPU). SDDM greeter on Wayland (nicer on HiDPI; turn off if the greeter glitches on your GPU).
'' // { ''
// {
default = true; default = true;
}; };
@@ -159,10 +165,12 @@
}; };
keyring = { keyring = {
enable = lib.mkEnableOption '' enable =
lib.mkEnableOption ''
gnome-keyring + pam (login + sddm or greetd) + HM user service + `gcr` + `services.xserver.updateDbusEnvironment`. gnome-keyring + pam (login + sddm or greetd) + HM user service + `gcr` + `services.xserver.updateDbusEnvironment`.
niri/hyprland: `dbus-update-activation-environment` at compositor start so libsecret/Electron see `WAYLAND_DISPLAY`. niri/hyprland: `dbus-update-activation-environment` at compositor start so libsecret/Electron see `WAYLAND_DISPLAY`.
'' // { ''
// {
default = true; default = true;
}; };
}; };
@@ -184,8 +192,7 @@
message = "chiasson.desktop.defaultSession = \"plasma\" requires chiasson.desktop.plasma.enable = true."; message = "chiasson.desktop.defaultSession = \"plasma\" requires chiasson.desktop.plasma.enable = true.";
} }
{ {
assertion = assertion = cfg.displayManager.variant != "dankgreeter" || cfg.hyprland.enable || cfg.niri.enable;
cfg.displayManager.variant != "dankgreeter" || cfg.hyprland.enable || cfg.niri.enable;
message = "chiasson.desktop.displayManager.variant = \"dankgreeter\" requires chiasson.desktop.hyprland or chiasson.desktop.niri."; message = "chiasson.desktop.displayManager.variant = \"dankgreeter\" requires chiasson.desktop.hyprland or chiasson.desktop.niri.";
} }
{ {
@@ -210,7 +217,7 @@
(lib.mkIf (dmsEnabled && hmAvailable) { (lib.mkIf (dmsEnabled && hmAvailable) {
"home-manager".sharedModules = [ self.homeManagerModules.desktopShellDms ]; "home-manager".sharedModules = [ self.homeManagerModules.desktopShellDms ];
}) })
(lib.mkIf (hmAvailable && (dmsEnabled || cfg.niri.enable)) { (lib.mkIf hmAvailable {
"home-manager".extraSpecialArgs = { inherit inputs; }; "home-manager".extraSpecialArgs = { inherit inputs; };
}) })
]; ];
-1
View File
@@ -22,7 +22,6 @@
spotify.openDiscoveryFirewall = true; spotify.openDiscoveryFirewall = true;
pokeclicker.enable = true; pokeclicker.enable = true;
}; };
}; };
} }
]; ];
-13
View File
@@ -4,18 +4,5 @@
{ self, ... }: { self, ... }:
{ {
imports = [ self.nixosModules.desktopHomeBase ]; imports = [ self.nixosModules.desktopHomeBase ];
# Host-only HM overrides (tablet apps, toggles off from desktop-home-base, …).
chiasson.users.extraModules.olivier = [
# {
# chiasson.home = {
# # editors.kate.enable = true;
# };
# }
# (
# { pkgs, ... }:
# { home.packages = with pkgs; [ ]; }
# )
];
}; };
} }
+1 -4
View File
@@ -8,9 +8,7 @@
chiasson.users.extraModules.olivier = [ chiasson.users.extraModules.olivier = [
{ {
chiasson.home = { chiasson.home = {
browsers = { browsers.edge.enable = true;
edge.enable = true;
};
apps = { apps = {
discord.enable = true; discord.enable = true;
@@ -19,6 +17,5 @@
}; };
} }
]; ];
}; };
} }
+1 -3
View File
@@ -7,9 +7,7 @@
chiasson.users.extraModules.olivier = [ chiasson.users.extraModules.olivier = [
{ {
chiasson.home = { chiasson.home.hardware.uconsoleGamepad.enable = true;
hardware.uconsoleGamepad.enable = true;
};
} }
]; ];
}; };