diff --git a/users/jordan/graphical/hyprland/default.nix b/users/jordan/graphical/hyprland/default.nix index c5e071f..55b6297 100644 --- a/users/jordan/graphical/hyprland/default.nix +++ b/users/jordan/graphical/hyprland/default.nix @@ -1,4 +1,5 @@ { + inputs, lib, pkgs, osConfig, @@ -12,6 +13,9 @@ let mapAttrs mkIf ; + inherit (lib.generators) + toINI + ; concatMapAttrsStringSep = sep: f: attrs: concatStringsSep sep (attrValues (mapAttrs f attrs)); @@ -21,8 +25,10 @@ let GDK_BACKEND = "wayland"; MOZ_ENABLE_WAYLAND = "1"; NIXOS_OZONE_WL = "1"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; QT_QPA_PLATFORM = "wayland"; + QT_STYLE_OVERRIDE = "kvantum"; + QT_WAYLAND_DECORATION = "adwaita"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; SDL_VIDEODRIVER = "wayland"; XDG_SESSION_TYPE = "wayland"; } @@ -47,19 +53,6 @@ in ./waybar.nix ]; - fonts.fontconfig.defaultFonts.sansSerif = [ - "SF Pro Text" - ]; - - xdg.configFile = mkIf osConfig.programs.hyprland.withUWSM { - "uwsm/env".text = concatMapAttrsStringSep "\n" ( - name: value: "export ${name}=${value}" - ) globalVariables; - "uwsm/env-hyprland".text = concatMapAttrsStringSep "\n" ( - name: value: "export ${name}=${value}" - ) hyprVariables; - }; - wayland.windowManager.hyprland = { enable = true; package = pkgs.unstable.hyprland; @@ -226,13 +219,38 @@ in }; }; + dconf.settings."org/gnome/desktop/interface" = { + gtk-theme = "adw-gtk3-dark"; + }; + + fonts.fontconfig.defaultFonts.sansSerif = [ + "SF Pro Text" + ]; + + xdg.configFile = mkIf osConfig.programs.hyprland.withUWSM { + "Kvantum/kvantum.kvconfig".text = toINI { } { + General.theme = "KvLibadwaitaDark"; + }; + "Kvantum/KvLibadwaita".source = "${inputs.kvlibadwaita}/src/KvLibadwaita"; + "uwsm/env".text = concatMapAttrsStringSep "\n" ( + name: value: "export ${name}=${value}" + ) globalVariables; + "uwsm/env-hyprland".text = concatMapAttrsStringSep "\n" ( + name: value: "export ${name}=${value}" + ) hyprVariables; + }; + home.packages = with pkgs.unstable; [ adw-gtk3 anyrun clipse dunst + kdePackages.qtstyleplugin-kvantum kitty + libsForQt5.qtstyleplugin-kvantum mpv + qadwaitadecorations + qadwaitadecorations-qt6 wl-clipboard ];