From f91f6a85f1e686603289d762a7dad63cfdede499 Mon Sep 17 00:00:00 2001 From: cnst Date: Mon, 18 Aug 2025 20:13:02 +0200 Subject: [PATCH] final test before bed --- hosts/toothpc/hardware-configuration.nix | 4 ++-- hosts/toothpc/modules.nix | 4 +--- hosts/toothpc/settings.nix | 4 ++++ modules/nixos/hardware/graphics/default.nix | 9 ++++++--- modules/nixos/programs/hyprland/layout.nix | 4 ++-- modules/nixos/programs/hyprland/startup.nix | 6 ++++-- modules/settings/monitors/default.nix | 2 +- 7 files changed, 20 insertions(+), 13 deletions(-) diff --git a/hosts/toothpc/hardware-configuration.nix b/hosts/toothpc/hardware-configuration.nix index b9ab6d32..4be42065 100644 --- a/hosts/toothpc/hardware-configuration.nix +++ b/hosts/toothpc/hardware-configuration.nix @@ -20,9 +20,9 @@ "usb_storage" "sd_mod" ]; - kernelModules = ["kvm-intel"]; + kernelModules = []; }; - kernelModules = ["kvm-intel"]; + kernelModules = []; extraModulePackages = []; }; diff --git a/hosts/toothpc/modules.nix b/hosts/toothpc/modules.nix index 031e284d..e1f7813c 100644 --- a/hosts/toothpc/modules.nix +++ b/hosts/toothpc/modules.nix @@ -23,9 +23,7 @@ vendors = ["nvidia"]; nvidia = { package = "latest"; - open = { - enable = true; - }; + open = true; }; }; logitech = { diff --git a/hosts/toothpc/settings.nix b/hosts/toothpc/settings.nix index 5a428434..4dcb3f43 100644 --- a/hosts/toothpc/settings.nix +++ b/hosts/toothpc/settings.nix @@ -15,6 +15,10 @@ transform = 0; workspace = "1"; } + { + name = "Unknown-1"; + enable = false; + } ]; theme = { background = { diff --git a/modules/nixos/hardware/graphics/default.nix b/modules/nixos/hardware/graphics/default.nix index c10d8c41..be1727b5 100644 --- a/modules/nixos/hardware/graphics/default.nix +++ b/modules/nixos/hardware/graphics/default.nix @@ -56,8 +56,11 @@ in { }; nvidia = { - open.enable = mkEnableOption "Enable NVidia open drivers"; - + open = mkOption { + type = lib.types.bool; + default = false; + description = "Use nvidia open driver"; + }; package = mkOption { type = types.enum ["stable" "beta" "production" "latest"]; default = "stable"; @@ -135,7 +138,7 @@ in { modesetting.enable = true; powerManagement.enable = false; powerManagement.finegrained = false; - open = cfg.nvidia.open.enable; + open = cfg.nvidia.open; nvidiaSettings = true; }; }) diff --git a/modules/nixos/programs/hyprland/layout.nix b/modules/nixos/programs/hyprland/layout.nix index 13a5eef1..1691b4a5 100644 --- a/modules/nixos/programs/hyprland/layout.nix +++ b/modules/nixos/programs/hyprland/layout.nix @@ -35,7 +35,7 @@ in { then ",bitdepth,${toString m.bitDepth}" else ""; in "${m.name},${ - if m.enabled + if m.enable then "${resolution},${position},${scale}${transformStr}${bitdepthStr}" else "disable" }" @@ -44,7 +44,7 @@ in { workspace = map ( 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 = [ "size 843 650, initialTitle:^(floatcal)$" diff --git a/modules/nixos/programs/hyprland/startup.nix b/modules/nixos/programs/hyprland/startup.nix index b2ee035a..add9e637 100644 --- a/modules/nixos/programs/hyprland/startup.nix +++ b/modules/nixos/programs/hyprland/startup.nix @@ -9,7 +9,6 @@ commonExecOnce = [ "pamixer --set-volume 50" - "uwsm app -- blueman-applet" "uwsm app -- keepassxc" "uwsm app -- nm-applet --indicator" ]; @@ -33,13 +32,16 @@ in { [ "uwsm app -- mullvad-vpn" "uwsm app -- solaar -w hide -b regular" + "uwsm app -- blueman-applet" ] ++ commonExecOnce; }) (mkIf (host == "bunk") { programs.hyprland.settings.exec-once = - [] + [ + "uwsm app -- blueman-applet" + ] ++ commonExecOnce; }) diff --git a/modules/settings/monitors/default.nix b/modules/settings/monitors/default.nix index a64889b7..55b80031 100644 --- a/modules/settings/monitors/default.nix +++ b/modules/settings/monitors/default.nix @@ -39,7 +39,7 @@ in { type = types.str; default = "1"; }; - enabled = mkOption { + enable = mkOption { type = types.bool; default = true; };