Swap GTK theme to Colloid with purple modification

Swap Qt to use gtk2, should pick up from GTK theme then.

Remove additional packages bundled with sway, installed my own
versions.
This commit is contained in:
Evie Litherland-Smith 2024-07-09 13:07:23 +01:00
parent 1f71cdfcd1
commit 105a35c024
2 changed files with 29 additions and 18 deletions

View file

@ -79,31 +79,40 @@
inherit (config) scheme; inherit (config) scheme;
inherit accentColourName; 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 { in {
enable = true; enable = true;
gtk3 = {inherit extraCss;}; gtk3 = {inherit extraCss;};
gtk4 = {inherit extraCss;}; gtk4 = {inherit extraCss;};
theme = { theme = let
package = pkgs.adw-gtk3; color = "purple";
name = "adw-gtk3"; in {
package = pkgs.colloid-gtk-theme.override {
themeVariants = [color];
colorVariants = [config.scheme.variant];
}; };
iconTheme = { name = "Colloid-${toCapital color}-${toCapital config.scheme.variant}";
package = pkgs.papirus-icon-theme.override {color = "violet";}; };
name = iconTheme = let
if config.scheme.variant == "light" color = "violet";
then "Papirus-Light" in {
else "Papirus-Dark"; package = pkgs.papirus-icon-theme.override {inherit color;};
name = "Papirus-${toCapital config.scheme.variant}";
}; };
}; };
qt = { qt = {
enable = true; enable = true;
style = { style.name = "gtk2";
package = pkgs.adwaita-qt;
name =
if config.scheme.variant == "light"
then "adwaita"
else "adwaita-dark";
};
}; };
xdg = { xdg = {
mime.enable = true; mime.enable = true;

View file

@ -64,7 +64,9 @@
package = package =
pkgs.swayfx.overrideAttrs pkgs.swayfx.overrideAttrs
(old: {passthru.providedSessions = ["sway"];}); (old: {passthru.providedSessions = ["sway"];});
extraPackages = [];
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
xwayland.enable = true;
}; };
gamescope = { gamescope = {
enable = true; enable = true;
@ -75,8 +77,8 @@
gtk.iconCache.enable = true; gtk.iconCache.enable = true;
qt = { qt = {
enable = true; enable = true;
style = "adwaita"; style = "gtk2";
platformTheme = "gnome"; platformTheme = "gtk2";
}; };
services = { services = {
dbus.packages = with pkgs; [gcr]; dbus.packages = with pkgs; [gcr];