From 9fada7f2c575a5132040f1ec04bebcf5e44f557b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Czy=C5=BC?= <mike@c2yz.com>
Date: Mon, 22 Apr 2024 10:37:18 +0200
Subject: [PATCH] custom dwm

---
 .gitmodules                     |  3 ---
 flake.nix                       |  2 +-
 hosts/thor/gui.nix              |  9 +--------
 hosts/zion/gui.nix              |  9 +--------
 overlays/default.nix            |  3 ++-
 pkgs/default.nix                |  4 +++-
 pkgs/dwm-customized/default.nix | 27 +++++++++++++++++++++++++++
 7 files changed, 35 insertions(+), 22 deletions(-)
 delete mode 100644 .gitmodules
 create mode 100644 pkgs/dwm-customized/default.nix

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index aa6ba26..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "home-manager/features/desktop/dwm/dwm"]
-	path = home-manager/features/desktop/dwm/dwm
-	url = git@github.com:eRgo35/dwm.git
diff --git a/flake.nix b/flake.nix
index 80e84a8..7fb030a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,7 +62,7 @@
   in {
     # Your custom packages
     # Accessible through 'nix build', 'nix shell', etc
-    packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
+    # packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
     # Formatter for your nix files, available through 'nix fmt'
     # Other options beside 'alejandra' include 'nixpkgs-fmt'
     formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
diff --git a/hosts/thor/gui.nix b/hosts/thor/gui.nix
index 74126d2..d285084 100644
--- a/hosts/thor/gui.nix
+++ b/hosts/thor/gui.nix
@@ -25,14 +25,7 @@
     windowManager = {
       dwm = {
         enable = true;
-        package = pkgs.dwm.overrideAttrs {
-          src = pkgs.fetchFromGitHub {
-            owner = "eRgo35";
-            repo = "dwm";
-            rev = "a1725eb3c64d27864972a976c8ee18d63a8d9dad";
-            sha256 = "sha256-sY6qFqfkfGtLmi+7mownx3bolM2mVNdhS9VUO6KimKk=";
-          };
-        };
+        package = pkgs.dwm-customized;
       };
     };
 
diff --git a/hosts/zion/gui.nix b/hosts/zion/gui.nix
index 7fbb143..bf9de5a 100644
--- a/hosts/zion/gui.nix
+++ b/hosts/zion/gui.nix
@@ -34,14 +34,7 @@
     windowManager = {
       dwm = {
         enable = true;
-        package = pkgs.dwm.overrideAttrs {
-          src = pkgs.fetchFromGitHub {
-            owner = "eRgo35";
-            repo = "dwm";
-            rev = "a1725eb3c64d27864972a976c8ee18d63a8d9dad";
-            sha256 = "sha256-sY6qFqfkfGtLmi+7mownx3bolM2mVNdhS9VUO6KimKk=";
-          };
-        };
+        package = pkgs.dwm-customized;
       };
     };
 
diff --git a/overlays/default.nix b/overlays/default.nix
index 076bbe3..e2ec906 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,7 +1,8 @@
 # This file defines overlays
 {inputs, ...}: {
   # This one brings our custom packages from the 'pkgs' directory
-  additions = final: _prev: import ../pkgs {pkgs = final;};
+  additions = final: _prev: 
+    import ../pkgs {pkgs = final;};
 
   # This one contains whatever you want to overlay
   # You can change versions, add patches, set compilation flags, anything really.
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 3d9e23c..143eaef 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,5 +1,7 @@
 # Custom packages, that can be defined similarly to ones from nixpkgs
 # You can build them using 'nix build .#example'
-pkgs: {
+{
+  pkgs ? import <nixpkgs> {}}: rec {
   # example = pkgs.callPackage ./example { };
+  dwm-customized = pkgs.callPackage ./dwm-customized {};
 }
diff --git a/pkgs/dwm-customized/default.nix b/pkgs/dwm-customized/default.nix
new file mode 100644
index 0000000..37e87a7
--- /dev/null
+++ b/pkgs/dwm-customized/default.nix
@@ -0,0 +1,27 @@
+{ 
+  stdenv, 
+  pkgs, 
+  libX11, 
+  libXinerama, 
+  libXft, 
+  ... 
+}:
+stdenv.mkDerivation {
+  pname = "dwm-customized";
+  version = "6.4";
+
+  src = pkgs.fetchFromGitHub {
+    owner = "eRgo35";
+    repo  = "dwm";
+    rev   = "main";
+    sha256 = "sha256-KA/g84/QgbihwRT8VuFVr8EXe0L15kFvNW82PRBASa0=";
+  };
+
+  # unpackPhase = ''tar -xf $src'';
+  
+  buildInputs = [ libX11 libXinerama libXft ];
+
+  buildPhase  = ''make'';
+
+  installPhase = ''make PREFIX=$out DESTDIR="" install'';
+}