diff --git a/flake.lock b/flake.lock index ef1c06b..560bf3c 100644 --- a/flake.lock +++ b/flake.lock @@ -591,6 +591,27 @@ "type": "github" } }, + "qtengine": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768476812, + "narHash": "sha256-vBd6bw38NO6eGWwcvbhDnylDvlMgcwqUZJ1vIaTuJ1M=", + "owner": "kosslan", + "repo": "qt6engine", + "rev": "01c7a30591f42f47a3dd0087ddc1c702b1f3e1f3", + "type": "github" + }, + "original": { + "owner": "kosslan", + "ref": "qt5", + "repo": "qt6engine", + "type": "github" + } + }, "quickshell": { "inputs": { "nixpkgs": [ @@ -624,6 +645,7 @@ "nix-qml-support": "nix-qml-support", "nixpkgs": "nixpkgs", "nur": "nur", + "qtengine": "qtengine", "quickshell": "quickshell", "stable": "stable", "systems": "systems" diff --git a/flake.nix b/flake.nix index c296088..1a33ca3 100755 --- a/flake.nix +++ b/flake.nix @@ -48,17 +48,10 @@ inputs.hyprland.follows = "hyprland"; }; - /*hyprqt6engine = { - url = "github:hyprwm/hyprqt6engine"; + qtengine = { + url = "github:kosslan/qt6engine/qt5"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.hyprutils.follows = "hyprutils"; - inputs.hyprlang.follows = "hyprlang"; - };*/ - - /*qt6engine = { - url = "github:kosslan/qt6engine"; - inputs.nixpkgs.follows = "nixpkgs"; - };*/ + }; quickshell = { url = "git+https://git.outfoxxed.me/quickshell/quickshell"; diff --git a/modules/theme/default.nix b/modules/theme/default.nix index 89d4f6d..45e7ad1 100644 --- a/modules/theme/default.nix +++ b/modules/theme/default.nix @@ -1,4 +1,28 @@ -{ self, lib, config, pkgs, ... }: { +{ self, lib, config, pkgs, inputs, ... }: { + imports = [ inputs.qtengine.nixosModules.default ]; + + programs.qtengine = { + enable = true; + + config = { + theme = { + colorScheme = "${pkgs.kdePackages.breeze}/share/color-schemes/BreezeDark.colors"; + iconTheme = "breeze-dark"; + style = "breeze"; + fontFixed = "JetBrainsMono Nerd Font"; + fontFixedSize = 12; + font = "DejaVu Sans"; + fontSize = 12; + }; + + misc = { + singleClickActivate = false; + menusHaveIcons = true; + shortcutsForContextMenus = true; + }; + }; + }; + environment.systemPackages = with pkgs; [ qt6.qtwayland kdePackages.breeze @@ -15,7 +39,7 @@ qt = { enable = true; - platformTheme = "qt5ct"; + platformTheme = null; }; home-manager.users.${config.main-user} = { diff --git a/modules/theme/home.nix b/modules/theme/home.nix index e007c46..69c2077 100644 --- a/modules/theme/home.nix +++ b/modules/theme/home.nix @@ -4,51 +4,11 @@ Inherits=breeze_cursors ''; - xdg.configFile = let - qtctConf = kdecolors: '' - [Appearance] - ${if kdecolors then '' - color_scheme_path=${pkgs.kdePackages.breeze}/share/color-schemes/BreezeDark.colors - '' else '' - color_scheme_path=${./colors-qt5ct.conf} - ''} - custom_palette=true - icon_theme=breeze-dark - standard_dialogs=xdgdesktopportal - style=Breeze - - [Fonts] - fixed="JetBrainsMono Nerd Font,12,-1,5,500,0,0,0,0,0,0,0,0,0,0,1,Medium" - general="DejaVu Sans,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" - - [Interface] - activate_item_on_single_click=1 - buttonbox_layout=0 - cursor_flash_time=1000 - dialog_buttons_have_icons=2 - double_click_interval=400 - keyboard_scheme=2 - menus_have_icons=true - show_shortcuts_in_context_menus=true - toolbutton_style=2 - underline_shortcut=1 - wheel_scroll_lines=3 - - [Troubleshooting] - force_raster_widgets=0 - ''; - in { + xdg.configFile = { # fixes dolphin background colors "kdeglobals".source = "${pkgs.kdePackages.breeze}/share/color-schemes/BreezeDark.colors"; - - "qt5ct/qt5ct.conf".text = qtctConf false; - "qt6ct/qt6ct.conf".text = qtctConf true; }; - home.packages = [ - pkgs.kdePackages.breeze - ]; - gtk = { enable = true; theme = {