refactor(modules): make sure nothing is added without setting enable

This commit is contained in:
matt1432 2025-01-04 19:02:30 -05:00
parent 4a2ad39114
commit 49dc072b81
56 changed files with 684 additions and 506 deletions

View file

@ -3,10 +3,10 @@ self: {
lib,
...
}: let
inherit (lib) elemAt mkOption types;
inherit (self.inputs) home-manager;
inherit (lib) elemAt mkIf mkOption types;
cfg = config.roles.desktop;
flakeDir = config.environment.variables.FLAKE;
in {
@ -18,17 +18,24 @@ in {
home-manager.nixosModules.home-manager
];
config.assertions = [
{
assertion = lib.hasPrefix "/home/${cfg.user}/" flakeDir;
message = ''
Your $FLAKE environment variable needs to point to a directory in
the main users' home to use the desktop module.
'';
}
];
config = mkIf cfg.enable {
assertions = [
{
assertion = lib.hasPrefix "/home/${cfg.user}/" flakeDir;
message = ''
Your $FLAKE environment variable needs to point to a directory in
the main users' home to use the desktop module.
'';
}
];
};
options.roles.desktop = {
enable = mkOption {
type = types.bool;
default = false;
};
user = mkOption {
type = types.str;
description = ''

View file

@ -6,6 +6,19 @@ self: {
}: let
inherit (self.inputs) hyprland;
inherit (self.lib.hypr) mkBind;
inherit (lib) concatStringsSep mkIf optionals;
cfg = config.roles.desktop;
hyprCfg =
config
.home-manager
.users
.${cfg.user}
.wayland
.windowManager
.hyprland;
in {
imports = [
(import ../../ags self)
@ -18,20 +31,7 @@ in {
(import ./modules/security.nix self)
];
config = let
inherit (lib) concatStringsSep optionals;
cfg = config.roles.desktop;
hyprCfg =
config
.home-manager
.users
.${cfg.user}
.wayland
.windowManager
.hyprland;
in {
config = mkIf cfg.enable {
services = {
dbus.enable = true;
gvfs.enable = true;

View file

@ -1,5 +1,14 @@
{pkgs, ...}: {
config = {
{
lib,
osConfig,
pkgs,
...
}: let
inherit (lib) mkIf;
cfg = osConfig.roles.desktop;
in {
config = mkIf cfg.enable {
programs.bash.shellAliases = {
# https://wiki.hyprland.org/Contributing-and-Debugging/#lsp-and-formatting
"mkCMakeFiles" = "${pkgs.cmake}/bin/cmake -S . -B build/ -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON";

View file

@ -2,10 +2,12 @@
lib,
osConfig,
...
}: {
config = let
cfg = osConfig.roles.desktop;
in {
}: let
inherit (lib) mkIf;
cfg = osConfig.roles.desktop;
in {
config = mkIf cfg.enable {
programs = {
# https://codeberg.org/dnkl/foot/wiki#spawning-new-terminal-instances-in-the-current-working-directory
bash.bashrcExtra =

View file

@ -1,7 +1,16 @@
self: {pkgs, ...}: let
self: {
lib,
osConfig,
pkgs,
...
}: let
inherit (self.lib.hypr) mkBind;
inherit (lib) mkIf;
cfg = osConfig.roles.desktop;
in {
config = {
config = mkIf cfg.enable {
wayland.windowManager.hyprland = {
plugins = [self.inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo];

View file

@ -4,12 +4,13 @@ self: {
pkgs,
...
}: let
inherit (lib) map mkIf;
inherit (self.lib.hypr) mkBind;
inherit (lib) map mkIf;
cfg = osConfig.roles.desktop;
in {
config = mkIf cfg.isTouchscreen {
config = mkIf (cfg.enable && cfg.isTouchscreen) {
wayland.windowManager.hyprland = {
plugins = [self.inputs.hyprgrass.packages.${pkgs.system}.default];

View file

@ -2,25 +2,27 @@ self: {
osConfig,
lib,
...
}: {
config = let
inherit (lib) map;
inherit (self.lib.hypr) mkBind;
}: let
inherit (self.lib.hypr) mkBind;
inherit (osConfig.services.xserver) xkb;
inherit (osConfig.roles.desktop) mainMonitor;
inherit (lib) mkIf;
miceNames = [
"logitech-g502-x"
"logitech-g502-hero-gaming-mouse"
];
cfg = osConfig.roles.desktop;
mkConf = name: {
inherit name;
sensitivity = 0;
accel_profile = "flat";
};
in {
inherit (osConfig.services.xserver) xkb;
miceNames = [
"logitech-g502-x"
"logitech-g502-hero-gaming-mouse"
];
mkConf = name: {
inherit name;
sensitivity = 0;
accel_profile = "flat";
};
in {
config = mkIf cfg.enable {
wayland.windowManager.hyprland = {
settings = {
device = map mkConf miceNames;
@ -31,8 +33,8 @@ self: {
};
exec-once =
if mainMonitor != null
then ["hyprctl dispatch focusmonitor ${mainMonitor}"]
if cfg.mainMonitor != null
then ["hyprctl dispatch focusmonitor ${cfg.mainMonitor}"]
else [];
input = {

View file

@ -1,7 +1,16 @@
self: {pkgs, ...}: {
config = let
inherit (self.scopedPackages.${pkgs.system}) mpvScripts;
in {
self: {
lib,
osConfig,
pkgs,
...
}: let
inherit (self.scopedPackages.${pkgs.system}) mpvScripts;
inherit (lib) mkIf;
cfg = osConfig.roles.desktop;
in {
config = mkIf cfg.enable {
# For kdialog-open-files
home.packages = [
pkgs.kdialog

View file

@ -1,9 +1,18 @@
self: {pkgs, ...}: let
self: {
lib,
osConfig,
pkgs,
...
}: let
inherit (self.inputs) nixpkgs-wayland;
waypkgs = nixpkgs-wayland.packages.${pkgs.system};
inherit (lib) mkIf;
cfg = osConfig.roles.desktop;
in {
config = let
waypkgs = nixpkgs-wayland.packages.${pkgs.system};
in {
config = mkIf cfg.enable {
programs = {
obs-studio = {
enable = true;

View file

@ -1,9 +1,17 @@
self: {...}: let
self: {
config,
lib,
...
}: let
inherit (self.inputs) nix-gaming;
inherit (lib) mkIf;
cfg = config.roles.desktop;
in {
imports = [nix-gaming.nixosModules.pipewireLowLatency];
config = {
config = mkIf cfg.enable {
services = {
pulseaudio.enable = false;

View file

@ -1,7 +1,13 @@
{config, ...}: {
config = let
cfg = config.roles.desktop;
in {
{
config,
lib,
...
}: let
inherit (lib) mkIf;
cfg = config.roles.desktop;
in {
config = mkIf cfg.enable {
programs.dconf.enable = true;
home-manager.users.${cfg.user} = {

View file

@ -1,11 +1,14 @@
{
config,
lib,
pkgs,
...
}: {
config = let
cfg = config.roles.desktop;
in {
}: let
inherit (lib) mkIf;
cfg = config.roles.desktop;
in {
config = mkIf cfg.enable {
environment.systemPackages = [
pkgs.plasma5Packages.kio-admin
];

View file

@ -6,21 +6,22 @@ self: {
}: let
inherit (self.lib.hypr) mkBind;
inherit (self.inputs) jellyfin-flake;
inherit (lib) getExe mkIf optionals;
inherit (pkgs.writers) writeTOML;
cfg = config.roles.desktop;
flakeDir = config.environment.variables.FLAKE;
isNvidia = config.nvidia.enable;
restartTailscale = pkgs.writeShellScriptBin "restartTailscale" ''
sudo ${pkgs.systemd}/bin/systemctl restart tailscaled.service
'';
in {
imports = [./dolphin.nix];
config = let
inherit (lib) getExe map optionals;
inherit (pkgs.writers) writeTOML;
flakeDir = config.environment.variables.FLAKE;
cfg = config.roles.desktop;
isNvidia = config.nvidia.enable;
restartTailscale = pkgs.writeShellScriptBin "restartTailscale" ''
sudo ${pkgs.systemd}/bin/systemctl restart tailscaled.service
'';
in {
config = mkIf cfg.enable {
programs.kdeconnect.enable = true;
security.sudo.extraRules = [

View file

@ -1,5 +1,14 @@
{pkgs, ...}: {
config = {
{
config,
lib,
pkgs,
...
}: let
inherit (lib) mkIf;
cfg = config.roles.desktop;
in {
config = mkIf cfg.enable {
services = {
# Enable CUPS to print documents.
printing = {

View file

@ -1,7 +1,15 @@
self: {pkgs, ...}: let
self: {
config,
lib,
pkgs,
...
}: let
inherit (self.packages.${pkgs.system}) libratbag piper;
inherit (lib) mkIf;
cfg = config.roles.desktop;
in {
config = {
config = mkIf cfg.enable {
services.ratbagd = {
enable = true;

View file

@ -3,44 +3,45 @@ self: {
lib,
pkgs,
...
}: {
config = let
inherit (self.lib.hypr) mkBind;
inherit (lib) getExe map mkIf;
}: let
inherit (self.lib.hypr) mkBind;
cfg = config.roles.desktop;
inherit (lib) getExe map mkIf;
hmCfg = config.home-manager.users.${cfg.user};
hyprPkg = hmCfg.wayland.windowManager.hyprland.finalPackage;
cfg = config.roles.desktop;
# See modules/ags/packages.nix
lockPkg = hmCfg.programs.ags.lockPkg;
hmCfg = config.home-manager.users.${cfg.user};
hyprPkg = hmCfg.wayland.windowManager.hyprland.finalPackage;
runInDesktop = pkgs.writeShellApplication {
name = "runInDesktop";
runtimeInputs = [
pkgs.sudo
hyprPkg
];
# See modules/ags/packages.nix
lockPkg = hmCfg.programs.ags.lockPkg;
text = ''
params=( "$@" )
user="$(id -u ${cfg.user})"
readarray -t SIGS <<< "$(ls "/run/user/$user/hypr/")"
runInDesktop = pkgs.writeShellApplication {
name = "runInDesktop";
runtimeInputs = [
pkgs.sudo
hyprPkg
];
run() {
export HYPRLAND_INSTANCE_SIGNATURE="$1"
sudo -Eu ${cfg.user} hyprctl dispatch exec "''${params[@]}"
}
text = ''
params=( "$@" )
user="$(id -u ${cfg.user})"
readarray -t SIGS <<< "$(ls "/run/user/$user/hypr/")"
i=0
run() {
export HYPRLAND_INSTANCE_SIGNATURE="$1"
sudo -Eu ${cfg.user} hyprctl dispatch exec "''${params[@]}"
}
while ! run "''${SIGS[$i]}"; do
((i+=1))
done
'';
};
in {
i=0
while ! run "''${SIGS[$i]}"; do
((i+=1))
done
'';
};
in {
config = mkIf cfg.enable {
services.acpid = mkIf cfg.isLaptop {
enable = true;

View file

@ -1,29 +1,32 @@
self: {
config,
lib,
pkgs,
...
}: {
config = let
cfg = config.roles.desktop;
agsCfg = hmCfg.programs.ags;
hmCfg = config.home-manager.users.${cfg.user};
}: let
inherit (lib) mkIf;
hyprland = hmCfg.wayland.windowManager.hyprland.finalPackage;
cfg = config.roles.desktop;
agsCfg = hmCfg.programs.ags;
hmCfg = config.home-manager.users.${cfg.user};
agsConfig = let
homeFiles = config.home-manager.users.${cfg.user}.home.file;
hyprland = hmCfg.wayland.windowManager.hyprland.finalPackage;
nodeModules = homeFiles."${agsCfg.configDir}/node_modules".source;
varsTs = homeFiles."${agsCfg.configDir}/widgets/lockscreen/vars.ts".source;
in
pkgs.runCommandLocal "agsConfig" {} ''
cp -ar ${../../ags/config}/* ./.
chmod +w -R ./.
cp -ar ${varsTs} ./widgets/lockscreen/vars.ts
cp -ar ${nodeModules} ./node_modules
${agsCfg.package}/bin/ags bundle ./app.ts $out
'';
in {
agsConfig = let
homeFiles = config.home-manager.users.${cfg.user}.home.file;
nodeModules = homeFiles."${agsCfg.configDir}/node_modules".source;
varsTs = homeFiles."${agsCfg.configDir}/widgets/lockscreen/vars.ts".source;
in
pkgs.runCommandLocal "agsConfig" {} ''
cp -ar ${self}/modules/ags/config/* ./.
chmod +w -R ./.
cp -ar ${varsTs} ./widgets/lockscreen/vars.ts
cp -ar ${nodeModules} ./node_modules
${agsCfg.package}/bin/ags bundle ./app.ts $out
'';
in {
config = mkIf cfg.enable {
assertions = [
{
assertion = cfg.ags.enable;

View file

@ -3,58 +3,57 @@ self: {
lib,
pkgs,
...
}: {
}: let
inherit (lib) mkIf;
cfg = config.roles.desktop;
hyprland =
config
.home-manager
.users
.${cfg.user}
.wayland
.windowManager
.hyprland
.finalPackage;
# Hide TTY on launch
cmd = toString (pkgs.writeShellScript "hyprland-wrapper" ''
trap 'systemctl --user stop hyprland-session.target; sleep 1' EXIT
exec Hyprland >/dev/null
'');
in {
imports = [
(import ./ags.nix self)
(import ./hyprland.nix self)
(import ./ags self)
(import ./hyprland self)
];
config = let
inherit (lib) mkIf;
config = mkIf (cfg.enable && cfg.displayManager.enable) {
services = {
displayManager.sessionPackages = [hyprland];
cfg = config.roles.desktop;
greetd = {
enable = true;
settings = {
default_session = {
command = cmd;
user = "greeter";
};
hyprland =
config
.home-manager
.users
.${cfg.user}
.wayland
.windowManager
.hyprland
.finalPackage;
# Hide TTY on launch
cmd = toString (pkgs.writeShellScript "hyprland-wrapper" ''
trap 'systemctl --user stop hyprland-session.target; sleep 1' EXIT
exec Hyprland >/dev/null
'');
in
mkIf cfg.displayManager.enable {
services = {
displayManager.sessionPackages = [hyprland];
greetd = {
enable = true;
settings = {
default_session = {
command = cmd;
user = "greeter";
};
initial_session = {
command = cmd;
user = cfg.user;
};
initial_session = {
command = cmd;
user = cfg.user;
};
};
};
# unlock GPG keyring on login
services.gnome.gnome-keyring.enable = true;
security.pam.services.greetd.enableGnomeKeyring = true;
};
# unlock GPG keyring on login
services.gnome.gnome-keyring.enable = true;
security.pam.services.greetd.enableGnomeKeyring = true;
};
# For accurate stack trace
_file = ./default.nix;
}

View file

@ -3,28 +3,28 @@ self: {
lib,
pkgs,
...
}: {
config = let
inherit (lib) optionals;
inherit (self.lib.hypr) mkAnimation;
}: let
inherit (self.lib.hypr) mkAnimation;
inherit (import ./setupMonitors.nix {inherit config pkgs;}) setupMonitors;
inherit (lib) mkIf optionals;
cfg = config.roles.desktop;
inherit (import ./setupMonitors.nix {inherit config pkgs;}) setupMonitors;
# Nix stuff
cfgHypr =
config
.home-manager
.users
.${cfg.user}
.wayland
.windowManager
.hyprland;
in {
cfg = config.roles.desktop;
cfgHypr =
config
.home-manager
.users
.${cfg.user}
.wayland
.windowManager
.hyprland;
in {
config = mkIf cfg.enable {
home-manager.users.greeter = {
imports = [
(import ../theme self)
(import ../../theme self)
];
wayland.windowManager.hyprland = {
@ -73,5 +73,5 @@ self: {
};
# For accurate stack trace
_file = ./hyprland.nix;
_file = ./default.nix;
}

View file

@ -1,12 +1,21 @@
self: {pkgs, ...}: {
config = let
inherit (self.scopedPackages.${pkgs.system}) dracula;
self: {
lib,
osConfig,
pkgs,
...
}: let
inherit (self.scopedPackages.${pkgs.system}) dracula;
cursorTheme = dracula.hyprcursor;
cursorThemeName = "Dracula-cursors";
hyprcursorThemeName = "Dracula-hyprcursor";
cursorSize = 24;
in {
inherit (lib) mkIf;
cfg = osConfig.roles.desktop;
cursorTheme = dracula.hyprcursor;
cursorThemeName = "Dracula-cursors";
hyprcursorThemeName = "Dracula-hyprcursor";
cursorSize = 24;
in {
config = mkIf cfg.enable {
home.pointerCursor = {
name = cursorThemeName;
package = dracula.gtk;
@ -35,5 +44,5 @@ self: {pkgs, ...}: {
};
# For accurate stack trace
_file = ./cursors.nix;
_file = ./default.nix;
}

View file

@ -1,26 +1,36 @@
self: {...}: {
self: {
lib,
osConfig,
...
}: let
inherit (lib) mkIf;
cfg = osConfig.roles.desktop;
in {
imports = [
./gtk
./xresources.nix
./xresources
(import ./cursors.nix self)
(import ./qt.nix self)
(import ./hyprpaper.nix self)
(import ./cursors self)
(import ./hyprpaper self)
(import ./qt self)
];
config.wayland.windowManager.hyprland = {
settings = {
windowrule = [
"size 1231 950,title:^(Open Folder)$"
"float,title:^(Open Folder)$"
config = mkIf cfg.enable {
wayland.windowManager.hyprland = {
settings = {
windowrule = [
"size 1231 950,title:^(Open Folder)$"
"float,title:^(Open Folder)$"
"size 1231 950,title:^(Open File)$"
"float,title:^(Open File)$"
];
"size 1231 950,title:^(Open File)$"
"float,title:^(Open File)$"
];
layerrule = [
"noanim, selection"
];
layerrule = [
"noanim, selection"
];
};
};
};

View file

@ -3,12 +3,14 @@
lib,
osConfig,
...
}: {
config = let
inherit (import ./gradience.nix {inherit pkgs lib;}) gradience;
}: let
inherit (lib) mkIf;
cfg = osConfig.roles.desktop;
in {
inherit (import ./gradience.nix {inherit pkgs lib;}) gradience;
cfg = osConfig.roles.desktop;
in {
config = mkIf cfg.enable {
home.packages = [
pkgs.gnomeExtensions.user-themes
];

View file

@ -1,12 +1,17 @@
self: {
lib,
osConfig,
pkgs,
...
}: {
config = let
hyprpaper = self.inputs.hyprpaper.packages.${pkgs.system}.default;
wallpaper = toString self.scopedPackages.${pkgs.system}.dracula.wallpaper;
in {
}: let
inherit (lib) mkIf;
cfg = osConfig.roles.desktop;
hyprpaper = self.inputs.hyprpaper.packages.${pkgs.system}.default;
wallpaper = toString self.scopedPackages.${pkgs.system}.dracula.wallpaper;
in {
config = mkIf cfg.enable {
home.packages = [hyprpaper];
xdg.configFile."hypr/hyprpaper.conf" = {
@ -26,5 +31,5 @@ self: {
};
# For accurate stack trace
_file = ./hyprpaper.nix;
_file = ./default.nix;
}

View file

@ -3,12 +3,14 @@ self: {
osConfig,
pkgs,
...
}: {
config = let
inherit (self.scopedPackages.${pkgs.system}) dracula;
}: let
inherit (self.scopedPackages.${pkgs.system}) dracula;
cfg = osConfig.roles.desktop;
in {
inherit (lib) mkIf;
cfg = osConfig.roles.desktop;
in {
config = mkIf cfg.enable {
home.packages = [
pkgs.libsForQt5.qtstyleplugin-kvantum
pkgs.kdePackages.qtstyleplugin-kvantum
@ -44,5 +46,5 @@ self: {
};
# For accurate stack trace
_file = ./qt.nix;
_file = ./default.nix;
}

View file

@ -1,23 +0,0 @@
{...}: {
xresources.extraConfig = ''
! Dracula Xresources palette
*.foreground: #F8F8F2
*.background: #282A36
*.color0: #000000
*.color8: #4D4D4D
*.color1: #FF5555
*.color9: #FF6E67
*.color2: #50FA7B
*.color10: #5AF78E
*.color3: #F1FA8C
*.color11: #F4F99D
*.color4: #BD93F9
*.color12: #CAA9FA
*.color5: #FF79C6
*.color13: #FF92D0
*.color6: #8BE9FD
*.color14: #9AEDFE
*.color7: #BFBFBF
*.color15: #E6E6E6
'';
}

View file

@ -0,0 +1,36 @@
{
lib,
osConfig,
...
}: let
inherit (lib) mkIf;
cfg = osConfig.roles.desktop;
in {
config = mkIf cfg.enable {
xresources.extraConfig = ''
! Dracula Xresources palette
*.foreground: #F8F8F2
*.background: #282A36
*.color0: #000000
*.color8: #4D4D4D
*.color1: #FF5555
*.color9: #FF6E67
*.color2: #50FA7B
*.color10: #5AF78E
*.color3: #F1FA8C
*.color11: #F4F99D
*.color4: #BD93F9
*.color12: #CAA9FA
*.color5: #FF79C6
*.color13: #FF92D0
*.color6: #8BE9FD
*.color14: #9AEDFE
*.color7: #BFBFBF
*.color15: #E6E6E6
'';
};
# For accurate stack trace
_file = ./default.nix;
}