Reintroduce catppuccin gtk

flake.nix

@@ -13,6 +13,12 @@
       };
     };
 
+    catppuccin = {
+      type = "github";
+      owner = "catppuccin";
+      repo = "nix";
+    };
+
     ecsls = {
       url = "github:Sigmapitech/ecsls";
       inputs = {
@@ -50,6 +56,7 @@
     , pre-commit-hooks
     , hosts
     , ecsls
+    , catppuccin
     , ...
     }:
     let
@@ -65,9 +72,13 @@
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
-          users.${username} = import ./home;
+          users.${username}.imports = [
+            catppuccin.homeManagerModules.catppuccin
+            ./home
+          ];
+
           extraSpecialArgs = {
-            inherit username system ecsls pkgs;
+            inherit catppuccin username system ecsls pkgs;
           };
         };
       };
@@ -104,14 +115,15 @@
         mk-system = hostname: specific-modules:
           nixpkgs.lib.nixosSystem {
             specialArgs = {
-              inherit username pkgs;
+              inherit catppuccin username pkgs;
             };
 
             modules = [
               ./system
               { networking.hostName = hostname; }
               { nixpkgs.hostPlatform = system; }
             ] ++ [
+              catppuccin.nixosModules.catppuccin
               home-manager.nixosModules.home-manager
               home-manager-config
             ] ++ [

home/default.nix

@@ -2,6 +2,12 @@
 {
   nixpkgs.config.allowUnfree = true;
 
+  catppuccin = {
+    enable = true;
+    flavor = "macchiato";
+    accent = "blue";
+  };
+
   imports = [
     ./nvim
 

home/gtk.nix

@@ -11,6 +11,11 @@
 
   gtk = {
     enable = true;
+    catppuccin = {
+      enable = true;
+      size = "compact";
+      tweaks = [ "rimless" ];
+    };
 
     cursorTheme = {
       name = "Catppuccin-Macchiato-Dark";
@@ -21,20 +26,11 @@
       name = "Papirus-Dark";
       package = pkgs.papirus-icon-theme;
     };
-
-    theme = {
-      name = "Catppuccin-Macchiato-Compact-Blue-Dark";
-      package = pkgs.catppuccin-gtk.override {
-        accents = [ "blue" ];
-        size = "compact";
-        tweaks = [ "rimless" ];
-        variant = "macchiato";
-      };
-    };
   };
 
   qt = {
     enable = true;
-    platformTheme.name = "gtk";
+    platformTheme.name = "kvantum";
+    style.name = "kvantum";
   };
 }

system/default.nix

@@ -1,6 +1,13 @@
-{ config, username, pkgs, ... }:
+{ username, pkgs, ... }:
 {
-  imports = [ ./polkit.nix ];
+  imports = [
+    ./polkit.nix
+  ];
+
+  catppuccin = {
+    enable = true;
+    flavor = "macchiato";
+  };
 
   boot = {
     consoleLogLevel = 0;