diff --git a/flake.lock b/flake.lock
index b2a0537..cbd2fd3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -79,83 +79,18 @@
         "type": "github"
       }
     },
-    "catppuccin-alacritty": {
-      "flake": false,
+    "catppuccin": {
       "locked": {
-        "lastModified": 1712663324,
-        "narHash": "sha256-Pi1Hicv3wPALGgqurdTzXEzJNx7vVh+8B9tlqhRpR2Y=",
+        "lastModified": 1718339789,
+        "narHash": "sha256-Q3fgY7huFE+uaw7BNsAl1x+FvjDAi3EDWPnlALJt5pM=",
         "owner": "catppuccin",
-        "repo": "alacritty",
-        "rev": "94800165c13998b600a9da9d29c330de9f28618e",
+        "repo": "nix",
+        "rev": "73e06d5bd7ed34bdd0168030893ef8364fdc1d4a",
         "type": "github"
       },
       "original": {
         "owner": "catppuccin",
-        "repo": "alacritty",
-        "type": "github"
-      }
-    },
-    "catppuccin-bat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1714038927,
-        "narHash": "sha256-Q5B4NDrfCIK3UAMs94vdXnR42k4AXCqZz6sRn8bzmf4=",
-        "owner": "catppuccin",
-        "repo": "bat",
-        "rev": "d714cc1d358ea51bfc02550dabab693f70cccea0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "bat",
-        "type": "github"
-      }
-    },
-    "catppuccin-btop": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1715687124,
-        "narHash": "sha256-UXeTypc15MhjgGUiCrDUZ40m32yH2o1N+rcrEgY6sME=",
-        "owner": "catppuccin",
-        "repo": "btop",
-        "rev": "21b8d5956a8b07fa52519e3267fb3a2d2e693d17",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "btop",
-        "type": "github"
-      }
-    },
-    "catppuccin-fish": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1715687686,
-        "narHash": "sha256-shQxlyoauXJACoZWtRUbRMxmm10R8vOigXwjxBhG8ng=",
-        "owner": "catppuccin",
-        "repo": "fish",
-        "rev": "a3b9eb5eaf2171ba1359fe98f20d226c016568cf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "fish",
-        "type": "github"
-      }
-    },
-    "catppuccin-mako": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1691845483,
-        "narHash": "sha256-nUzWkQVsIH4rrCFSP87mXAka6P+Td2ifNbTuP7NM/SQ=",
-        "owner": "catppuccin",
-        "repo": "mako",
-        "rev": "9dd088aa5f4529a3dd4d9760415e340664cb86df",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "mako",
+        "repo": "nix",
         "type": "github"
       }
     },
@@ -939,11 +874,7 @@
         "TP-calcul-parallele": "TP-calcul-parallele",
         "TP-reinforcement-learning": "TP-reinforcement-learning",
         "agenix": "agenix",
-        "catppuccin-alacritty": "catppuccin-alacritty",
-        "catppuccin-bat": "catppuccin-bat",
-        "catppuccin-btop": "catppuccin-btop",
-        "catppuccin-fish": "catppuccin-fish",
-        "catppuccin-mako": "catppuccin-mako",
+        "catppuccin": "catppuccin",
         "disko": "disko",
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
diff --git a/flake.nix b/flake.nix
index d2e4dc0..99de079 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,30 +59,13 @@
       url = "github:nix-community/impermanence";
     };
 
-    # home assets
+    # home stuff
     wallpaper = {
       url = "https://images.unsplash.com/photo-1482686115713-0fbcaced6e28";
       flake = false;
     };
