From 2414b60b22837dd4fa5206c1a28405a2c926c1e8 Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Tue, 8 Jul 2025 15:40:31 +0300 Subject: [PATCH] fix: add laptop role, enable laptop widgets on waybar and backlight control --- hosts/vega/default.nix | 4 ++-- modules/home/roles/default.nix | 5 +++++ modules/nixos/roles/default.nix | 11 +++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/hosts/vega/default.nix b/hosts/vega/default.nix index 08f0169..c29eb79 100644 --- a/hosts/vega/default.nix +++ b/hosts/vega/default.nix @@ -19,7 +19,7 @@ in catppuccin.accent = "mauve"; catppuccin.flavor = "mocha"; - ataraxia.defaults.role = "desktop"; + ataraxia.defaults.role = "laptop"; ataraxia.defaults.hardware.cpuVendor = "intel"; ataraxia.defaults.hardware.gpuVendor = "intel"; ataraxia.defaults.bluetooth.enable = true; @@ -62,7 +62,7 @@ in # Home-manager home-manager.users.${defaultUser} = { - ataraxia.defaults.role = "desktop"; + ataraxia.defaults.role = "laptop"; ataraxia.services.modprobed-db.enable = true; ataraxia.theme.catppuccin.enable = true; diff --git a/modules/home/roles/default.nix b/modules/home/roles/default.nix index 00f13a0..7ef1f8c 100644 --- a/modules/home/roles/default.nix +++ b/modules/home/roles/default.nix @@ -25,6 +25,7 @@ in "base" "server" "desktop" + "laptop" ]; default = "none"; }; @@ -97,10 +98,14 @@ in ataraxia.wayland.waybar.enable = mkDefault true; ataraxia.wayland.wlogout.enable = mkDefault true; }; + laptopRole = recursiveUpdate desktopRole { + ataraxia.wayland.waybar.laptopWidgets = true; + }; in mkMerge [ (mkIf (role == "base") baseRole) (mkIf (role == "server") serverRole) (mkIf (role == "desktop") desktopRole) + (mkIf (role == "laptop") laptopRole) ]; } diff --git a/modules/nixos/roles/default.nix b/modules/nixos/roles/default.nix index 8ca32e6..c9530f7 100644 --- a/modules/nixos/roles/default.nix +++ b/modules/nixos/roles/default.nix @@ -28,6 +28,7 @@ in "base" "server" "desktop" + "laptop" ]; default = "none"; }; @@ -115,10 +116,20 @@ in zramSwap.memoryPercent = 150; }; + laptopRole = recursiveUpdate desktopRole { + programs.light = { + enable = true; + brightnessKeys.enable = true; + # Allow dark screen + brightnessKeys.minBrightness = 0; + brightnessKeys.step = 10; + }; + }; in mkMerge [ (mkIf (role == "base") baseRole) (mkIf (role == "server") serverRole) (mkIf (role == "desktop") desktopRole) + (mkIf (role == "laptop") laptopRole) ]; }