diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 4d13820..e4f8266 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -63,15 +63,11 @@ 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}" diff --git a/modules/desktop/hyprlock.nix b/modules/desktop/hyprlock.nix index ddfb8c1..f569504 100644 --- a/modules/desktop/hyprlock.nix +++ b/modules/desktop/hyprlock.nix @@ -30,7 +30,6 @@ in { background = [ { path = toString ../../assets/lockscreen.png; - color = "rgb(${base00})"; blur_passes = 3; blur_size = 6; } diff --git a/modules/desktop/themes/catppuccin/default.nix b/modules/desktop/themes/catppuccin/default.nix index edd6bbd..8f093d9 100644 --- a/modules/desktop/themes/catppuccin/default.nix +++ b/modules/desktop/themes/catppuccin/default.nix @@ -24,14 +24,6 @@ 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 65e03cf..8cc93d7 100644 --- a/modules/desktop/themes/default.nix +++ b/modules/desktop/themes/default.nix @@ -18,10 +18,6 @@ in { name = mkOpt str ""; package = mkPackageOption pkgs "gtk" {}; }; - kvantumTheme = { - name = mkOpt str ""; - package = mkPackageOption pkgs "kvantum" {}; - }; iconTheme = { name = mkOpt str ""; package = mkPackageOption pkgs "icon" {}; @@ -88,10 +84,10 @@ in { gtk4.extraConfig.gtk-application-prefer-dark-theme = mkIf cfg.dark "1"; }; - hm.qt = { + qt = { enable = true; - platformTheme.name = "kvantum"; - style.name = "kvantum"; + platformTheme = "gnome"; + style = "adwaita"; }; hm.home.pointerCursor = { @@ -131,15 +127,5 @@ 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} - ''; - }; - }; }; }