guix: full refactor of configuration structure

11 files changed, 0 insertions, 1050 deletions

diff --git a/.config/guix/channels.scm b/.config/guix/channels.scm
deleted file mode 100644
index f0ed659..0000000
--- a/.config/guix/channels.scm
+++ /dev/null
@@ -1,9 +0,0 @@
-(append (list (channel
-		(name 'tanelorn)
-		(url "https://git.operationnull.com/tanelorn.git")
-		(introduction
-		 (make-channel-introduction
-		  "feb72dbc897bcf2db3901ea5b25caba4add860f7"
-		  (openpgp-fingerprint
-		   "5550 5CA6 9DE5 D342 7F31 F9AE 5F86 6C65 2A34 C996")))))
-	%default-channels)
diff --git a/.config/guix/garm.scm b/.config/guix/garm.scm
deleted file mode 100644
index e4d895c..0000000
--- a/.config/guix/garm.scm
+++ /dev/null
@@ -1,94 +0,0 @@
-(define-module (garm)
-  #:use-module (gnu)
-  #:use-module (gnu home)
-  #:use-module (gnu home services)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu packages gnome)
-  #:use-module (gnu packages networking)
-  #:use-module (gnu services)
-  #:use-module (gnu services guix)
-  #:use-module (gnu services pm)
-  #:use-module (guix gexp)
-  #:use-module (packages packages)
-  #:use-module (services base)
-  #:use-module (services mail)
-  #:use-module (services xorg)
-  #:use-module (ymir))
-
-;;; Commentary:
-;;;
-;;; garm is a corebooted and fully-liberated laptop
-;;;
-;;; Code:
-
-(define home
-  (home-environment
-   (packages
-    `(,@bd-packages-desktop
-      ,@bd-packages-fun
-      ,@bd-packages-extra
-      ,@bd-packages-development))
-   (services
-    `(,@bd-base-home-services
-      ,@bd-mail-home-services
-      ,@bd-desktop-home-services))))
-
-
-(operating-system
- (inherit ymir)
- (host-name "garm")
-
- (packages
-  `(,@bd-packages-system
-    ,@bd-packages-laptop))
-
- (services
-  `(,@bd-base-system-services
-    ,@bd-desktop-system-services
-    ,(service guix-home-service-type
-              `((,username ,home)))
-    ,(service tlp-service-type
-              (tlp-configuration
-               (cpu-scaling-governor-on-ac (list "powersave"))
-               (cpu-scaling-governor-on-bat (list "powersave"))
-               (energy-perf-policy-on-ac "powersave")
-               (energy-perf-policy-on-bat "powersave")
-               (pcie-aspm-on-ac "powersave")
-               (pcie-aspm-on-bat "powersave")
-               (sched-powersave-on-bat? #t)
-               (sched-powersave-on-ac? #t)
-               (sata-linkpwr-on-ac "min_power")
-               (sata-linkpwr-on-bat "min_power")
-               (start-charge-thresh-bat0 60)
-               (stop-charge-thresh-bat0 80)))
-    ,(service thermald-service-type)
-    ,(simple-service 'network-manager-applet
-                     profile-service-type
-                     (list network-manager-applet))))
-
- (mapped-devices (list (mapped-device
-                        (source (uuid "671c8094-c8cd-47f9-8332-25513f16917b"))
-                        (target "hidden")
-                        (type luks-device-mapping))))
-
- (file-systems (cons* (file-system
-                       (mount-point "/boot/efi")
-                       (device (uuid
-                                "1A7A-026F"
-                                'fat32))
-                       (type "vfat"))
-                      (file-system
-                       (mount-point "/home")
-                       (device "/dev/mapper/hidden")
-                       (type "ext4")
-                       (dependencies mapped-devices))
-                      (file-system
-                       (mount-point "/")
-                       (device (uuid
-                                "0a0b9520-308f-4072-a62b-b91ffacdc5b0"
-                                'ext4))
-                       (type "ext4")) %base-file-systems)))
-
-
-;;; garm.scm ends here
diff --git a/.config/guix/graveyard/hati.scm b/.config/guix/graveyard/hati.scm
deleted file mode 100644
index db1a22f..0000000
--- a/.config/guix/graveyard/hati.scm
+++ /dev/null
@@ -1,80 +0,0 @@
-(define-module (hati)
-  #:use-module (gnu)
-  #:use-module (gnu home)
-  #:use-module (gnu home services)
-  #:use-module (gnu home services syncthing)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages xorg)
-  #:use-module (gnu services)
-  #:use-module (gnu services guix)
-  #:use-module (guix gexp)
-  #:use-module (modules base)
-  #:use-module (modules dwm)
-  #:use-module (modules utils)
-  #:use-module (modules xorg)
-  #:use-module (modules ymir)
-  #:use-module (modules pdf))
-
-;;; Commentary:
-;;;
-;;; hati is a asus/nvidia 3060 desktop
-;;;
-;;; Code:
-
-(define home
-  (home-environment
-   (services
-    `(,@bd-base-home-services
-      ,@bd-desktop-home-services
-      ,@bd-pdf-services
-      ,@bd-dwm-home-services
-      ,(service home-syncthing-service-type)))))
-
-
-(operating-system
-  (inherit ymir)
-  (host-name "hati")
-
-  ;; (all packages are system wide)
-  (packages
-   `(,@bd-base-system-packages
-     ,@bd-desktop-system-packages
-     ,@bd-dwm-system-packages
-     ,@bd-mpd-package
-
-     ;; machine-specific packages
-     ,@(list
-        xf86-video-nouveau)))
-
-  (services
-   `(,@bd-base-system-services
-     ,@bd-desktop-system-services
-     ,@bd-mpd-service
-     ,(service guix-home-service-type
-               `((,username ,home)))))
-
-  (mapped-devices (list (mapped-device
-                         (source (uuid "1e9c3cd7-97c2-411a-975a-40222d185563"))
-                         (target "hidden")
-                         (type luks-device-mapping))))
-
-  (file-systems (cons* (file-system
-                         (mount-point "/boot/efi")
-                         (device (uuid
-                                  "1448-51AE"
-                                  'fat32))
-                         (type "vfat"))
-                       (file-system
-                         (mount-point "/home")
-                         (device "/dev/mapper/hidden")
-                         (type "ext4")
-                         (dependencies mapped-devices))
-                       (file-system
-                         (mount-point "/")
-                         (device (uuid
-                                  "df334be4-5828-45b4-842a-9a8d97cfa40a"
-                                  'ext4))
-                         (type "ext4")) %base-file-systems)))
-
-
-;;; hati.scm ends here
diff --git a/.config/guix/graveyard/kvasir.scm b/.config/guix/graveyard/kvasir.scm
deleted file mode 100644
index b04f3e3..0000000
--- a/.config/guix/graveyard/kvasir.scm
+++ /dev/null
@@ -1,77 +0,0 @@
-(define-module (kvasir)
-  #:use-module (gnu)
-  #:use-module (gnu home)
-  #:use-module (gnu home services)
-  #:use-module (gnu home services dotfiles)
-  #:use-module (gnu image)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu services)
-  #:use-module (gnu services guix)
-  #:use-module (gnu system image)
-  #:use-module (guix gexp)
-  #:use-module (modules base)
-  #:use-module (modules dwm)
-  #:use-module (modules pdf)
-  #:use-module (modules xorg)
-  #:use-module (modules ymir))
-
-;;; Commentary:
-;;;
-;;; kvasir is a bootable usb
-;;;
-;;; Code:
-
-(define home
-  (home-environment
-   (services
-    `(,@bd-base-home-services
-      ,@bd-desktop-home-services
-      ,@bd-pdf-services
-      ,@bd-dwm-home-services
-      ,(service home-dotfiles-service-type
-                (home-dotfiles-configuration
-                 (directories '("/home/bdunahu/.dotfiles"))))))))
-
-
-(define system
-  (operating-system
-   (inherit ymir)
-   (host-name "kvasir")
-
-
-   ;; (all packages are system wide)
-   (packages
-    `(,@bd-base-system-packages
-      ,@bd-dwm-system-packages
-      ,@bd-desktop-system-packages
-
-      ;; machine-specific packages
-      ,@(list
-         brightnessctl)))
-
-   (services
-    `(,@bd-base-system-services
-      ,@bd-desktop-system-services
-      ,(service guix-home-service-type
-                `((,username ,home)))))
-
-
-   (file-systems (cons* (file-system
-                         (mount-point "/boot/efi")
-                         (device (uuid
-                                  "8A13-7018"
-                                  'fat32))
-                         (type "vfat"))
-                        (file-system
-                         (mount-point "/")
-                         (device (uuid
-                                  "69a3593b-12bd-40ad-a932-007674a8cfe8"))
-                         (type "ext4")) %base-file-systems))))
-
-(image
- (inherit iso9660-image)
- (operating-system system))
-
-
-;;; kvasir.scm ends here
diff --git a/.config/guix/graveyard/vali.scm b/.config/guix/graveyard/vali.scm
deleted file mode 100644
index e5cf900..0000000
--- a/.config/guix/graveyard/vali.scm
+++ /dev/null
@@ -1,84 +0,0 @@
-(define-module (vali)
-  #:use-module (gnu)
-  #:use-module (gnu home)
-  #:use-module (gnu home services)
-  #:use-module (gnu home services syncthing)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu services)
-  #:use-module (gnu services guix)
-  #:use-module (gnu services pm)
-  #:use-module (guix gexp)
-  #:use-module (modules base)
-  #:use-module (modules dwm)
-  #:use-module (modules utils)
-  #:use-module (modules xorg)
-  #:use-module (modules ymir)
-  #:use-module (modules pdf))
-
-;;; Commentary:
-;;;
-;;; vali is a laptop
-;;;
-;;; Code:
-
-(define home
-  (home-environment
-   (services
-    `(,@bd-base-home-services
-      ,@bd-desktop-home-services
-      ,@bd-pdf-services
-      ,@bd-dwm-home-services
-      ,(service home-syncthing-service-type)))))
-
-
-(operating-system
-  (inherit ymir)
-  (host-name "vali")
-
-  ;; (all packages are system wide)
-  (packages
-   `(,@bd-base-system-packages
-     ,@bd-desktop-system-packages
-     ,@bd-dwm-system-packages
-     ,@bd-mpd-package
-     ,@bd-games-packages
-
-     ;; machine-specific packages
-     ,@(list
-        brightnessctl
-        tlp)))
-
-  (services
-   `(,@bd-base-system-services
-     ,@bd-desktop-system-services
-     ,@bd-mpd-service
-     ,(service guix-home-service-type
-               `((,username ,home)))
-     ,(service tlp-service-type)))
-
-  (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")
-                         (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)))
-
-
-;;; vali.scm ends here
diff --git a/.config/guix/modules/packages/packages.scm b/.config/guix/modules/packages/packages.scm
deleted file mode 100644
index a3ebd3e..0000000
--- a/.config/guix/modules/packages/packages.scm
+++ /dev/null
@@ -1,190 +0,0 @@
-(define-module (packages packages)
-  #:use-module (gnu)
-  #:use-module (gnu system)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (tanelorn packages fonts)
-  #:use-module (tanelorn packages wm)
-  #:use-module (tanelorn packages engineering)
-  #:export (bd-packages-system
-            bd-packages-laptop
-            bd-packages-desktop
-	    bd-packages-fun
-            bd-packages-extra
-            bd-packages-development
-            ))
-
-;;; Commentary:
-;;; Code:
-
-(use-package-modules
- admin ;; netcat
- algebra ;; bc
- assembly ;; nasm
- base ;; make
- chromium ;; ungoogled-chromium
- clojure ;; clojure
- commencement ;; gcc-toolchain
- compression ;; unzip, zip
- compton ;; picom
- cryptsetup ;; cryptsetup
- curl ;; curl
- databases ;; recutils
- education ;; anki
- emulators ;; mupen64plus*, bsnes, mgba
- engineering ;; rizin, cutter
- fonts ;; font-terminus, font-openmoji
- fontutils ;; fontconfig
- freedesktop ;; xdg-utils
- games ;; nethack
- gdb ;; gdb
- gimp ;; gimp-next
- gnome ;; brightnessctl
- gnupg ;; gnupg
- graphviz ;; graphviz
- haskell-xyz ;; pandoc
- image ;; flameshot
- imagemagick ;; imagemagick
- image-viewers ;; feh, nsxiv
- libreoffice ;; libreoffice
- librewolf ;; librewolf
- linux ;; sysstat, tlp, alsa-plugins
- lisp ;; sbcl
- mail ;; offlineimap
- man ;; man-pages
- networking ;; maccchanger
- package-management ;; stow
- password-utils ;; pass-otp, password-store
- pkg-config ;; pkg-config
- pdf ;; xpdf, pdfgrep, zathura, zathura-pdf-mupdf
- pulseaudio ;; pavucontrol, pulseaudio,
- python ;; python
- rsync ;; rsync
- rust-apps ;; ripgrep
- screen ;; screen
- texlive ;; texlive, texlive-biber
- tex ;; texlive-dvipng
- tor-browsers ;; torbrowser
- version-control ;; git
- video ;; ffmpeg, mpv, yt-dlp
- vim ;; vim
- virtualization ;; qemu
- web ;; jq
- xdisorg ;; xdotool, xrdb
- xorg ;; xf86-input-libinput, xf86-video-fbdev, xinit...
- )
-
-
-
-(define bd-packages-system
-  (append!
-   (list
-    cryptsetup
-    curl
-    git
-    man-pages
-    recutils
-    ripgrep
-    screen
-    sysstat
-    unzip
-    vim
-    zip)
-   %base-packages))
-
-(define bd-packages-laptop
-  (list
-   brightnessctl
-   macchanger
-   tlp))
-
-(define bd-packages-desktop
-  (list
-   alsa-plugins
-   eww/x11
-   feh
-   ffmpeg
-   flameshot
-   fontconfig
-   font-iosevka
-   font-medieval-sharp
-   font-openmoji
-   font-runa-mono
-   font-terminus
-   gnupg
-   graphviz
-   imagemagick
-   libreoffice
-   mpv
-   nsxiv
-   password-store
-   pass-otp
-   pavucontrol
-   picom
-   pulseaudio
-   setxkbmap
-   texlive
-   texlive-biber
-   texlive-dvipng
-   texlive-pgfgantt
-   torbrowser
-   xdg-utils
-   xf86-input-libinput
-   xf86-video-fbdev
-   xinit
-   xinput
-   xkbcomp
-   xorg-server
-   xrandr
-   xrdb
-   xset
-   xss-lock
-   yt-dlp
-   zathura
-   zathura-pdf-mupdf
-   ))
-
-(define bd-packages-fun
-  (list
-   bsnes
-   dolphin-emu
-   mgba
-   mupen64plus-ui-console
-   mupen64plus-video-glide64mk2
-   nethack
-   ))
-
-(define bd-packages-extra
-  (list
-   gimp
-   librewolf
-   pdfgrep
-   qemu
-   ungoogled-chromium
-   xpdf ; pdftotext
-   ))
-
-(define bd-packages-development
-  (list
-   anki
-   bc
-   cl-asdf
-   clojure
-   clojure-tools
-   gcc-toolchain
-   gdb
-   gnu-make
-   jq
-   nasm
-   netcat
-   offlineimap3
-   pandoc
-   pkg-config
-   python
-   radare2-6.0.7
-   rsync
-   sbcl
-   stow
-   ))
-
-;;; packages.scm ends here
diff --git a/.config/guix/modules/services/base.scm b/.config/guix/modules/services/base.scm
deleted file mode 100644
index f990846..0000000
--- a/.config/guix/modules/services/base.scm
+++ /dev/null
@@ -1,204 +0,0 @@
-(define-module (services base)
-  #:use-module (gnu)
-  #:use-module (gnu home services)
-  #:use-module (gnu home services dict)
-  #:use-module (gnu home services gnupg)
-  #:use-module (gnu home services mcron)
-  #:use-module (gnu home services shells)
-  #:use-module (gnu home services shepherd)
-  #:use-module (gnu home services ssh)
-  #:use-module (gnu home services xdg)
-  #:use-module (gnu packages gnupg)
-  #:use-module (ice-9 rdelim)
-  #:use-module (gnu system)
-  #:use-module (guix gexp)
-  #:use-module (services emacs)
-  #:export (bd-base-system-services
-            bd-base-home-services))
-
-(use-service-modules admin avahi base
-                     dbus desktop file-sharing
-                     networking ssh)
-
-(define (read-hosts filename)
-  (let ((port (open-input-file filename)))
-    (let loop ((lines '()))
-      (let ((line (read-line port)))
-        (if (eof-object? line)
-            (begin (close-input-port port)
-                   lines)
-            (loop (cons line lines)))))))
-
-(define bd-base-system-services
-  `(
-    ;; 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
-    ,(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)
-               ))
-    ,(service dbus-root-service-type)
-
-    ,(service ntp-service-type)
-
-    ,(service openssh-service-type
-              (openssh-configuration
-               (x11-forwarding? #t)
-               (permit-root-login 'prohibit-password)
-               (password-authentication? #f)))
-    ,(service tor-service-type)
-    ,(simple-service 'add-extra-hosts
-                     hosts-service-type
-                     (map
-                      (lambda (x)
-                        (host "0.0.0.0" x))
-                      (read-hosts "/home/bdunahu/.config/guix/assets/blocklist.txt")))
-    ,@%base-services))
-
-(define bd-base-home-services
-  (list
-   (service bd-home-emacs-service-type)
-   (service home-shepherd-service-type)
-
-   (service home-dicod-service-type)
-
-   (service home-gpg-agent-service-type
-            (home-gpg-agent-configuration
-             (pinentry-program
-              (file-append pinentry-emacs "/bin/pinentry-emacs"))
-             (ssh-support? #t)
-             (default-cache-ttl 28800)
-             (max-cache-ttl 28800)
-             (default-cache-ttl-ssh 28800)
-             (max-cache-ttl-ssh 28800)))
-
-   (service home-bash-service-type
-            (home-bash-configuration
-             (aliases '(("aardwolf" . "telnet aardmud.org 23")
-                        ("auth" . "echo -e \"$PWD\n\" >> $HOME/.config/guix/shell-authorized-directories")
-                        ("cp" . "cp -i")
-                        ("grep" . "grep --color=auto")
-                        ("guix-rcfg" . "sudo guix system -L ${HOME}/.config/guix/modules/ reconfigure ${HOME}/.config/guix/${HOSTNAME}.scm")
-                        ("ll" . "ls -l")
-                        ("ls" . "ls -p --color=auto")
-                        ("mkd" . "mkdir -pv")
-                        ("mv" . "mv -i")
-                        ("rig-shell" . "screen /dev/ttyUSB0 115200")
-                        ("rm" . "rm -i")
-                        ("suspend" . "sudo loginctl suspend")
-                        ("vi" . "vim")
-                        ("xeb" . "emacsclient -nce '(switch-to-buffer nil)'")
-                        ("xet" . "emacsclient -nce '(shell)'")
-                        ("ytta" . "yt-dlp --extract-audio --format bestaudio/best")
-                        ("yttv" . "yt-dlp -f b")))
-
-             (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
-")))
-             (environment-variables
-              '(
-                ("BROWSER" . "librewolf")
-
-                ("VISUAL" . "emacsclient")
-                ("EDITOR" . "emacsclient")
-
-                ("NETHACKOPTIONS" . "@$XDG_CONFIG_HOME/nethack/config")
-
-                ("PATH" . "$HOME/.local/bin:$PATH")
-                ("PYTHONPATH" . "$HOME/pt/cs598/nemesis/:$PYTHONPATH")
-                ("ZATHURA_PLUGINS_PATH" . "$HOME/.guix-home/profile/lib/zathura")
-                ))))
-
-   (service home-mcron-service-type
-            (home-mcron-configuration
-             (jobs
-              (list
-               #~(job
-                  ;; twenty minutes
-                  (lambda (current-time) (+ current-time (* 20 60)))
-                  "offlineimap")
-               #~(job
-                  (lambda (current-time) (+ current-time (* 5 60)))
-                  "~/.local/bin/set-t1")))))
-
-   (service home-openssh-service-type
-            (home-openssh-configuration
-             (hosts
-              (list (openssh-host (name "garm")
-                                  (host-name "localhost")
-                                  (user "root"))
-                    ;; (openssh-host (name "vali")
-                    ;;               (host-name "192.168.1.136")
-                    ;;               (user "bdunahu"))
-                    (openssh-host (name "surt")
-                                  (host-name "192.168.1.250")
-                                  (user "root"))
-                    (openssh-host (name "heimdallr")
-                                  (host-name "operationnull.com")
-                                  (user "root"))
-                    (openssh-host (name "nott")
-                                  (host-name "localhost")
-                                  (user "bdunahu")
-                                  (port 2222)
-                                  (extra-content "  UserKnownHostsFile=/dev/null
-  StrictHostKeyChecking=no
-"))))))
-
-   (service home-xdg-user-directories-service-type
-            (home-xdg-user-directories-configuration
-             (desktop "$HOME/dl")
-             (documents "$HOME/dc")
-             (download "$HOME/dl")
-             (music "$HOME/ik")
-             (pictures "$HOME/md/ig")
-             (publicshare "$HOME")
-             (templates "$HOME")
-             (videos "$HOME/md/vi")))
-
-   (service home-xdg-configuration-files-service-type
-            `(("gdbinit"
-               ,(plain-file
-                 (plain-file-name %default-gdbinit)
-                 (string-append (plain-file-content %default-gdbinit)
-                                "set disassembly-flavor intel
-set confirm no
-set history filename ~/.cache/gdb/history
-set history save on
-set history size unlimited")))))
-
-   (service home-xdg-mime-applications-service-type
-            (home-xdg-mime-applications-configuration
-             (default
-               '((application/x-bittorrent . torrent.desktop)
-                 (x-scheme-handler/magnet  . torrent.desktop)
-                 (x-scheme-handler/http . librewolf.desktop)
-                 (x-scheme-handler/https . librewolf.desktop)
-                 ))
-             (desktop-entries
-              (list
-               (xdg-desktop-entry
-                (file "torrent")
-                (name "Torrent")
-                (type 'application)
-                (config '((exec . "transmission-remote -a %u"))))))))))
diff --git a/.config/guix/modules/services/emacs.scm b/.config/guix/modules/services/emacs.scm
deleted file mode 100644
index ba3a0a7..0000000
--- a/.config/guix/modules/services/emacs.scm
+++ /dev/null
@@ -1,82 +0,0 @@
-(define-module (services emacs)
-  #:use-module (gnu)
-  #:use-module (gnu home services)
-  #:use-module (gnu services)
-  #:use-module (gnu services configuration)
-  #:use-module (gnu system)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (tanelorn packages emacs-xyz)
-  #:export (bd-home-emacs-service-type))
-
-;;; Commentary:
-;;; Code:
-
-(use-package-modules
- emacs
- photo
- aspell
- emacs-build
- emacs-xyz
- cpp
- gnupg
- python-xyz
- machine-learning
- mail
- lisp
- xdisorg)
-
-(define (bd-emacs-package-list config)
-  (list
-   emacs-next
-   pinentry-emacs
-
-   emacs-atomic-chrome
-   emacs-cider
-   emacs-clojure-mode
-   emacs-dash
-   emacs-denote
-   emacs-denote-journal
-   emacs-elpher
-   emacs-emms
-   emacs-exwm
-   emacs-f
-   emacs-gptel
-   emacs-guix
-   emacs-hydra
-   emacs-jeison
-   emacs-lua-mode
-   emacs-paredit
-   emacs-pinentry
-   emacs-rainbow-delimiters
-   emacs-rainbow-mode
-   emacs-s
-   emacs-slime
-   emacs-vterm
-   emacs-yasnippet
-
-   aspell
-   aspell-dict-en
-
-   wmctrl              ;; for exwm
-
-   perl-image-exiftool ;; for emms
-
-   ccls                ;; for eglot
-   python-lsp-server   ;;
-
-   llama-cpp           ;; for emacs-gptel
-   ))
-
-
-(define bd-home-emacs-service-type
-  (service-type (name 'emacs-config)
-                (description "A service which bundles required
-emacs packages.")
-                (extensions
-                 (list (service-extension
-                        home-profile-service-type
-                        bd-emacs-package-list)))
-                (default-value #f)))
-
-;;; emacs.scm ends here
diff --git a/.config/guix/modules/services/xorg.scm b/.config/guix/modules/services/xorg.scm
deleted file mode 100644
index 065540b..0000000
--- a/.config/guix/modules/services/xorg.scm
+++ /dev/null
@@ -1,80 +0,0 @@
-(define-module (services xorg)
-  #:use-module (gnu)
-  #:use-module (gnu home services)
-  #:use-module (gnu home services desktop)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (gnu packages suckless)
-  #:use-module (ymir)
-  #:export (bd-desktop-system-services
-            bd-desktop-home-services
-            ))
-
-(use-service-modules audio desktop networking
-                     sound xorg)
-
-(define %keyboard-udev-rule
-  (udev-rule
-   "90-keyboard-hotplug.rules"
-   (string-append "ATTR{idVendor}==\"04b4\", ATTR{idProduct}==\"0510\", ACTION==\"add\", RUN+=\"/run/current-system/profile/bin/touch /tmp/keyboard_plugged\" RUN+=\"/run/current-system/profile/bin/chown " username " /tmp/keyboard_plugged\"")))
-
-(define bd-desktop-system-services
-  (list
-   (service screen-locker-service-type
-            (screen-locker-configuration
-             (name "slock")
-             (program (file-append slock "/bin/slock"))))
-
-   (service x11-socket-directory-service-type)
-   (udev-rules-service 'keyboard-hotplug %keyboard-udev-rule)
-
-   (service pulseaudio-service-type)
-   (service alsa-service-type)))
-
-(define bd-desktop-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: MedievalSharp:size=9
-"))
-                     (".xinitrc"
-                      ,(plain-file "xinitrc" "
-#!/bin/sh
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-
-# merge in defaults and keymaps
-
-if [ -f \"$userresources\" ]; then
-
-    xrdb -merge \"$userresources\"
-
-fi
-
-if [ -f \"$usermodmap\" ]; then
-    xmodmap \"$usermodmap\"
-fi
-
-picom --backend=glx &
-xss-lock -- slock &
-xset r rate 250 70
-xset s 600
-touchpad-defaults
-xrandr-toggle
-xkeyboard-auto &
-eww daemon
-eww open bar
-exec emacs -mm"))
-                     (".config/gtk-2.0/settings.ini"
-                      ,(plain-file "settings.ini" "
-[Settings]
-gtk-application-prefer-dark-theme=1\n"))
-                     (".config/gtk-3.0/settings.ini"
-                      ,(plain-file "settings.ini" "
-[Settings]
-gtk-application-prefer-dark-theme=1\n"))))))
diff --git a/.config/guix/modules/ymir.scm b/.config/guix/modules/ymir.scm
deleted file mode 100644
index 7327980..0000000
--- a/.config/guix/modules/ymir.scm
+++ /dev/null
@@ -1,71 +0,0 @@
-(define-module (ymir)
-  #:use-module (gnu)
-  #:use-module (gnu services desktop)
-  #:use-module (gnu system)
-  #:export (username
-            user
-            ymir))
-
-
-;;; Commentary:
-;;;
-;;; ymir defines a default system configuration
-;;;
-;;; Code:
-
-(define username "bdunahu")
-(define user (user-account
-              (name username)
-              (comment username)
-              (group "users")
-              (home-directory (string-append "/home/" username))
-              (supplementary-groups '("audio"
-                                      "netdev"
-                                      "video"
-                                      "wheel"
-                                      "dialout"
-                                      "kvm"))))
-
-
-(define ymir
-  (operating-system
-   (host-name "ymir")
-   (locale "en_US.utf8")
-   (timezone
-    (if #t
-        "America/New_York"
-        "America/Denver"))
-   (keyboard-layout
-    (keyboard-layout "us"
-                     ;; #:variant '("workman")
-                     #:options '("ctrl:hyper_capscontrol")))
-   (kernel-arguments
-    (delete "quiet"
-            %default-kernel-arguments))
-
-   ;; 'root' is implicit
-   (users (cons* user
-                 %base-user-accounts))
-
-   ;; grub (uefi)
-   (bootloader (bootloader-configuration
-                (bootloader grub-efi-bootloader)
-                (targets (list "/boot/efi"))
-                (timeout 1)
-                (keyboard-layout keyboard-layout)))
-
-   ;; OVERRIDE THESE
-   (packages
-    %base-packages)
-   (services
-    %base-services)
-   (file-systems (cons*
-                  (file-system
-                   (mount-point "/")
-                   (device "none")
-                   (type "tmpfs")
-                   (check? #f))
-                  %base-file-systems))))
-
-
-;;; ymir.scm ends here
diff --git a/.config/guix/nott.scm b/.config/guix/nott.scm
deleted file mode 100644
index b9418c6..0000000
--- a/.config/guix/nott.scm
+++ /dev/null
@@ -1,79 +0,0 @@
-(define-module (nott)
-  #:use-module (gnu)
-  #:use-module (guix)
-  #:use-module (packages packages)
-  #:use-module (ymir)
-  #:use-module (srfi srfi-1))
-
-(use-service-modules desktop mcron networking spice ssh xorg sddm)
-(use-package-modules bootloaders certs fonts nvi package-management wget xorg)
-
-;;; Commentary:
-;;;
-;;; nott is a vm
-;;;
-;;; Code:
-
-
-(operating-system
-  (inherit ymir)
-  (host-name "nott")
-
-  (label (string-append "GNU Guix "
-                       (or (getenv "GUIX_DISPLAYED_VERSION")
-                           (package-version guix))))
-
-  (firmware '())
-
-  (packages
-   `(,@bd-packages-system))
-  (services
-   (append (list (service xfce-desktop-service-type)
-
-                 (service slim-service-type
-                          (slim-configuration
-                           (auto-login? #t)
-                           (default-user username)
-                           (xorg-configuration
-                            (xorg-configuration
-                             (modules (cons xf86-video-qxl
-                                            %default-xorg-modules))))))
-
-                 (service openssh-service-type)
-
-                 (service spice-vdagent-service-type)
-
-                 (service dhcp-client-service-type))
-
-           (remove (lambda (service)
-                     (let ((type (service-kind service)))
-                       (or (memq type
-                                 (list gdm-service-type
-                                       sddm-service-type
-                                       wpa-supplicant-service-type
-                                       cups-pk-helper-service-type
-                                       network-manager-service-type
-                                       modem-manager-service-type))
-                           (eq? 'network-manager-applet
-                                (service-type-name type)))))
-                   (modify-services %desktop-services
-                     (login-service-type config =>
-                                         (login-configuration
-                                          (inherit config)))
-
-                     (guix-service-type config =>
-                                        (guix-configuration
-                                         (inherit config)
-                                         (guix (current-guix))))))))
-
-  (bootloader (bootloader-configuration
-               (bootloader grub-bootloader)
-               (targets (list "/dev/sda1"))
-               (terminal-outputs '(console))))
-
-  (file-systems (cons (file-system
-                         (mount-point "/")
-                         (device "/dev/sda2")
-                         (type "ext4")) %base-file-systems))
-
-  (name-service-switch %mdns-host-lookup-nss))