diff --git a/modules/home/programs/waybar/default.nix b/modules/home/programs/waybar/default.nix
index b6dcd5e..43c3495 100644
--- a/modules/home/programs/waybar/default.nix
+++ b/modules/home/programs/waybar/default.nix
@@ -24,7 +24,9 @@ in {
       enable = true;
       systemd.enable = true;
 
-      style = builtins.readFile ./waybar_style.css;
+      style =
+        builtins.readFile "${pkgs.aa.catppuccin-waybar}/catppuccin.css"
+        + builtins.readFile ./waybar_style.css;
 
       settings = [
         {
diff --git a/modules/home/programs/waybar/waybar_style.css b/modules/home/programs/waybar/waybar_style.css
index dadaf9c..92054da 100644
--- a/modules/home/programs/waybar/waybar_style.css
+++ b/modules/home/programs/waybar/waybar_style.css
@@ -5,9 +5,8 @@
 }
 
 window#waybar {
-    background-color: rgba(29, 32, 33, 0.9);
-    border-bottom: 3px solid #1d2021;
-    color: #ffffdf;
+    background-color: @base;
+    color: @text;
     transition-property: background-color;
     transition-duration: .5s;
 }
@@ -30,10 +29,10 @@ window#waybar.hidden {
 #network,
 #tray,
 #custom-notification {
-    background-color: #303030;
+    background-color: @crust;
     padding: 0 10px;
     margin: 3px;
-    border: 3px solid rgba(0, 0, 0, 0);
+    /* border: 3px solid rgba(0, 0, 0, 0); */
     border-radius: 90px;
     background-clip: padding-box;
 }
@@ -41,7 +40,7 @@ window#waybar.hidden {
 #workspaces button {
     padding: 0 5px;
     min-width: 20px;
-    color: #87afaf;
+    color: @blue;
 }
 
 #workspaces button:hover {
@@ -49,63 +48,58 @@ window#waybar.hidden {
 }
 
 #workspaces button.focused {
-    color: #ffaf00;
+    color: @yellow;
 }
 
 #workspaces button.urgent {
-    color: #e06c75;
+    color: @red;
 }
 
 #clock {
-    color: #61afef;
+    color: @sky;
 }
 
 #idle_inhibitor {
-    color: #abb2bf;
+    color: @sky;
 }
 
 #idle_inhibitor.activated {
-    background-color: #abb2bf;
-    color: #1e222a;
+    background-color: @overlay0;
 }
 
 #temperature {
-    color: #fb4934;
+    color: @red;
 }
 
 #temperature.critical {
-    color: #1d2021;
-    background-color: #9d0006;
+    background-color: @overlay0;
 }
 
 #cpu {
-    color: #ff8700;
+    color: @peach;
 }
 
 #memory {
-    color: #87af87;
+    color: @sky;
 }
 
 #battery {
-    color: #b8bb26;
+    color: @green;
 }
 
 #battery.charging,
 #battery.plugged {
-    background-color: #1f321c;
-    color: #ffffaf;
+    background-color: @overlay0;
 }
 
 @keyframes blink {
     to {
-        background-color: #1f321c;
-        color: #ffffaf;
+        background-color: @overlay0;
     }
 }
 
 #battery.critical:not(.charging) {
-    background-color: #afaf00;
-    color: #303030;
+    background-color: @overlay0;
     animation-name: blink;
     animation-duration: 0.5s;
     animation-timing-function: linear;
@@ -114,25 +108,25 @@ window#waybar.hidden {
 }
 
 #pulseaudio {
-    color: #fabd2f;
+    color: @yellow;
 }
 
 #pulseaudio.muted {
-    color: #b57614;
+    color: @peach;
 }
 
 #backlight {
-    color: #17ccd5;
+    color: @blue;
 }
 
 #network {
-    color: #d787af;
+    color: @mauve;
 }
 
 #network.disconnected {
-    color: #875f87;
+    color: @rosewater;
 }
 
 #custom\/notification {
-    color: red;
+    color: @red;
 }
diff --git a/packages/catppuccin-waybar/default.nix b/packages/catppuccin-waybar/default.nix
new file mode 100644
index 0000000..0544aa3
--- /dev/null
+++ b/packages/catppuccin-waybar/default.nix
@@ -0,0 +1,24 @@
+{
+  stdenv,
+  flavor ? "mocha",
+  font ? "Hack Nerd Font",
+  fetchurl,
+  ...
+}:
+stdenv.mkDerivation rec {
+  pname = "catpuccin-waybar";
+  version = "1.1";
+
+  src = fetchurl {
+    url = "https://github.com/catppuccin/waybar/releases/download/v${version}/${flavor}.css";
+    hash = "sha256-llnz9uTFmEiQtbfMGSyfLb4tVspKnt9Fe5lo9GbrVpE=";
+  };
+
+  dontBuild = true;
+  dontUnpack = true;
+
+  installPhase = ''
+    mkdir -p "$out"
+    cp "$src" "$out/catppuccin.css"
+  '';
+}