diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 5a5acb13..d20a4fdb 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -79,31 +79,40 @@ inherit (config) scheme; inherit accentColourName; }; + toCapital = string: + with lib; let + chars = let + lc = strings.splitString "" string; + in (lists.sublist 1 (lists.length lc - 2) lc); + in ( + strings.concatStringsSep "" ( + (lists.singleton (strings.toUpper (lists.elemAt chars 0))) + ++ (lists.sublist 1 (lists.length chars) chars) + ) + ); in { enable = true; gtk3 = {inherit extraCss;}; gtk4 = {inherit extraCss;}; - theme = { - package = pkgs.adw-gtk3; - name = "adw-gtk3"; + theme = let + color = "purple"; + in { + package = pkgs.colloid-gtk-theme.override { + themeVariants = [color]; + colorVariants = [config.scheme.variant]; + }; + name = "Colloid-${toCapital color}-${toCapital config.scheme.variant}"; }; - iconTheme = { - package = pkgs.papirus-icon-theme.override {color = "violet";}; - name = - if config.scheme.variant == "light" - then "Papirus-Light" - else "Papirus-Dark"; + iconTheme = let + color = "violet"; + in { + package = pkgs.papirus-icon-theme.override {inherit color;}; + name = "Papirus-${toCapital config.scheme.variant}"; }; }; qt = { enable = true; - style = { - package = pkgs.adwaita-qt; - name = - if config.scheme.variant == "light" - then "adwaita" - else "adwaita-dark"; - }; + style.name = "gtk2"; }; xdg = { mime.enable = true; diff --git a/system/desktop.nix b/system/desktop.nix index ef59d3a6..7c3d2772 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -64,7 +64,9 @@ package = pkgs.swayfx.overrideAttrs (old: {passthru.providedSessions = ["sway"];}); + extraPackages = []; wrapperFeatures.gtk = true; + xwayland.enable = true; }; gamescope = { enable = true; @@ -75,8 +77,8 @@ gtk.iconCache.enable = true; qt = { enable = true; - style = "adwaita"; - platformTheme = "gnome"; + style = "gtk2"; + platformTheme = "gtk2"; }; services = { dbus.packages = with pkgs; [gcr];