From a69d92e18bafd029091606c7e9b60ebd41946318 Mon Sep 17 00:00:00 2001
From: Sravan Balaji <balajsra@umich.edu>
Date: Thu, 28 Mar 2024 08:17:33 -0400
Subject: [PATCH] More dwm build dependencies and build from local src files
 (still not working

---
 flake.lock         | 24 ++++++++++++------------
 flake.nix          |  2 +-
 system/gui/dwm.nix | 12 ++++++++----
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 380915a..e5a37d1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -154,11 +154,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711462743,
-        "narHash": "sha256-3wKGpHy9Kyh98DrziqC/s//60Q0pE17NgbY93L0uWng=",
+        "lastModified": 1711588700,
+        "narHash": "sha256-vBB5HoQVnA6c/UrDOhLXKAahEwSRccw2YXYHxD7qoi4=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "a6717b1afee7ae955c61eefdf0ce8f864ef78115",
+        "rev": "502241afa3de2a24865ddcbe4c122f4546e32092",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711554349,
-        "narHash": "sha256-RypwcWEIFePBI0Hubfj4chanbM/G2yzJzC6wgz+dmS4=",
+        "lastModified": 1711625603,
+        "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "179f6acaf7c068c7870542cdae72afec9427a5b0",
+        "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
         "type": "github"
       },
       "original": {
@@ -260,11 +260,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1711333969,
-        "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=",
+        "lastModified": 1711523803,
+        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b",
+        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
         "type": "github"
       },
       "original": {
@@ -332,11 +332,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1711224130,
-        "narHash": "sha256-RyOvyQASi5lvKLH5ISiGGkdX1eJxYF25aQALGfN9U0k=",
+        "lastModified": 1711615973,
+        "narHash": "sha256-43KrbzuVf4ZnJ849OInG/yt+Fq6hIiITxRj02U5mUeM=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "53d3e5d5b36a5227b906e00d7e884dcfb7852403",
+        "rev": "75fd247712ac54d756b7c0bb7150dc6858d29522",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index c7cccc8..0a079cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,7 @@
         email = "balajsra@umich.edu"; # Email (used for certain configurations)
         dotfilesDir = "~/.dotfiles";  # Absolute path of the local repo
         theme = "dracula";            # Selected theme from themes directory
-        desktop = "kde";              # Selected window manager or desktop environment
+        desktop = "gnome";            # Selected window manager or desktop environment
         desktopType = "x11";          # x11 or wayland
         browser = "vivaldi";          # Default browser
         term = "kitty";               # Default terminal command
diff --git a/system/gui/dwm.nix b/system/gui/dwm.nix
index 0dcbc2b..7655a07 100644
--- a/system/gui/dwm.nix
+++ b/system/gui/dwm.nix
@@ -11,21 +11,25 @@
     overlays = [
       (self: super: {
         dwm = super.dwm.overrideAttrs (oldattrs: {
-          src = fetchGit {
-            url = "https://gitea.sravanbalaji.com/sravan/dwm-flexipatch.git";
-            rev = "23b55eaf9cd9c08d4c14f7957675ae056e358e32";
-          };
+          src = /home/sravan/.config/dwm-flexipatch;
           buildInputs = with pkgs; [
             xorg.libX11
             xorg.libXinerama
             xorg.libXft
+            xorg.libxcb
+            xorg.xcbutil
             yajl
+            jsoncpp
           ];
         });
       })
     ];
   };
 
+  environment.systemPackages = with pkgs; [
+    polybar
+  ];
+
   services.xserver.windowManager.dwm.enable = true;
   services.xserver.displayManager.defaultSession = "none+dwm";
 }