Update inputs

home/fhauser/applications/kitty.nix

@@ -2,7 +2,7 @@
 {
   programs.kitty = {
     enable = true;
-    catppuccin.enable = true;
     settings.term = "xterm";
   };
+  catppuccin.kitty.enable = true;
 }

home/fhauser/applications/mako.nix

@@ -2,7 +2,6 @@
 {
   services.mako = {
     enable = true;
-    catppuccin.enable = true;
     #backgroundColor = "#CCCCCCCC"; # TODO: Make layout colors in a central place
     borderSize = 0;
     #borderColor = "#4C7899FF";
@@ -13,4 +12,5 @@
     #height = 100;
     #font = "monospace 10";
   }; # TODO
+  catppuccin.mako.enable = true;
 }

home/fhauser/applications/sway.nix

@@ -39,7 +39,6 @@ rec {
     wrapperFeatures = {
       gtk = true;
     };
-    catppuccin.enable = true;
     extraSessionCommands = ''
       #export XDG_CURRENT_DESKTOP=Unity
       export XDG_CURRENT_DESKTOP=sway
@@ -142,6 +141,7 @@ rec {
       output "*" bg ${./mountain.jpg} fill
     '';
   };
+  catppuccin.sway.enable = true;
 
   systemd.user.services.network-manager-applet = adhereTheSwayTarget;
   systemd.user.services.nextcloud-client = adhereTheSwayTarget // {
@@ -162,8 +162,8 @@ rec {
       name = "hicolor";
     };
     gtk3.extraConfig.gtk-menu-images = true;
-    catppuccin.enable = true;
   };
+  catppuccin.gtk.enable = true;
 
   dconf.settings = {
     "org/gnome/desktop/interface".menus-have-icons = true;

home/fhauser/applications/swaylock.nix

@@ -32,5 +32,5 @@
       };
     };
 
-  programs.swaylock.catppuccin.enable = true;
+  catppuccin.swaylock.enable = true;
 }

home/fhauser/applications/vim.nix

@@ -6,7 +6,6 @@
     viAlias = true;
     vimAlias = true;
     vimdiffAlias = true;
-    catppuccin.enable = true;
     extraConfig = ''
       " colorscheme elflord
       set autoindent
@@ -55,4 +54,5 @@
       vim-airline
     ];
   };
+  catppuccin.nvim.enable = true;
 }