From d7a389615ac45b5126cc13616e9cdb6bc0807e6c Mon Sep 17 00:00:00 2001
From: bd <bdunahu@operationnull.com>
Date: Fri, 25 Oct 2024 22:40:09 -0400
Subject: dwm -> exwm

---
 .config/guix/garm.scm          |  5 ++---
 .config/guix/modules/base.scm  |  6 ++++--
 .config/guix/modules/dwm.scm   | 16 +---------------
 .config/guix/modules/emacs.scm |  5 +++--
 .config/guix/modules/xorg.scm  | 32 +++++++++-----------------------
 5 files changed, 19 insertions(+), 45 deletions(-)

(limited to '.config/guix')

diff --git a/.config/guix/garm.scm b/.config/guix/garm.scm
index dbf887e..15e010c 100644
--- a/.config/guix/garm.scm
+++ b/.config/guix/garm.scm
@@ -17,7 +17,7 @@
   #:use-module (gnu services pm)
   #:use-module (guix gexp)
   #:use-module (modules base)
-  #:use-module (modules dwm)
+  ;; #:use-module (modules dwm)
   #:use-module (modules mail)
   #:use-module (modules xorg)
   #:use-module (modules ymir)
@@ -32,7 +32,6 @@
       ,@bd-mail-home-services
       ,@bd-desktop-home-services
       ,@bd-pdf-services
-      ,@bd-dwm-home-services
       ,(service home-syncthing-service-type)))))
 
 
@@ -44,7 +43,7 @@
  (packages
   `(,@bd-base-system-packages
     ,@bd-desktop-system-packages
-    ,@bd-dwm-system-packages
+    ;; ,@bd-dwm-system-packages
 
     ;; machine-specific packages
     ,@(list
diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm
index c96bb7b..13f25a3 100644
--- a/.config/guix/modules/base.scm
+++ b/.config/guix/modules/base.scm
@@ -45,6 +45,7 @@
  graphviz ;; graphviz
  image ;; flameshot
  imagemagick ;; imagemagick
+ image-viewers ;; nsxiv
  librewolf ;; librewolf
  linux ;; sysstat
  mail ;; offlineimap
@@ -54,8 +55,8 @@
  pdf ;; xpdf
  rsync ;; rsync
  screen ;; screen
- tex ;; texlive-dvipng
  texlive ;; texlive
+ tex ;; texlive-dvipng
  tor-browsers ;; tor-browser
  version-control ;; git
  video ;; ffmpeg, mpv, yt-dlp
@@ -82,8 +83,9 @@
    curl
    git
    jq
-   netcat
    man-pages
+   netcat
+   nsxiv
    recutils
    rsync
    stow
diff --git a/.config/guix/modules/dwm.scm b/.config/guix/modules/dwm.scm
index c71767e..1befa60 100644
--- a/.config/guix/modules/dwm.scm
+++ b/.config/guix/modules/dwm.scm
@@ -4,11 +4,9 @@
   #:use-module (gnu home services desktop)
   #:use-module (guix gexp)
   #:use-module (guix packages)
-  #:export (bd-dwm-system-packages
-            bd-dwm-home-services))
+  #:export (bd-dwm-system-packages))
 
 (use-package-modules
- image-viewers ;; nsxiv
  suckless ;; dwm
  xdisorg ;; xdotool
  xorg ;; xprop
@@ -24,18 +22,6 @@
 (define bd-dwm-system-packages
   (list
    bd-dwm
-   nsxiv
    xdotool
    xprop
    ))
-
-(define bd-dwm-home-services
-  (list
-   (simple-service 'dotfiles
-                   home-files-service-type
-                   `((".Xresources"
-                      ,(plain-file "Xresources" "
-Nsxiv.window.background: #000000
-Nsxiv.window.foreground: #FFFFFF
-Nsxiv.bar.font: Terminus:size=9
-"))))))
diff --git a/.config/guix/modules/emacs.scm b/.config/guix/modules/emacs.scm
index 0c34c8c..b1f58d6 100644
--- a/.config/guix/modules/emacs.scm
+++ b/.config/guix/modules/emacs.scm
@@ -23,18 +23,20 @@
 
 (define (bd-emacs-package-list config)
   (list
-   ;; direct
    emacs-auctex
    emacs-consult
    emacs-denote
+   emacs-desktop-environment
    emacs-ef-themes
    emacs-emms
+   emacs-exwm
    emacs-guix
    emacs-lua-mode
    emacs-magit
    emacs-marginalia
    emacs-orderless
    emacs-paredit
+   emacs-password-store
    emacs-pinentry
    emacs-popper
    emacs-rainbow-delimiters
@@ -44,7 +46,6 @@
    emacs-vertico
    emacs-visual-fill-column
 
-   ;; associative
    aspell
    aspell-dict-en
    ))
diff --git a/.config/guix/modules/xorg.scm b/.config/guix/modules/xorg.scm
index 11a2e35..52ebf8b 100644
--- a/.config/guix/modules/xorg.scm
+++ b/.config/guix/modules/xorg.scm
@@ -93,6 +93,12 @@ add        mod2 = Num_Lock
 add        mod3 = Hyper_L
 add        mod4 = Super_L Super_R
 add        mod5 = Mode_switch ISO_Level3_Shift
+"))
+                     (".Xresources"
+                      ,(plain-file "Xresources" "
+Nsxiv.window.background: #000000
+Nsxiv.window.foreground: #FFFFFF
+Nsxiv.bar.font: Terminus:size=9
 "))
                      (".xinitrc"
                       ,(plain-file "xinitrc" "
@@ -100,21 +106,9 @@ add        mod5 = Mode_switch ISO_Level3_Shift
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
 
 # merge in defaults and keymaps
 
-if [ -f $sysresources ]; then
-
-    xrdb -merge $sysresources
-
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
 if [ -f \"$userresources\" ]; then
 
     xrdb -merge \"$userresources\"
@@ -125,18 +119,10 @@ if [ -f \"$usermodmap\" ]; then
     xmodmap \"$usermodmap\"
 fi
 
-# start some programs
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
-    for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-        [ -x \"$f\" ] && . \"$f\"
-    done
-    unset f
-fi
-
 picom &
-dwmstatus &
+# dwmstatus &
 eval \"$(ssh-agent -s)\"
-emacs --daemon
+# emacs --daemon
 xss-lock -- slock &
 set-bg
 xset r rate 250 70
@@ -144,7 +130,7 @@ xset s 600
 touchpad-defaults
 xrandr-toggle
 xkeyboard-auto &
-exec dwm"))
+exec emacs -mm"))
                      (".config/gtk-2.0/settings.ini"
                       ,(plain-file "settings.ini" "
 [Settings]
-- 
cgit v1.2.3