From 7b74da4213aee726d9fe6ef66a987926a69b4470 Mon Sep 17 00:00:00 2001
From: Jakub Czajka <jakub@ekhem.eu.org>
Date: Sat, 24 Dec 2022 13:33:33 +0100
Subject: [PATCH] [system] Install custom versions of dwm and dmenu.

The source code is obtained from a self-hosted git instance.
---
 conf/system/desktop.scm | 55 +++++++++++++++++++++++++++++++++++++++++
 system.scm              |  2 ++
 2 files changed, 57 insertions(+)
 create mode 100644 conf/system/desktop.scm

diff --git a/conf/system/desktop.scm b/conf/system/desktop.scm
new file mode 100644
index 0000000..80a1cb7
--- /dev/null
+++ b/conf/system/desktop.scm
@@ -0,0 +1,55 @@
+;; Copyright (c) 2022 Jakub Czajka <jakub@ekhem.eu.org>
+;; License: GPL-3.0 or later.
+;;
+;; desktop.scm - desktop services for the system configuration.
+
+(define-module (conf system desktop)
+  #:use-module (conf common fonts)
+  #:use-module (conf common suckless)
+  #:use-module (gnu packages fonts)
+  #:use-module (gnu packages suckless)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:export (dwm-desktop-packages))
+
+(define dmenu-libxft-bgra
+  (package
+   (inherit dmenu)
+   (name "dmenu-bgra")
+   (source
+    (origin
+     (method git-fetch)
+     (uri (git-reference
+           (url "https://git.ekhem.eu.org/dmenu.git")
+           (commit "b356924a52a39952f06f81d1ee2c466c0aa4700c")))
+     (sha256
+      (base32
+       "0vcwnjwh80vdwsbcdww3j8v6wr2d4lil9q580nj1fz1y4zsqbfwz"))))
+   (inputs
+    (modify-inputs (package-inputs dmenu)
+		   (delete "libxft")
+		   (append libxft-bgra)))))
+
+(define dwm-libxft-bgra
+  (package
+   (inherit dwm)
+   (name "dwm-bgra")
+   (source
+    (origin
+     (method git-fetch)
+     (uri (git-reference
+           (url "https://git.ekhem.eu.org/dwm.git")
+           (commit "e1e9f6ee52f9659359114886a01eaef97e9fa65c")))
+     (sha256
+      (base32
+       "0qwyw12blql48aw4m7z9j96ic9215dpx0ifr0qc8rk10xkh9garf"))))
+   (inputs
+    (modify-inputs (package-inputs dwm)
+		   (delete "libxft")
+		   (append libxft-bgra)))))
+
+(define dwm-desktop-packages
+  (list dmenu-libxft-bgra
+	dwm-libxft-bgra
+	font-google-noto
+	font-meslo))
diff --git a/system.scm b/system.scm
index 51611dd..7bcb860 100644
--- a/system.scm
+++ b/system.scm
@@ -4,6 +4,7 @@
 ;; system.scm - system configuration for GNU Guix.
 
 (use-modules (conf system bluetooth)
+	     (conf system desktop)
              (conf system dns)
              (conf system volume)
              (gnu)
@@ -64,6 +65,7 @@
 	 nss-certs
 	 bluez
 	 volume)
+   dwm-desktop-packages
    %base-packages))
  (timezone "Europe/Warsaw")
  (locale "en_US.UTF-8")
-- 
2.39.5