From 4226d67e9579bcb20eacb940aafabf1ebab09fd9 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 23 Jun 2024 21:02:37 -0400 Subject: [PATCH] [home.theming] Remove catppuccin.gtk It's archived and deprecated by upstream, so replace with colloid-gtk-theme --- modules/home/theming/default.nix | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/modules/home/theming/default.nix b/modules/home/theming/default.nix index 007f6296..dfb4329d 100644 --- a/modules/home/theming/default.nix +++ b/modules/home/theming/default.nix @@ -12,13 +12,24 @@ in flavor = "mocha"; accent = "blue"; }; + home.pointerCursor = lib.mkIf pro.gui.enable { + package = pkgs.catppuccin-cursors.mochaBlue; + name = "Catppuccin-Mocha-Blue"; + gtk.enable = true; + }; gtk = lib.mkIf pro.gui.enable { enable = true; - catppuccin = { - enable = true; - size = "compact"; - tweaks = [ "rimless" ]; - cursor.enable = true; + theme = { + name = "Colloid-Dark-Compact-Catppuccin"; + package = pkgs.colloid-gtk-theme.override { + tweaks = [ + "catppuccin" + "black" + ]; + colorVariants = [ "dark" ]; + sizeVariants = [ "compact" ]; + themeVariants = [ "default" ]; + }; }; font = { name = "IBM Plex Mono"; @@ -26,8 +37,8 @@ in }; gtk3.bookmarks = [ "file:///${config.home.homeDirectory}/Downloads" ]; iconTheme = { - package = pkgs.papirus-icon-theme; - name = "Papirus-Dark"; + package = pkgs.colloid-icon-theme; + name = "Colloid-Dark"; }; }; } -- 2.51.2