From c226add411c205d26918494741613e312371f6f9 Mon Sep 17 00:00:00 2001
From: Sam <samual.shop@proton.me>
Date: Fri, 14 Jun 2024 12:18:25 +0100
Subject: [PATCH] added dmenu and moved st to x11

---
 .../optional/desktop/common/default.nix       |  1 -
 home/common/optional/desktop/x11/default.nix  |  2 +
 pkgs/default.nix                              |  1 +
 pkgs/dmenu/default.nix                        | 39 +++++++++++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/dmenu/default.nix

diff --git a/home/common/optional/desktop/common/default.nix b/home/common/optional/desktop/common/default.nix
index 58b2ba4..de06d13 100644
--- a/home/common/optional/desktop/common/default.nix
+++ b/home/common/optional/desktop/common/default.nix
@@ -8,7 +8,6 @@
   # Global packages for desktop environments
   home.packages = [
     pkgs.alacritty
-    pkgs.st
     pkgs.libnotify
     pkgs.zathura
     pkgs.xfce.thunar
diff --git a/home/common/optional/desktop/x11/default.nix b/home/common/optional/desktop/x11/default.nix
index 46db9da..99fd438 100644
--- a/home/common/optional/desktop/x11/default.nix
+++ b/home/common/optional/desktop/x11/default.nix
@@ -7,5 +7,7 @@
   home.packages = [
     pkgs.dunst
     pkgs.flameshot
+    pkgs.st
+    pkgs.dmenu
   ];
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index bf3e172..5c3ecc4 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -4,4 +4,5 @@ pkgs: {
   sddm-theme = pkgs.callPackage ./sddm-theme { };
   st = pkgs.callPackage ./st { };
   dwmblocks = pkgs.callPackage ./dwmblocks { };
+  dmenu = pkgs.callPackage ./dmenu { };
 }
diff --git a/pkgs/dmenu/default.nix b/pkgs/dmenu/default.nix
new file mode 100644
index 0000000..f7ac6b4
--- /dev/null
+++ b/pkgs/dmenu/default.nix
@@ -0,0 +1,39 @@
+{ pkgs ? import <nixpkgs> { }
+, fetchFromGitea ? pkgs.fetchFromGitea
+, pkg-config ? pkgs.pkg-config
+, libX11 ? pkgs.xorg.libX11
+, libXft ? pkgs.xorg.libXft
+, libXinerama ? pkgs.xorg.libXinerama
+}:
+pkgs.stdenv.mkDerivation {
+  pname = "dmenu";
+  name = "dmenu";
+
+  src = fetchFromGitea {
+    domain = "git.bitlab21.com";
+    owner = "sam";
+    repo = "dmenu";
+    rev = "deb38655db2ddb340258381f3a0a59e2d19207f1";
+    sha256 = "sha256-Wm5mIw4r3lPZDXlyO26Jr993Rq7dxMwBxeWnJ4UzQ1s=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libX11
+    libXft
+    libXinerama
+  ];
+
+  buildPhase = ''
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv dmenu dmenu_run dmenu_path stest $out/bin
+  '';
+
+}