From 7ce7fae7ea02149881af2b3f21f2ea947134d711 Mon Sep 17 00:00:00 2001
From: Aleksandr Lebedev <alex.lebedev2003@icloud.com>
Date: Tue, 11 Nov 2025 12:26:45 +0100
Subject: [PATCH] Emacs fixes

---
 guix-config/home/emacs/config.el |   3 +-
 guix-config/home/workstation.scm | 113 ++++++++++++++++---------------
 2 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/guix-config/home/emacs/config.el b/guix-config/home/emacs/config.el
index aa8d658..4aa3508 100644
--- a/guix-config/home/emacs/config.el
+++ b/guix-config/home/emacs/config.el
@@ -85,7 +85,8 @@
   	 ((kylekrein/detect-wsl) 'toast)
   	 (t 'libnotify)))
 
-(make-directory "~/.cache/emacs/tildafiles")
+(unless (file-exists-p "~/.cache/emacs/tildafiles")
+  (make-directory "~/.cache/emacs/tildafiles"))
 (setq backup-directory-alist '((".*" . "~/.cache/emacs/tildafiles")))
 
 (use-package diminish :ensure t)
diff --git a/guix-config/home/workstation.scm b/guix-config/home/workstation.scm
index 1a06003..70ffb89 100644
--- a/guix-config/home/workstation.scm
+++ b/guix-config/home/workstation.scm
@@ -35,59 +35,62 @@
   #:use-module (gnu home services niri))
 
 (home-environment
-  ;; Below is the list of packages that will show up in your
-  ;; Home profile, under ~/.guix-home/profile.
-  (packages (list font-iosevka
-  		  git
-		  kitty
-		  btop
-		  fastfetch
-		  librewolf
-		  icecat
-		  nheko
-		  ;birdtray
-		  nextcloud-client
-		  nautilus
-		  xournalpp
-		  ripgrep
-		  quickshell
-		  cava
-		  wl-clipboard
-		  cliphist
-		  brightnessctl
-		  qtmultimedia
-		  `(,glib "bin")
-		  matugen
-		  wayland
-		  xwayland-satellite
-		  qtwayland))
+ ;; Below is the list of packages that will show up in your
+ ;; Home profile, under ~/.guix-home/profile.
+ (packages (list git
+		 kitty
+		 btop
+		 fastfetch
+		 librewolf
+		 icecat
+					;birdtray
+		 nextcloud-client
+		 nautilus
+		 xournalpp
+		 quickshell
+		 cava
+		 wl-clipboard
+		 cliphist
+		 brightnessctl
+		 qtmultimedia
+		 `(,glib "bin")
+		 matugen
+		 wayland
+		 xwayland-satellite
+		 qtwayland))
 
-  ;; Below is the list of Home services.  To search for available
-  ;; services, run 'guix home search KEYWORD' in a terminal.
-  (services
-   (append (list (service home-niri-service-type)
-		 (service home-pipewire-service-type)
-		 (service home-dbus-service-type)
-		 (service home-bash-service-type
-                          (home-bash-configuration
-                           (environment-variables '(("EDITOR" . "emacsclient -c")))
-                           (aliases '(("gs" . "git status")
-				      ("system-reconfigure" . "sudo -E guix time-machine -C ~/dotfiles/guix-config/channels-lock.scm -- system -L ~/dotfiles reconfigure ~/dotfiles/guix-config/system/$(hostname).scm")
-("home-reconfigure" . "guix time-machine -C ~/dotfiles/guix-config/channels-lock.scm -- home -L ~/dotfiles reconfigure ~/dotfiles/guix-config/home/workstation.scm")
-("guix-pull" . "guix pull --channels=$HOME/dotfiles/guix-config/channels.scm; guix describe --format=channels > $HOME/dotfiles/guix-config/channels-lock.scm")
-("reconfigure" . "system-reconfigure && home-reconfigure")
-("guix-full-upgrade" . "guix-pull && reconfigure")))
-(bashrc
- (list (local-file "prompt.sh")))))
-		 (service home-dotfiles-service-type
-                          (home-dotfiles-configuration
-                           (directories '("../../files"))))
-		 (service home-secretsd-service-type)
-		 (service home-emacs-service-type
-			  (home-emacs-configuration
-			   (emacs guixmacs)
-			   (config-file 
-			    (local-file "./emacs/config.el"))
-			   (early-config-file 
-			    (local-file "./emacs/init.el")))))
-		 %base-home-services)))
+ ;; Below is the list of Home services.  To search for available
+ ;; services, run 'guix home search KEYWORD' in a terminal.
+ (services
+  (append (list (service home-niri-service-type)
+		(service home-pipewire-service-type)
+		(service home-dbus-service-type)
+		(service home-bash-service-type
+                         (home-bash-configuration
+                          (environment-variables
+			   '(("EDITOR" . "emacsclient -c")))
+                          (aliases '(("gs" . "git status")
+				     ("system-reconfigure"
+				      . "sudo -E guix time-machine -C ~/dotfiles/guix-config/channels-lock.scm -- system -L ~/dotfiles reconfigure ~/dotfiles/guix-config/system/$(hostname).scm")
+				     ("home-reconfigure"
+				      . "guix time-machine -C ~/dotfiles/guix-config/channels-lock.scm -- home -L ~/dotfiles reconfigure ~/dotfiles/guix-config/home/workstation.scm")
+				     ("guix-pull"
+				      . "guix pull --channels=$HOME/dotfiles/guix-config/channels.scm; guix describe --format=channels > $HOME/dotfiles/guix-config/channels-lock.scm")
+				     ("reconfigure"
+				      . "system-reconfigure && home-reconfigure")
+				     ("guix-full-upgrade"
+				      . "guix-pull && reconfigure")))
+			  (bashrc
+			   (list (local-file "prompt.sh")))))
+		(service home-dotfiles-service-type
+                         (home-dotfiles-configuration
+                          (directories '("../../files"))))
+		(service home-secretsd-service-type)
+		(service home-emacs-service-type
+			 (home-emacs-configuration
+			  (emacs guixmacs)
+			  (config-file 
+			   (local-file "./emacs/config.el"))
+			  (early-config-file 
+			   (local-file "./emacs/init.el")))))
+	  %base-home-services)))