final test before bed

This commit is contained in:
2025-08-18 20:13:02 +02:00
parent 7a5287943d
commit f91f6a85f1
7 changed files with 20 additions and 13 deletions

View File

@@ -20,9 +20,9 @@
"usb_storage" "usb_storage"
"sd_mod" "sd_mod"
]; ];
kernelModules = ["kvm-intel"]; kernelModules = [];
}; };
kernelModules = ["kvm-intel"]; kernelModules = [];
extraModulePackages = []; extraModulePackages = [];
}; };

View File

@@ -23,9 +23,7 @@
vendors = ["nvidia"]; vendors = ["nvidia"];
nvidia = { nvidia = {
package = "latest"; package = "latest";
open = { open = true;
enable = true;
};
}; };
}; };
logitech = { logitech = {

View File

@@ -15,6 +15,10 @@
transform = 0; transform = 0;
workspace = "1"; workspace = "1";
} }
{
name = "Unknown-1";
enable = false;
}
]; ];
theme = { theme = {
background = { background = {

View File

@@ -56,8 +56,11 @@ in {
}; };
nvidia = { nvidia = {
open.enable = mkEnableOption "Enable NVidia open drivers"; open = mkOption {
type = lib.types.bool;
default = false;
description = "Use nvidia open driver";
};
package = mkOption { package = mkOption {
type = types.enum ["stable" "beta" "production" "latest"]; type = types.enum ["stable" "beta" "production" "latest"];
default = "stable"; default = "stable";
@@ -135,7 +138,7 @@ in {
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = false; powerManagement.enable = false;
powerManagement.finegrained = false; powerManagement.finegrained = false;
open = cfg.nvidia.open.enable; open = cfg.nvidia.open;
nvidiaSettings = true; nvidiaSettings = true;
}; };
}) })

View File

@@ -35,7 +35,7 @@ in {
then ",bitdepth,${toString m.bitDepth}" then ",bitdepth,${toString m.bitDepth}"
else ""; else "";
in "${m.name},${ in "${m.name},${
if m.enabled if m.enable
then "${resolution},${position},${scale}${transformStr}${bitdepthStr}" then "${resolution},${position},${scale}${transformStr}${bitdepthStr}"
else "disable" else "disable"
}" }"
@@ -44,7 +44,7 @@ in {
workspace = map ( workspace = map (
m: "${m.workspace},monitor:${m.name}" m: "${m.workspace},monitor:${m.name}"
) (lib.filter (m: m.enabled && m.workspace != null) config.settings.monitors); ) (lib.filter (m: m.enable && m.workspace != null) config.settings.monitors);
windowrule = [ windowrule = [
"size 843 650, initialTitle:^(floatcal)$" "size 843 650, initialTitle:^(floatcal)$"

View File

@@ -9,7 +9,6 @@
commonExecOnce = [ commonExecOnce = [
"pamixer --set-volume 50" "pamixer --set-volume 50"
"uwsm app -- blueman-applet"
"uwsm app -- keepassxc" "uwsm app -- keepassxc"
"uwsm app -- nm-applet --indicator" "uwsm app -- nm-applet --indicator"
]; ];
@@ -33,13 +32,16 @@ in {
[ [
"uwsm app -- mullvad-vpn" "uwsm app -- mullvad-vpn"
"uwsm app -- solaar -w hide -b regular" "uwsm app -- solaar -w hide -b regular"
"uwsm app -- blueman-applet"
] ]
++ commonExecOnce; ++ commonExecOnce;
}) })
(mkIf (host == "bunk") { (mkIf (host == "bunk") {
programs.hyprland.settings.exec-once = programs.hyprland.settings.exec-once =
[] [
"uwsm app -- blueman-applet"
]
++ commonExecOnce; ++ commonExecOnce;
}) })

View File

@@ -39,7 +39,7 @@ in {
type = types.str; type = types.str;
default = "1"; default = "1";
}; };
enabled = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
}; };