diff --git a/homeManagerModules/desktop/hyprland/default.nix b/homeManagerModules/desktop/hyprland/default.nix index e81c9ab8..5e313d15 100644 --- a/homeManagerModules/desktop/hyprland/default.nix +++ b/homeManagerModules/desktop/hyprland/default.nix @@ -128,7 +128,7 @@ screenshot_screen = "${screenshot} -m output -o ${screenshot_folder}"; screenshot_region = "${screenshot} -m region -o ${screenshot_folder}"; - qt_platform_theme = "gtk2"; + qt_platform_theme = "qt6ct"; gdk_scale = "1.5"; in '' $framework = desc:BOE 0x095F,preferred,auto,1.6 # lavaridge/fallarbor fw13 glossy display diff --git a/homeManagerModules/desktop/sway/default.nix b/homeManagerModules/desktop/sway/default.nix index 6f93cfd8..96b567e9 100644 --- a/homeManagerModules/desktop/sway/default.nix +++ b/homeManagerModules/desktop/sway/default.nix @@ -127,7 +127,7 @@ screenshot_screen = "${screenshot} --capture output"; screenshot_region = "${screenshot} --capture region"; - qt_platform_theme = "gtk2"; + qt_platform_theme = "qt6ct"; gdk_scale = "1.5"; cycleSwayDisplayModes = pkgs.writeShellScriptBin "cycleSwayDisplayModes" '' diff --git a/homeManagerModules/desktop/theme.nix b/homeManagerModules/desktop/theme.nix index 9d212b29..895bc938 100644 --- a/homeManagerModules/desktop/theme.nix +++ b/homeManagerModules/desktop/theme.nix @@ -30,6 +30,21 @@ type = lib.types.bool; }; }; + qt = { + name = lib.mkOption { + description = "Qt Kvantum theme name."; + default = "Catppuccin-Frappe-Mauve"; + type = lib.types.str; + }; + package = lib.mkOption { + description = "Qt Kvantum theme package."; + default = pkgs.catppuccin-kvantum.override { + accent = "Mauve"; + variant = "Frappe"; + }; + type = lib.types.package; + }; + }; iconTheme = { name = lib.mkOption { description = "Icon theme name."; @@ -150,10 +165,15 @@ size = config.alyraffauf.desktop.theme.cursorTheme.size; }; - qt = { - enable = true; - platformTheme.name = "gtk"; - style.name = "gtk2"; + qt.enable = true; + qt.platformTheme.name = "qtct"; + qt.style.name = "kvantum"; + + xdg.configFile = { + "Kvantum/${config.alyraffauf.desktop.theme.qt.name}".source = "${config.alyraffauf.desktop.theme.qt.package}/share/Kvantum/${config.alyraffauf.desktop.theme.qt.name}"; + "Kvantum/kvantum.kvconfig".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" { + General.theme = config.alyraffauf.desktop.theme.qt.name; + }; }; fonts.fontconfig = {