Common: update catppuccin options

roles/common/programs/bat.nix

@@ -1,8 +1,8 @@
 {...}: {
   home-manager = {
-    users.toast.programs.bat = {
-      enable = true;
-      catppuccin.enable = true;
+    users.toast = {
+      programs.bat.enable = true;
+      catppuccin.bat.enable = true;
     };
   };
 }

roles/common/programs/btop.nix

@@ -1,10 +1,8 @@
 {...}: {
   home-manager = {
     users.toast = {
-      programs.btop = {
-        enable = true;
-        catppuccin.enable = true;
-      };
+      catppuccin.btop.enable = true;
+      programs.btop.enable = true;
     };
   };
 }

roles/common/programs/fish.nix

@@ -4,9 +4,7 @@
   };
 
   home-manager.users.toast = {
-    programs.fish = {
-      enable = true;
-      catppuccin.enable = true;
-    };
+    catppuccin.fish.enable = true;
+    programs.fish.enable = true;
   };
 }

roles/common/programs/git.nix

@@ -9,15 +9,13 @@
       enable = true;
       userName = "Toast";
       userEmail = "toast003@tutamail.com";
-      delta = {
-        enable = true;
-        catppuccin.enable = true;
-      };
+      delta.enable = true;
       extraConfig = {
         init.defaultBranch = "main";
         diff.colorMoved = "default";
         commit.verbose = "true";
       };
     };
+    catppuccin.delta.enable = true;
   };
 }

roles/common/programs/helix.nix

@@ -5,6 +5,10 @@
 }: {
   programs.nano.enable = false;
   home-manager.users.toast = {
+    catppuccin.helix = {
+      enable = true;
+      useItalics = true;
+    };
     programs.helix = {
       enable = true;
       defaultEditor = true;
@@ -13,10 +17,6 @@
         nil
         taplo
       ];
-      catppuccin = {
-        enable = true;
-        useItalics = true;
-      };
       settings = {
         editor = {
           mouse = true;