Remove %desktop-services, attempt to kill gdm for good

8 files changed, 244 insertions, 141 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 900681f..c229bc7 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -22,13 +22,6 @@
 (setopt warning-minimum-level :error)
 
 
-;;;; startup some programs
-(start-process-shell-command "picom" nil "picom")
-(start-process-shell-command "bg" nil "set-bg")
-(start-process-shell-command "xrate" nil "xset r rate 250 70")
-(start-process-shell-command "status" nil "time-getter")
-
-
 ;;;; configure packages
 ;; external package manager
 (setopt package-archives nil
diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm
index 03a58f3..b64adf5 100644
--- a/.config/guix/modules/base.scm
+++ b/.config/guix/modules/base.scm
@@ -19,11 +19,19 @@
         "aspell-dict-en"
         "flameshot"
         "font-google-noto-emoji"
+        "picom"
         "rsync"
         "stow"
         "transmission"
         "xdotool"
-        "xset")))
+        "xf86-input-libinput"
+        "xf86-video-fbdev"
+        "xinit"
+        "xmodmap"
+        "xorg-server"
+        "xrdb"
+        "xset"
+        )))
 
 (define-public program-packages
   (map specification->package
diff --git a/.config/guix/modules/shell.scm b/.config/guix/modules/shell.scm
index 38676f2..8efa4cf 100644
--- a/.config/guix/modules/shell.scm
+++ b/.config/guix/modules/shell.scm
@@ -30,6 +30,8 @@
              (bashrc (list (plain-file "bashrc" "
 # converts above aliases into eshell aliases automatically
 alias | sed -E \"s/^alias ([^=]+)='(.*)'$/alias \\1 \\2 \\$*/g; s/'\\\\\\''/'/g;\" >~/.config/emacs/eshell/alias
-")))
+
+# add my scripts to path
+PATH=${HOME}/Personal/scripts:$PATH")))
              (environment-variables
               '(("BROWSER" . "icecat")))))))
diff --git a/.config/guix/modules/xdg.scm b/.config/guix/modules/xdg.scm
index 104c215..0b1b8f1 100644
--- a/.config/guix/modules/xdg.scm
+++ b/.config/guix/modules/xdg.scm
@@ -29,9 +29,4 @@
 		(file "torrent")
 		(name "Torrent")
 		(type 'application)
-		(config '((exec . "transmission-remote -a %u"))))))))
-   (simple-service 'dotfiles
-                   home-files-service-type
-                   `((".Xresources"
-                      ,(plain-file "Xresources" "Sxiv.background: #000000
-Sxiv.foreground: #00C0FF"))))))
+		(config '((exec . "transmission-remote -a %u"))))))))))
diff --git a/.config/guix/modules/xmodmap.scm b/.config/guix/modules/xmodmap.scm
deleted file mode 100644
index 3cf8be1..0000000
--- a/.config/guix/modules/xmodmap.scm
+++ /dev/null
@@ -1,17 +0,0 @@
-(define-module (xmodmap)
-  #:use-module (gnu home services)
-  #:use-module (gnu home services desktop))
-
-
-;; Below is a list of Home services.  To search for available
-;; services, run 'guix home search KEYWORD' in a terminal.
-(define-public xmodmap-service
-  (list
-   (service home-xmodmap-service-type
-            (home-xmodmap-configuration
-             (key-map '(("remove Lock" . "Caps_Lock")
-                        ("remove Control" . "Control_L")
-                        ("keysym Control_L" ."Caps_Lock")
-                        ("keysym Caps_Lock" . "Control_L")
-                        ("add Lock" . "Caps_Lock")
-                        ("add Control" . "Control_L")))))))
diff --git a/.config/guix/modules/xserver.scm b/.config/guix/modules/xserver.scm
new file mode 100644
index 0000000..59e6652
--- /dev/null
+++ b/.config/guix/modules/xserver.scm
@@ -0,0 +1,75 @@
+(define-module (xserver)
+  #:use-module (gnu services)
+  #:use-module (guix gexp)
+  #:use-module (gnu home services)
+  #:use-module (gnu home services desktop))
+
+
+(define-public xorg-services
+  (list
+   (simple-service 'dotfiles
+                   home-files-service-type
+                   `((".Xresources"
+                      ,(plain-file "Xresources" "Sxiv.background: #000000
+Sxiv.foreground: #00C0FF
+"))
+                     (".Xmodmap"
+                      ,(plain-file "Xmodmap" "clear      lock
+clear   control
+clear      mod1
+clear      mod2
+clear      mod3
+clear      mod4
+clear      mod5
+keycode      37 = Hyper_L
+keycode      66 = Control_L
+add     control = Control_L Control_R
+add        mod1 = Alt_L Alt_R Meta_L
+add        mod2 = Num_Lock
+add        mod3 = Hyper_L
+add        mod4 = Super_L Super_R
+add        mod5 = Mode_switch ISO_Level3_Shift
+"))
+                     (".xinitrc"
+                      ,(plain-file "xinitrc" "#!/bin/sh
+
+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\"
+
+fi
+
+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 &
+time-getter &
+set-bg
+xset r rate 250 70
+exec dwm"))))))
diff --git a/.config/guix/modules/ymir.scm b/.config/guix/modules/ymir.scm
index 199f14a..5ce2d5c 100644
--- a/.config/guix/modules/ymir.scm
+++ b/.config/guix/modules/ymir.scm
@@ -5,8 +5,20 @@
 
 (define-module (ymir)
   #:use-module (gnu)
-  #:use-module (dwm-custom))
-(use-service-modules audio desktop networking ssh xorg file-sharing)
+  #:use-module (dwm-custom)
+  #:use-module (gnu packages suckless)
+  #:use-module (gnu services)
+  #:use-module (gnu services admin)
+  #:use-module (gnu services audio)
+  #:use-module (gnu services avahi)
+  #:use-module (gnu services dbus)
+  #:use-module (gnu services desktop)
+  #:use-module (gnu services file-sharing)
+  #:use-module (gnu services networking)
+  #:use-module (gnu services sound)
+  #:use-module (gnu services ssh)
+  #:use-module (gnu services xorg)
+  )
 
 ;;;; user
 (define-public username "bdunahu")
@@ -25,85 +37,120 @@
 ;;;; base os
 (define-public ymir
   (operating-system
-    (host-name "ymir")
-    (locale "en_US.utf8")
-    (timezone "America/Denver")
-    (keyboard-layout (keyboard-layout "us"))
-    (kernel-arguments
-     (list
-      "quiet"))
-
-    ;; 'root' is implicit
-    (users (cons* user
-                  %base-user-accounts))
-
-    ;; grub (uefi)
-    (bootloader (bootloader-configuration
-                 (bootloader grub-efi-bootloader)
-                 (targets (list "/boot/efi"))
-                 (keyboard-layout keyboard-layout)))
-
-    ;; packages installed system-wide.
-    (packages `(,@(map specification->package
-                       '("cryptsetup"
-                         "curl"
-                         "dmenu"
-                         "emacs"
-                         "git"
-                         "gtk+"
-                         "icecat"
-                         "imagemagick"
-                         "libnotify"
-                         "mpd"
-                         "mpd-mpc"
-                         ;; "nss-certs" ;; was moved to base-packages
-                         "pass-otp"
-                         "password-store"
-                         "pavucontrol"
-                         "picom"
-                         "pinentry"
-                         "pulseaudio"
-                         "recutils"
-                         "sxiv"
-                         "vim"
-                         "xmodmap"
-                         "xrdb"))
-                ,@%base-packages
-                ,dwm-packages))
-
-    ;; base system services.
-    (services
-     (append (list
-              (service openssh-service-type
-                       (openssh-configuration
-                        (x11-forwarding? #t)
-                        (permit-root-login 'prohibit-password)
-                        (password-authentication? #f)))
-              (service tor-service-type)
-              (service transmission-daemon-service-type)
-              (service mpd-service-type
-                       (mpd-configuration
-                        (user user)
-                        (music-directory "~/Personal/mpd/music")
-                        (playlist-directory "~/Personal/mpd/playlist")
-                        (default-port 6600)))
-              ;; (service elogind-service-type
-              ;;          (elogind-configuration
-              ;;           (handle-power-key 'hibernate)
-              ;;           (idle-action-seconds (* 5 60))
-              ;;           (idle-action 'suspend)))
-              (set-xorg-configuration
-               (xorg-configuration (keyboard-layout keyboard-layout))))
-
-             ;; This is the default list of services we
-             ;; are appending to.
-             %desktop-services))
-
-    ;; OVERRIDE ME
-    (file-systems (cons*
-                   (file-system
-                     (mount-point "/")
-                     (device "none")
-                     (type "tmpfs")
-                     (check? #f))
-                   %base-file-systems))))
+   (host-name "ymir")
+   (locale "en_US.utf8")
+   (timezone "America/Denver")
+   (keyboard-layout (keyboard-layout "us"))
+   (kernel-arguments
+    (list
+     "quiet"))
+
+   ;; 'root' is implicit
+   (users (cons* user
+                 %base-user-accounts))
+
+   ;; grub (uefi)
+   (bootloader (bootloader-configuration
+                (bootloader grub-efi-bootloader)
+                (targets (list "/boot/efi"))
+                (keyboard-layout keyboard-layout)))
+
+   ;; packages installed system-wide.
+   (packages `(,@(map specification->package
+                      '(
+                        "cryptsetup"
+                        "curl"
+                        "dmenu"
+                        "emacs"
+                        "git"
+                        "gtk+"
+                        "icecat"
+                        "imagemagick"
+                        "libnotify"
+                        "mpd"
+                        "mpd-mpc"
+                        "pass-otp"
+                        "password-store"
+                        "pavucontrol"
+                        "pinentry"
+                        "pulseaudio"
+                        "recutils"
+                        "sxiv"
+                        "vim"
+                        ))
+               ,@%base-packages
+               ,dwm-packages))
+
+   ;; base system services.
+   (services
+    (cons*
+     (service openssh-service-type
+              (openssh-configuration
+               (x11-forwarding? #t)
+               (permit-root-login 'prohibit-password)
+               (password-authentication? #f)))
+     (service tor-service-type)
+     (service transmission-daemon-service-type)
+     (service mpd-service-type
+              (mpd-configuration
+               (user user)
+               (music-directory "~/Personal/mpd/music")
+               (playlist-directory "~/Personal/mpd/playlist")
+               (default-port 6600)))
+     (set-xorg-configuration
+      (xorg-configuration (keyboard-layout keyboard-layout)))
+
+     (service screen-locker-service-type
+              (screen-locker-configuration
+               (name "slock")
+               (program (file-append slock "/bin/slock"))))
+
+     ;; so that non-root users in the wheel group can
+     ;; perform administrative tasks (similar to "sudo").
+     polkit-wheel-service
+     ;; The global fontconfig cache directory can sometimes contain
+     ;; stale entries, possibly referencing fonts that have been GC'd,
+     ;; so mount it read-only.
+     fontconfig-file-system-service
+
+     (service network-manager-service-type)
+     (service wpa-supplicant-service-type) ; needed by NetworkManager
+     ;; (simple-service 'network-manager-applet
+     ;;                 profile-service-type
+     ;;                 (list network-manager-applet))
+     (service modem-manager-service-type)
+     (service usb-modeswitch-service-type)
+
+     ;; The D-Bus clique.
+     (service avahi-service-type)
+     (service udisks-service-type)
+     (service upower-service-type)
+     (service accountsservice-service-type)
+     (service cups-pk-helper-service-type)
+     (service colord-service-type)
+     (service geoclue-service-type)
+     (service polkit-service-type)
+     (service elogind-service-type
+              (elogind-configuration
+               (handle-power-key 'hibernate)
+               (idle-action-seconds (* 5 60))
+               (idle-action 'suspend)))
+     (service dbus-root-service-type)
+
+     (service ntp-service-type)
+
+     (service x11-socket-directory-service-type)
+
+     (service pulseaudio-service-type)
+     (service alsa-service-type)
+
+     %base-services))
+
+   ;; OVERRIDE ME
+   (file-systems (cons*
+                  (file-system
+                   (mount-point "/")
+                   (device "none")
+                   (type "tmpfs")
+                   (check? #f))
+                  %base-file-systems))))
diff --git a/.config/guix/vali.scm b/.config/guix/vali.scm
index 8c24483..e2ff0be 100644
--- a/.config/guix/vali.scm
+++ b/.config/guix/vali.scm
@@ -15,37 +15,37 @@
   #:use-module (shell)
   #:use-module (ssh)
   #:use-module (gpg)
-  #:use-module (xmodmap)
+  #:use-module (xserver)
   #:use-module (base))
 
 
 (define system
   (operating-system
-   (inherit ymir)
-   (host-name "vali")
+    (inherit ymir)
+    (host-name "vali")
 
-   (mapped-devices (list (mapped-device
-                          (source (uuid "8d3ccf19-035a-4956-8ba7-7c00dfa3a02c"))
-                          (target "hidden")
-                          (type luks-device-mapping))))
+    (mapped-devices (list (mapped-device
+                           (source (uuid "8d3ccf19-035a-4956-8ba7-7c00dfa3a02c"))
+                           (target "hidden")
+                           (type luks-device-mapping))))
 
-   (file-systems (cons* (file-system
-                         (mount-point "/boot/efi")
-                         (device (uuid
-                                  "8A13-7018"
-                                  'fat32))
-                         (type "vfat"))
-                        (file-system
-                         (mount-point "/home/bdunahu/Personal")
-                         (device "/dev/mapper/hidden")
-                         (type "ext4")
-                         (dependencies mapped-devices))
-                        (file-system
-                         (mount-point "/")
-                         (device (uuid
-                                  "69a3593b-12bd-40ad-a932-007674a8cfe8"
-                                  'ext4))
-                         (type "ext4")) %base-file-systems))))
+    (file-systems (cons* (file-system
+                           (mount-point "/boot/efi")
+                           (device (uuid
+                                    "8A13-7018"
+                                    'fat32))
+                           (type "vfat"))
+                         (file-system
+                           (mount-point "/home/bdunahu/Personal")
+                           (device "/dev/mapper/hidden")
+                           (type "ext4")
+                           (dependencies mapped-devices))
+                         (file-system
+                           (mount-point "/")
+                           (device (uuid
+                                    "69a3593b-12bd-40ad-a932-007674a8cfe8"
+                                    'ext4))
+                           (type "ext4")) %base-file-systems))))
 
 
 (define home
@@ -60,7 +60,7 @@
       ,@ssh-service
       ,@gpg-service
       ,@base-services
-      ,@xmodmap-service))))
+      ,@xorg-services))))
 
 
 (if (getenv "RUNNING_GUIX_HOME") home system)