Updated lockfile

modules/home/apps/bat/default.nix

@@ -13,9 +13,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    programs.bat = {
-      enable = true;
-      catppuccin.enable = true;
-    };
+    catppuccin.bat.enable = true;
+    programs.bat.enable = true;
   };
 }

modules/home/apps/btop/default.nix

@@ -13,9 +13,9 @@ in {
   };
 
   config = mkIf cfg.enable {
+    catppuccin.btop.enable = true;
     programs.btop = {
       enable = true;
-      catppuccin.enable = true;
       settings = {
         theme_background = false;
         vim_keys = true;

modules/home/apps/tmux/default.nix

@@ -28,23 +28,24 @@ in {
   config = lib.mkIf cfg.enable {
     home.packages = [pkgs.tmux-sessionizer];
 
+    catppuccin.tmux = {
+      enable = true;
+      extraConfig = ''
+        set -g @catppuccin_window_status_style "rounded"
+
+        set -g status-right-length 100
+        set -g status-left-length 100
+        set -g status-left ""
+        set -g status-right "#{E:@catppuccin_status_application}"
+        set -ag status-right "#{E:@catppuccin_status_session}"
+        set -ag status-right "#{E:@catppuccin_status_host}"
+      '';
+    };
+
     programs.tmux = {
       enable = true;
 
       baseIndex = 1;
-      catppuccin = {
-        enable = true;
-        extraConfig = ''
-          set -g @catppuccin_window_status_style "rounded"
-
-          set -g status-right-length 100
-          set -g status-left-length 100
-          set -g status-left ""
-          set -g status-right "#{E:@catppuccin_status_application}"
-          set -ag status-right "#{E:@catppuccin_status_session}"
-          set -ag status-right "#{E:@catppuccin_status_host}"
-        '';
-      };
       keyMode = "vi";
       newSession = true;
       sensibleOnTop = true;

modules/home/programs/fuzzel/default.nix

@@ -14,9 +14,7 @@ in {
   config = lib.mkIf cfg.enable {
     home.packages = [pkgs.bemoji];
 
-    programs.fuzzel = {
-      enable = true;
-      catppuccin.enable = true;
-    };
+    catppuccin.fuzzel.enable = true;
+    programs.fuzzel.enable = true;
   };
 }

modules/home/programs/fzf/default.nix

@@ -11,9 +11,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    programs.fzf = {
-      enable = true;
-      catppuccin.enable = true;
-    };
+    catppuccin.fzf.enable = true;
+    programs.fzf.enable = true;
   };
 }

modules/home/programs/swaylock/default.nix

@@ -13,9 +13,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    programs.swaylock = {
-      enable = true;
-      catppuccin.enable = true;
-    };
+    catppuccin.swaylock.enable = true;
+    programs.swaylock.enable = true;
   };
 }

modules/home/programs/yazi/default.nix

@@ -11,9 +11,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    programs.yazi = {
-      enable = true;
-      catppuccin.enable = true;
-    };
+    programs.yazi.enable = true;
+    catppuccin.yazi.enable = true;
   };
 }

modules/home/tools/git/default.nix

@@ -33,10 +33,10 @@ in {
       "gco" = "${pkgs.git}/bin/git checkout $(${pkgs.git}/bin/git branch | ${pkgs.fzf}/bin/fzf)";
     };
 
+    catppuccin.delta.enable = true;
     programs.git = {
       delta = {
         enable = true;
-        catppuccin.enable = true;
         options = {
           line-numbers = true;
           navigate = true;
@@ -93,9 +93,9 @@ in {
       };
     };
 
+    catppuccin.lazygit.enable = true;
     programs.lazygit = {
       enable = true;
-      catppuccin.enable = true;
       settings = {
         quitOnTopLevelReturn = true;
         gui.nerdFontsVersion = "3";

modules/home/windowManagers/sway/default.nix

@@ -65,15 +65,15 @@ in {
       xdg-utils
     ];
 
-    catppuccin.pointerCursor = {
+    catppuccin.cursors = {
       enable = true;
       accent = "dark";
     };
-    gtk.catppuccin = {
+    catppuccin.gtk = {
       enable = true;
       icon.enable = true;
     };
-    qt.style.catppuccin = {
+    catppuccin.kvantum = {
       enable = true;
       apply = true;
     };
@@ -87,12 +87,12 @@ in {
 
     xdg.dataFile.${cfg.wallpaperPath}.source = ./wallpaper.jpg;
 
+    catppuccin.sway.enable = true;
     wayland.windowManager.sway = {
       # WORKAROUND: https://github.com/nix-community/home-manager/issues/5311
       checkConfig = false;
 
       enable = true;
-      catppuccin.enable = true;
       swaynag.enable = true;
       wrapperFeatures.gtk = true; # so that gtk works properly
       systemd.enable = true; # needed this for screen sharing to work