fix(planet/hm/gtk): use upstream catppuccin-papirus-folders

dixslyf · Jul 3, 2024 · 4fdabe7 · 4fdabe7
1 parent ab75237
commit 4fdabe7
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 56 deletions.
diff --git a/planet/modules/home-manager/gtk/default.nix b/planet/modules/home-manager/gtk/default.nix
@@ -37,8 +37,9 @@
           name = "Catppuccin-Macchiato-Standard-Mauve-Dark";
         };
         iconTheme = {
-          package = localFlake'.packages.catppuccin-papirus-icon-theme.override {
-            color = "cat-macchiato-mauve";
+          package = pkgs.catppuccin-papirus-folders.override {
+            accent = "mauve";
+            flavor = "macchiato";
           };
           name = "Papirus-Dark";
         };

diff --git a/planet/pkgs/catppuccin-papirus-folders/default.nix b/planet/pkgs/catppuccin-papirus-folders/default.nix
diff --git a/planet/pkgs/catppuccin-papirus/default.nix b/planet/pkgs/catppuccin-papirus/default.nix
diff --git a/planet/pkgs/flake-module.nix b/planet/pkgs/flake-module.nix
@@ -18,10 +18,6 @@
         # TODO: figure out lib.makeScope and lib.callPackageWith
         pers-pkgs = npinsPackages // {
           nvidia-offload = prev.callPackage ./nvidia-offload { };
-          catppuccin-papirus-icon-theme = prev.callPackage ./catppuccin-papirus {
-            inherit (npinsPackages) catppuccin-papirus-folders;
-            catppuccin-papirus-folders-source = sources.catppuccin-papirus-folders;
-          };
           iosevka-custom = prev.callPackage ./iosevka-custom { };
           iosevka-term-custom = prev.callPackage ./iosevka-custom { spacing = "term"; };
           # vimPlugins = prev.lib.recurseIntoAttrs (prev.callPackage ./vim-plugins { });

diff --git a/planet/pkgs/npins/sources.json b/planet/pkgs/npins/sources.json
@@ -48,18 +48,6 @@
       "url": "https://github.com/catppuccin/mako/archive/9dd088aa5f4529a3dd4d9760415e340664cb86df.tar.gz",
       "hash": "097x9jrkzvml6ngnhxwkzzl1l2awwv73yli1mhmpw83c0n8xck4x"
     },
-    "catppuccin-papirus-folders": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "catppuccin",
-        "repo": "papirus-folders"
-      },
-      "branch": "main",
-      "revision": "f83671d17ea67e335b34f8028a7e6d78bca735d7",
-      "url": "https://github.com/catppuccin/papirus-folders/archive/f83671d17ea67e335b34f8028a7e6d78bca735d7.tar.gz",
-      "hash": "07nr8x9r4ndwywqd92a5gpcb2mid6map24s6wjz18chs7g1ms9hn"
-    },
     "catppuccin-polybar": {
       "type": "Git",
       "repository": {