-    catppuccin-alacritty = {
-      url = "github:catppuccin/alacritty";
-      flake = false;
-    };
-    catppuccin-bat = {
-      url = "github:catppuccin/bat";
-      flake = false;
-    };
-    catppuccin-btop = {
-      url = "github:catppuccin/btop";
-      flake = false;
-    };
-    catppuccin-mako = {
-      url = "github:catppuccin/mako";
-      flake = false;
-    };
-    catppuccin-fish = {
-      url = "github:catppuccin/fish";
-      flake = false;
+    catppuccin = {
+      url = "github:catppuccin/nix";
     };
 
     # cesium nginx sites
diff --git a/home/alacritty/default.nix b/home/alacritty/default.nix
index 09eb842..5990296 100644
--- a/home/alacritty/default.nix
+++ b/home/alacritty/default.nix
@@ -1,8 +1,7 @@
-{inputs, ...}: {
+{...}: {
   programs.alacritty = {
     enable = true;
     settings = {
-      import = ["${inputs.catppuccin-alacritty}/catppuccin-mocha.toml"];
       window.opacity = 0.85;
       font = {
         normal.family = "FiraCode Nerd Font Mono";
diff --git a/home/catppuccin/default.nix b/home/catppuccin/default.nix
new file mode 100644
index 0000000..65a029d
--- /dev/null
+++ b/home/catppuccin/default.nix
@@ -0,0 +1,7 @@
+{...}: {
+  catppuccin = {
+    enable = true;
+    flavor = "mocha";
+    accent = "blue";
+  };
+}
diff --git a/home/default.nix b/home/default.nix
index f4743d9..5ea60e2 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,9 +1,12 @@
 {inputs, ...}: {
-  config.home.stateVersion = "23.05";
+  config.home.stateVersion = "24.05";
+
   imports = [
     inputs.hyprland.homeManagerModules.default
+    inputs.catppuccin.homeManagerModules.catppuccin
 
     ./packages.nix
+    ./catppuccin
 
     ./alacritty
     ./firefox
diff --git a/home/gtk/default.nix b/home/gtk/default.nix
index 4e79f41..7e2da5b 100644
--- a/home/gtk/default.nix
+++ b/home/gtk/default.nix
@@ -8,30 +8,11 @@
       size = 10;
     };
 
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.catppuccin-papirus-folders.override {
-        flavor = "mocha";
-        accent = "blue";
-      };
+    catppuccin = {
+      enable = true;
+      size = "compact";
+      tweaks = ["rimless" "normal"];
+      cursor.accent = "dark";
     };
-
-    theme = {
-      name = "Catppuccin-Mocha-Compact-Blue-Dark";
-      package = pkgs.catppuccin-gtk.override {
-        tweaks = ["rimless" "normal"];
-        accents = ["blue"];
-        variant = "mocha";
-        size = "compact";
-      };
-    };
-  };
-
-  home.pointerCursor = {
-    name = "Catppuccin-Mocha-Dark-Cursors";
-    package = pkgs.catppuccin-cursors.mochaDark;
-    size = 20;
-    gtk.enable = true;
-    x11.enable = true;
   };
 }
diff --git a/home/shell/bat.nix b/home/shell/bat.nix
index d8a8f4d..551cc06 100644
--- a/home/shell/bat.nix
+++ b/home/shell/bat.nix
@@ -1,18 +1,6 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   programs.bat = {
     enable = true;
-
-    themes = {
-      catppuccin = {
-        src = inputs.catppuccin-bat;
-        file = "Catppuccin-mocha.tmTheme";
-      };
-    };
-    config.theme = "catppuccin";
     extraPackages = with pkgs.bat-extras; [batman];
   };
 
diff --git a/home/shell/btop.nix b/home/shell/btop.nix
index 9f6f3e0..c80c79c 100644
--- a/home/shell/btop.nix
+++ b/home/shell/btop.nix
@@ -1,15 +1,10 @@
-{inputs, ...}: {
-  xdg.configFile."btop/themes".source = "${inputs.catppuccin-btop}/themes";
-
+{...}: {
   programs.btop = {
     enable = true;
 
     settings = {
       theme_background = false;
-      color_theme = "catppuccin_mocha";
       clock_format = "%Y-%m-%d %X";
     };
   };
-
-  programs.fish.shellAliases.htop = "btop";
 }
diff --git a/home/shell/fish.nix b/home/shell/fish.nix
index 02105ff..364d69e 100644
--- a/home/shell/fish.nix
+++ b/home/shell/fish.nix
@@ -1,6 +1,4 @@
-{inputs, ...}: {
-  xdg.configFile."fish/themes".source = "${inputs.catppuccin-fish}/themes";
-
+{...}: {
   programs.fish = {
     enable = true;
 
diff --git a/home/vscode/default.nix b/home/vscode/default.nix
index 9c68c0d..56cdae4 100644
--- a/home/vscode/default.nix
+++ b/home/vscode/default.nix
@@ -36,8 +36,8 @@
       "window.menuBarVisibility" = "toggle";
       "window.zoomLevel" = -0.75;
       "workbench.colorTheme" = "Catppuccin Mocha";
-      "workbench.editor.empty.hint" = "hidden";
       "workbench.iconTheme" = "catppuccin-mocha";
+      "workbench.editor.empty.hint" = "hidden";
       "gitlens.telemetry.enabled" = false;
       "telemetry.telemetryLevel" = "off";
       "editor.inlineSuggest.enabled" = true;
diff --git a/home/wayland/mako/default.nix b/home/wayland/mako/default.nix
index f6e6715..b16adec 100644
--- a/home/wayland/mako/default.nix
+++ b/home/wayland/mako/default.nix
@@ -1,7 +1,6 @@
-{inputs, ...}: {
+{...}: {
   services.mako = {
     enable = true;
     defaultTimeout = 5000;
-    extraConfig = builtins.readFile "${inputs.catppuccin-mako}/src/mocha";
   };
 }
diff --git a/home/wayland/swaylock/default.nix b/home/wayland/swaylock/default.nix
index 3824400..f4b60dd 100644
--- a/home/wayland/swaylock/default.nix
+++ b/home/wayland/swaylock/default.nix
@@ -6,6 +6,7 @@
   programs.swaylock = {
     enable = true;
     package = pkgs.swaylock-effects;
+    catppuccin.enable = false;
 
     settings = {
       image = "${inputs.wallpaper}";
diff --git a/hosts/aurum/system/default.nix b/hosts/aurum/system/default.nix
index f11ef7d..8f7a726 100644
--- a/hosts/aurum/system/default.nix
+++ b/hosts/aurum/system/default.nix
@@ -5,7 +5,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 
   imports = [
     ./audio
diff --git a/hosts/cesium/system/default.nix b/hosts/cesium/system/default.nix
index 5a40288..1decc50 100644
--- a/hosts/cesium/system/default.nix
+++ b/hosts/cesium/system/default.nix
@@ -5,7 +5,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.05"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 
   imports = [
     # https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/scan/not-detected.nix
diff --git a/hosts/default.nix b/hosts/default.nix
index 666e3e4..9040515 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -41,6 +41,7 @@ in {
     };
     modules = [
       ./aurum
+      inputs.catppuccin.nixosModules.catppuccin
       inputs.home-manager.nixosModules.home-manager
       # inputs.disko.nixosModules.default
       # inputs.lanzaboote.nixosModules.lanzaboote
diff --git a/hosts/silicium/system/default.nix b/hosts/silicium/system/default.nix
index 06170ce..e8ef07b 100644
--- a/hosts/silicium/system/default.nix
+++ b/hosts/silicium/system/default.nix
@@ -5,7 +5,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 
   imports = [
     ./adb