From 09a33b5368c6d7d46cd8d4c03f8d7de5a5c82137 Mon Sep 17 00:00:00 2001
From: FredzyW <fredrik@wastring.com>
Date: Fri, 14 Jun 2024 17:34:04 +0200
Subject: [PATCH] Back to Catppuccin

---
 moduler/common/dwm.nix   | 11 +----------
 moduler/common/kitty.nix |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/moduler/common/dwm.nix b/moduler/common/dwm.nix
index a5f3358..2ccbdec 100644
--- a/moduler/common/dwm.nix
+++ b/moduler/common/dwm.nix
@@ -3,12 +3,7 @@ let
   dwm = pkgs.dwm.overrideAttrs (old: {
     src = builtins.fetchGit {
       url = "https://github.com/FredzyW/dwm-conf.git";
-      # rev = "99a1e812295bcf65625a4b5a0dc1022658977920";
-      # rev = "99f005ad0e5e5c904262e980b541cd6f0d001949";
-      rev = "08965507ccd586f008cb0172ba7eee628542c5b9";
-      # rev = "577d43c76b193f45ed74f9f403946ea3cc4298cf";
-      # url = "https://git.wastring.com/fw/dwm.git";
-      # rev = "04039f157960b83f1ab8abebb0ea77c72a75a249";
+      rev = "d64126c51f50278165dcb6d01b2c345158a156da";
     };
     nativeBuildInputs = with pkgs; [ 
       xorg.libX11.dev
@@ -21,15 +16,11 @@ let
     src = builtins.fetchGit {
       url = "https://github.com/FredzyW/dwmblocks.git";
       rev = "7c81c55390f2deec2a3804217abe80221ef6f46a";
-      # url = "https://git.wastring.com/fw/dwmblocks.git";
-      # rev = "ce19d482155f3292dc77179a2485670a48d2669c";
     };
   }) else pkgs.dwmblocks.overrideAttrs (old: {
     src = builtins.fetchGit {
       url = "https://github.com/FredzyW/dwmblocks.git";
       rev = "a334789ec7b9171a3c8e1fcac2ffe8463ee438dc";
-      # url = "https://git.wastring.com/fw/dwmblocks.git";
-      # rev = "52198f692f5965b3e86577e8481e035d4c37ab52";
     };
   });
 in
diff --git a/moduler/common/kitty.nix b/moduler/common/kitty.nix
index 96b406b..2d094b6 100644
--- a/moduler/common/kitty.nix
+++ b/moduler/common/kitty.nix
@@ -12,7 +12,7 @@
     shellIntegration = {
       mode = "no-cursor";
     };
-    theme = "Dracula";
+    theme = "Catppuccin-Macchiato";
     settings = {
       confirm_os_window_close = 2;
       cursor_shape = "block";