From aa90143ac882ba25ad5e98c6d1a2a61093e6af88 Mon Sep 17 00:00:00 2001 From: "Reid \"reidlab" Date: Sun, 18 Aug 2024 02:03:26 -0700 Subject: [PATCH 1/3] backlight controls --- modules/desktop/hyprland.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index e4f8266..4d13820 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -63,11 +63,15 @@ in { ", XF86AudioLowerVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%- && wpctl get-volume @DEFAULT_AUDIO_SINK@ | sed 's/[^0-9]//g' > ${wobSock}" ", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s +5% | sed -n 's/.*(\\([0-9]*\\)%).*/\\1/p' > ${wobSock}" ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s 5%- | sed -n 's/.*(\\([0-9]*\\)%).*/\\1/p' > ${wobSock}" + ", XF86KbdBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -d '*:kbd_backlight' s +5% | sed -n 's/.*(\\([0-9]*\\)%).*/\\1/p' > ${wobSock}" + ", XF86KbdBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -d '*:kbd_backlight' s 5%- | sed -n 's/.*(\\([0-9]*\\)%).*/\\1/p' > ${wobSock}" ] else [ ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+" ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" ", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s +5%" ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s 5%-" + ", XF86KbdBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -d '*:kbd_backlight' s +5%" + ", XF86KbdBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -d '*:kbd_backlight' s 5%-" ]); bindl = ([ # "bind locked" ",switch:Lid Switch,exec,${lib.getExe config.modules.desktop.hyprlock.package}" From 99e01f0fb18f357b57d0c1afffe66f9abc88869e Mon Sep 17 00:00:00 2001 From: "Reid \"reidlab" Date: Sun, 18 Aug 2024 13:51:40 -0700 Subject: [PATCH 2/3] hyprlock background color --- modules/desktop/hyprlock.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/desktop/hyprlock.nix b/modules/desktop/hyprlock.nix index f569504..ddfb8c1 100644 --- a/modules/desktop/hyprlock.nix +++ b/modules/desktop/hyprlock.nix @@ -30,6 +30,7 @@ in { background = [ { path = toString ../../assets/lockscreen.png; + color = "rgb(${base00})"; blur_passes = 3; blur_size = 6; } From 85a498a82c0099c0aaa71e50deabe4c3080524f9 Mon Sep 17 00:00:00 2001 From: "Reid \"reidlab" Date: Sun, 18 Aug 2024 14:29:06 -0700 Subject: [PATCH 3/3] kvantum themes! --- modules/desktop/themes/catppuccin/default.nix | 8 ++++++++ modules/desktop/themes/default.nix | 20 ++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/modules/desktop/themes/catppuccin/default.nix b/modules/desktop/themes/catppuccin/default.nix index 8f093d9..edd6bbd 100644 --- a/modules/desktop/themes/catppuccin/default.nix +++ b/modules/desktop/themes/catppuccin/default.nix @@ -24,6 +24,14 @@ in { }; }; + kvantumTheme = { + name = "Catppuccin-${pascalCase variant}-${pascalCase accent}"; + package = pkgs.catppuccin-kvantum.override { + variant = pascalCase variant; + accent = pascalCase accent; + }; + }; + iconTheme = { name = "WhiteSur-dark"; package = pkgs.whitesur-icon-theme; diff --git a/modules/desktop/themes/default.nix b/modules/desktop/themes/default.nix index 8cc93d7..65e03cf 100644 --- a/modules/desktop/themes/default.nix +++ b/modules/desktop/themes/default.nix @@ -18,6 +18,10 @@ in { name = mkOpt str ""; package = mkPackageOption pkgs "gtk" {}; }; + kvantumTheme = { + name = mkOpt str ""; + package = mkPackageOption pkgs "kvantum" {}; + }; iconTheme = { name = mkOpt str ""; package = mkPackageOption pkgs "icon" {}; @@ -84,10 +88,10 @@ in { gtk4.extraConfig.gtk-application-prefer-dark-theme = mkIf cfg.dark "1"; }; - qt = { + hm.qt = { enable = true; - platformTheme = "gnome"; - style = "adwaita"; + platformTheme.name = "kvantum"; + style.name = "kvantum"; }; hm.home.pointerCursor = { @@ -127,5 +131,15 @@ in { }; hm.programs.rofi.theme = cfg.rofi; + + hm.xdg.configFile ={ + "Kvantum/${cfg.kvantumTheme.name}".source = "${cfg.kvantumTheme.package}/share/Kvantum/${cfg.kvantumTheme.name}"; + "Kvantum/kvantum.kvconfig" = { + text = '' + [General] + theme=${cfg.kvantumTheme.name} + ''; + }; + }; }; }