From 07dd8e37eb767c3dd6abf63e5e4a720cd778da15 Mon Sep 17 00:00:00 2001
From: jdlugosz963 <jdlugosz963@gmail.com>
Date: Wed, 8 May 2024 20:31:14 +0200
Subject: Add terminus-ttf font.

---
 guix/jd/home/services/desktop.scm | 180 +++++++++++++++++++-------------------
 guix/jd/packages/fonts.scm        |  25 ++++++
 2 files changed, 117 insertions(+), 88 deletions(-)
 create mode 100644 guix/jd/packages/fonts.scm

diff --git a/guix/jd/home/services/desktop.scm b/guix/jd/home/services/desktop.scm
index c53377f..ec3a53a 100644
--- a/guix/jd/home/services/desktop.scm
+++ b/guix/jd/home/services/desktop.scm
@@ -13,97 +13,101 @@
   #:use-module (gnu home services sound)
   #:use-module (gnu home services xdg)
   #:use-module (gnu home services gnupg)
-  #:use-module (guix gexp))
+  #:use-module (guix gexp)
+
+  #:use-module (jd packages fonts))
 
 (define (desktop-profile-service config)
-  (specifications->packages '(;; sway
-			      "swayfx"
-			      "swaylock"
-			      "swayidle"
-			      "waybar"
-			      "fuzzel"
-			      "foot"
-			      "mako"
-			      "wl-clipboard"
-			      "wlsunset"
-			      "grimshot"
+  (append
+   (list font-terminus-ttf)
+   (specifications->packages '( ;; sway
+			       "swayfx"
+			       "swaylock"
+			       "swayidle"
+			       "waybar"
+			       "fuzzel"
+			       "foot"
+			       "mako"
+			       "wl-clipboard"
+			       "wlsunset"
+			       "grimshot"
 			      
-			      "udiskie"
-			      ;; rest
-			      "qutebrowser"
-			      "ungoogled-chromium"
-			      "firefox"
-			      "tor-client"
-			      "signal-desktop"
-
-			      "pulsemixer"
-			      "pavucontrol"
-			      "alsa-utils"
-
-			      "virt-manager"
-
-			      "flatpak"
-			      "redshift"
-			      "fontmanager"
-
-			      "polybar"
-
-			      "blueman"
-
-			      "xdg-utils"
-			      "xdg-dbus-proxy"
-			      "xdg-desktop-portal-gtk"
-			      "xdg-desktop-portal-wlr"
-			      "glib:bin"
-			      "gtk+:bin"
-			      "gnome-keyring"
-			      "shared-mime-info"
-			      "libnotify"
-			      "dconf"
-			      "hicolor-icon-theme"
-
-			      "dunst"
-
-			      "gimp"
-			      "inkscape"
-
-			      "mpv"
-			      "youtube-dl"
-
-			      "pamixer"
-			      "playerctl"
-			      "scrot"
-			      "brightnessctl"
-			      "upower"
-			      "tlp"
-			      "feh"
-			      "alacritty"
-
-			      "curl"
-			      "wget"
-			      "zip"
-			      "unzip"
-			      "qrencode"
-			      "trash-cli"
-			      "pandoc"
-			      "password-store"
-			      "oath-toolkit"
-			      ;; "pinentry"
-
-			      "syncthing"
-			      "syncthing-gtk"
-
-			      "xmodmap"
-			      "xrandr"
-			      "arandr"
-			      "xss-lock"
-			      "libinput"
-			      "xinput"
-			      "xprop"
-			      "rlwrap"
-
-			      "nheko"
-			      "quassel")))
+			       "udiskie"
+			       ;; rest
+			       "qutebrowser"
+			       "ungoogled-chromium"
+			       "firefox"
+			       "tor-client"
+			       "signal-desktop"
+
+			       "pulsemixer"
+			       "pavucontrol"
+			       "alsa-utils"
+
+			       "virt-manager"
+
+			       "flatpak"
+			       "redshift"
+			       "fontmanager"
+
+			       "polybar"
+
+			       "blueman"
+
+			       "xdg-utils"
+			       "xdg-dbus-proxy"
+			       "xdg-desktop-portal-gtk"
+			       "xdg-desktop-portal-wlr"
+			       "glib:bin"
+			       "gtk+:bin"
+			       "gnome-keyring"
+			       "shared-mime-info"
+			       "libnotify"
+			       "dconf"
+			       "hicolor-icon-theme"
+
+			       "dunst"
+
+			       "gimp"
+			       "inkscape"
+
+			       "mpv"
+			       "youtube-dl"
+
+			       "pamixer"
+			       "playerctl"
+			       "scrot"
+			       "brightnessctl"
+			       "upower"
+			       "tlp"
+			       "feh"
+			       "alacritty"
+
+			       "curl"
+			       "wget"
+			       "zip"
+			       "unzip"
+			       "qrencode"
+			       "trash-cli"
+			       "pandoc"
+			       "password-store"
+			       "oath-toolkit"
+			       ;; "pinentry"
+
+			       "syncthing"
+			       "syncthing-gtk"
+
+			       "xmodmap"
+			       "xrandr"
+			       "arandr"
+			       "xss-lock"
+			       "libinput"
+			       "xinput"
+			       "xprop"
+			       "rlwrap"
+
+			       "nheko"
+			       "quassel"))))
 
 (define (desktop-environment-variables-service config)
   `(("GTK_THEME" . "Adwaita:dark")
diff --git a/guix/jd/packages/fonts.scm b/guix/jd/packages/fonts.scm
new file mode 100644
index 0000000..fa70722
--- /dev/null
+++ b/guix/jd/packages/fonts.scm
@@ -0,0 +1,25 @@
+(define-module (jd packages fonts)
+  #:use-module (gnu packages)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system font)
+  #:use-module ((guix licenses) #:prefix license:))
+
+(define-public font-terminus-ttf
+  (package
+    (name "font-terminus-ttf")
+    (version "4.49.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://files.ax86.net/terminus-ttf/files/"
+				  version "/terminus-ttf-" version ".zip"))
+              (sha256
+               (base32
+                "0xvm4mcf0gx7df35swqwxb7a5h3z0gf6dkg6zy84b6nrk0fr5b8f"))))
+    (build-system font-build-system)
+    (home-page "https://files.ax86.net/terminus-ttf/")
+    (synopsis "Terminus TTF Font")
+    (description
+     "Terminus TTF is a TrueType version of Terminus Font, a fixed-width bitmap font optimized for long work with computers.")
+    (license license:gpl2+)))
+
-- 
cgit v1.2.3