diff --git a/flake.lock b/flake.lock
index 939d9b8..76572a4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -65,6 +65,71 @@
         "type": "github"
       }
     },
+    "catppuccin-alacritty": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1664239314,
+        "narHash": "sha256-w9XVtEe7TqzxxGUCDUR9BFkzLZjG8XrplXJ3lX6f+x0=",
+        "owner": "catppuccin",
+        "repo": "alacritty",
+        "rev": "3c808cbb4f9c87be43ba5241bc57373c793d2f17",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "ref": "yaml",
+        "repo": "alacritty",
+        "type": "github"
+      }
+    },
+    "catppuccin-bat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1668065083,
+        "narHash": "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=",
+        "owner": "catppuccin",
+        "repo": "bat",
+        "rev": "ba4d16880d63e656acced2b7d4e034e4a93f74b1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "bat",
+        "type": "github"
+      }
+    },
+    "catppuccin-btop": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696688295,
+        "narHash": "sha256-jodJl4f2T9ViNqsY9fk8IV62CrpC5hy7WK3aRpu70Cs=",
+        "owner": "catppuccin",
+        "repo": "btop",
+        "rev": "c6469190f2ecf25f017d6120bf4e050e6b1d17af",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "btop",
+        "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",
+        "type": "github"
+      }
+    },
     "crane": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -1269,6 +1334,10 @@
       "inputs": {
         "TP-calcul-parallele": "TP-calcul-parallele",
         "agenix": "agenix",
+        "catppuccin-alacritty": "catppuccin-alacritty",
+        "catppuccin-bat": "catppuccin-bat",
+        "catppuccin-btop": "catppuccin-btop",
+        "catppuccin-mako": "catppuccin-mako",
         "disko": "disko",
         "flake-parts": "flake-parts_2",
         "home-manager": "home-manager",
diff --git a/flake.nix b/flake.nix
index 5c80311..88edc0e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,6 +34,22 @@
       url = "https://images.unsplash.com/photo-1482686115713-0fbcaced6e28";
       flake = false;
     };
+    catppuccin-alacritty = {
+      url = "github:catppuccin/alacritty/yaml";
+      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;
+    };
 
     # hydrogen nginx sites
     resume.url = "git+https://git.fainsin.bzh/Laurent/resume";
diff --git a/home/alacritty/default.nix b/home/alacritty/default.nix
index a603f72..8e5b3d2 100644
--- a/home/alacritty/default.nix
+++ b/home/alacritty/default.nix
@@ -1,15 +1,8 @@
-{pkgs, ...}: let
-  catppuccin-alacritty = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "alacritty";
-    rev = "3c808cbb4f9c87be43ba5241bc57373c793d2f17";
-    sha256 = "07gvkxz9axvjjplpmwf6k0nk6n84gm20s0k5qkqsqkmv8ysdbmf3";
-  };
-in {
+{inputs, ...}: {
   programs.alacritty = {
     enable = true;
     settings = {
-      import = ["${catppuccin-alacritty}/catppuccin-mocha.yml"];
+      import = ["${inputs.catppuccin-alacritty}/catppuccin-mocha.yml"];
       window.opacity = 0.85;
       font = {
         normal.family = "FiraCode Nerd Font Mono";
diff --git a/home/shell/bat.nix b/home/shell/bat.nix
index de3d615..a5f0250 100644
--- a/home/shell/bat.nix
+++ b/home/shell/bat.nix
@@ -1,22 +1,21 @@
-{pkgs, ...}: let
-  catppuccin-bat = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "bat";
-    rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-    sha256 = "1g2r6j33f4zys853i1c5gnwcdbwb6xv5w6pazfdslxf69904lrg9";
-  };
-in {
+{
+  inputs,
+  pkgs,
+  ...
+}: {
   programs.bat = {
     enable = true;
+
     themes = {
       catppuccin = {
-        src = catppuccin-bat;
+        src = inputs.catppuccin-bat;
         file = "Catppuccin-mocha.tmTheme";
       };
     };
     config.theme = "catppuccin";
     extraPackages = with pkgs.bat-extras; [batman];
   };
+
   programs.zsh.shellAliases = {
     cat = "bat";
     man = "batman";
diff --git a/home/shell/btop.nix b/home/shell/btop.nix
index 9612d80..b0153d6 100644
--- a/home/shell/btop.nix
+++ b/home/shell/btop.nix
@@ -1,12 +1,5 @@
-{pkgs, ...}: let
-  catppuccin-btop = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "btop";
-    rev = "c6469190f2ecf25f017d6120bf4e050e6b1d17af";
-    sha256 = "sha256-jodJl4f2T9ViNqsY9fk8IV62CrpC5hy7WK3aRpu70Cs=";
-  };
-in {
-  xdg.configFile."btop/themes".source = "${catppuccin-btop}/themes";
+{inputs, ...}: {
+  xdg.configFile."btop/themes".source = "${inputs.catppuccin-btop}/themes";
 
   programs.btop = {
     enable = true;
@@ -14,7 +7,6 @@ in {
     settings = {
       theme_background = false;
       color_theme = "catppuccin_mocha";
-
       clock_format = "%Y-%m-%d %X";
     };
   };
diff --git a/home/wayland/fuzzel/default.nix b/home/wayland/fuzzel/default.nix
index f751242..f0e2e89 100644
--- a/home/wayland/fuzzel/default.nix
+++ b/home/wayland/fuzzel/default.nix
@@ -1,6 +1,7 @@
 {...}: {
   programs.fuzzel = {
     enable = true;
+
     settings = {
       main = {
         line-height = 15;
diff --git a/home/wayland/mako/default.nix b/home/wayland/mako/default.nix
index 93d2ca3..f6e6715 100644
--- a/home/wayland/mako/default.nix
+++ b/home/wayland/mako/default.nix
@@ -1,14 +1,7 @@
-{pkgs, ...}: let
-  catppuccin-mako = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "mako";
-    rev = "9dd088aa5f4529a3dd4d9760415e340664cb86df";
-    sha256 = "097x9jrkzvml6ngnhxwkzzl1l2awwv73yli1mhmpw83c0n8xck4x";
-  };
-in {
+{inputs, ...}: {
   services.mako = {
     enable = true;
     defaultTimeout = 5000;
-    extraConfig = builtins.readFile "${catppuccin-mako}/src/mocha";
+    extraConfig = builtins.readFile "${inputs.catppuccin-mako}/src/mocha";
   };
 }