From f49fa4359d9b22c223cf0fc6f72862980cd31e9f Mon Sep 17 00:00:00 2001 From: aaron Date: Thu, 11 Dec 2025 13:53:33 +0100 Subject: [PATCH] refactor(theme): remove gtk and qt themes from config to untangle this mess --- flake.lock | 18 ++++++++-------- hosts/neon/configuration.nix | 2 -- hosts/neon/home.nix | 42 +++++++++++++++++------------------- hosts/neon/noctalia.nix | 7 +++++- 4 files changed, 35 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 58b66da..7478586 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1763748372, - "narHash": "sha256-AUc78Qv3sWir0hvbmfXoZ7Jzq9VVL97l+sP9Jgms+JU=", + "lastModified": 1765337252, + "narHash": "sha256-HuWQp8fM25fyWflbuunQkQI62Hg0ecJxWD52FAgmxqY=", "owner": "nix-community", "repo": "home-manager", - "rev": "d10a9b16b2a3ee28433f3d1c603f4e9f1fecb8e1", + "rev": "13cc1efd78b943b98c08d74c9060a5b59bf86921", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1765375284, - "narHash": "sha256-McMVhLcwdFA5DS8yVGbk4COlINRkLrN1UTAymY416xQ=", + "lastModified": 1765420707, + "narHash": "sha256-lX0WxWosQbm3DrZhscVTiLLpJcoZvaQaZoP+eNt75wE=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a47559c1c6cdaafb12d0280e4f4e76db5767d39b", + "rev": "298b2f5c794d4641cde21cf20422224bf8a60f99", "type": "github" }, "original": { diff --git a/hosts/neon/configuration.nix b/hosts/neon/configuration.nix index 0443694..9e8639c 100644 --- a/hosts/neon/configuration.nix +++ b/hosts/neon/configuration.nix @@ -100,8 +100,6 @@ # system packages environment.systemPackages = with pkgs; [ - adwaita-qt - adwaita-qt6 efibootmgr neovim vim diff --git a/hosts/neon/home.nix b/hosts/neon/home.nix index 7febf41..936b254 100644 --- a/hosts/neon/home.nix +++ b/hosts/neon/home.nix @@ -58,32 +58,30 @@ }; }; - # set gtk theme - gtk = { - enable = true; - theme = { - name = "Adwaita-dark"; - package = pkgs.gnome-themes-extra; - }; - gtk3.extraConfig.gtk-application-prefer-dark-theme = 1; - gtk4.extraConfig.gtk-application-prefer-dark-theme = 1; - }; - - # set qt theme - qt = { - enable = true; - platformTheme.name = "gtk"; - style = { - name = "adwaita-dark"; - package = pkgs.adwaita-qt; - }; - }; + ## set gtk theme + #gtk = { + # enable = true; + # theme = { + # name = "Adwaita-dark"; + # package = pkgs.gnome-themes-extra; + # }; + # gtk3.extraConfig.gtk-application-prefer-dark-theme = 1; + # gtk4.extraConfig.gtk-application-prefer-dark-theme = 1; + #}; + # + ## set qt theme + #qt = { + # enable = true; + # platformTheme.name = "gtk"; + # style = { + # name = "adwaita-dark"; + # package = pkgs.adwaita-qt; + # }; + #}; # set env vars home.sessionVariables = { EDITOR = "vim"; - #QT_QPA_PLATFORMTHEME = "qt6ct"; - QT_STYLE_OVERRIDE = "adwaita-dark"; }; # enable syncthing for user diff --git a/hosts/neon/noctalia.nix b/hosts/neon/noctalia.nix index 68e863e..0c8e771 100644 --- a/hosts/neon/noctalia.nix +++ b/hosts/neon/noctalia.nix @@ -1,7 +1,12 @@ { pkgs, inputs, ... }: { - # install noctalia package + # install noctalia and helper packages environment.systemPackages = with pkgs; [ inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default + kdePackages.qt6ct + adw-gtk3 + nwg-look + adwaita-qt + adwaita-qt6 ]; }