Add emacs-transmission, move system/user packages

4 files changed, 85 insertions, 78 deletions

diff --git a/.config/emacs/modules/bd--dired.el b/.config/emacs/modules/bd--files.el
index 5505045..49e819a 100644
--- a/.config/emacs/modules/bd--dired.el
+++ b/.config/emacs/modules/bd--files.el
@@ -1,6 +1,7 @@
 ;; -*- lexical-binding: t; -*-
 
 
+;;;; dired
 (require 'dired)
 (keymap-global-set "C-c d" 'dired-jump)
 (keymap-set dired-mode-map "h" #'dired-hide-details-mode)
@@ -29,4 +30,10 @@
   ((dired-mode . all-the-icons-dired-mode)))
 
 
-(provide 'bd--dired)
+;;;; transmission
+(use-package transmission
+  :bind
+  (:map transmission-mode-map
+        ("R" . #'transmission-move)))
+
+(provide 'bd--files)
diff --git a/.config/guix/emacs-manifest.scm b/.config/guix/emacs-manifest.scm
index 466443e..334cb90 100644
--- a/.config/guix/emacs-manifest.scm
+++ b/.config/guix/emacs-manifest.scm
@@ -23,5 +23,6 @@
    "emacs-rainbow-mode"
    "emacs-simple-httpd"
    "emacs-slime"
+   "emacs-transmission"
    "emacs-vertico"
    "emacs-visual-fill-column"))
diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm
index 51cb67a..03a58f3 100644
--- a/.config/guix/modules/base.scm
+++ b/.config/guix/modules/base.scm
@@ -19,29 +19,19 @@
         "aspell-dict-en"
         "flameshot"
         "font-google-noto-emoji"
-        "gtk+"
-        "libnotify"
-        "pass-otp"
-        "password-store"
-        "pavucontrol"
-        "pinentry"
-        "recutils"
         "rsync"
         "stow"
         "transmission"
-        "unzip"
         "xdotool"
         "xset")))
 
 (define-public program-packages
   (map specification->package
        (list
-        "dmenu"
         "feh"
         "ffmpeg"
         "gimp"
         "gnupg"
-        "icecat"
         "jq"
         "librewolf"
         "mpv"
@@ -49,7 +39,6 @@
         "notmuch"
         "offlineimap3"
         "sbcl"
-        "sxiv"
         "texlive"
         "xpdf" ; pdftotext
         "xprop"
diff --git a/.config/guix/modules/ymir.scm b/.config/guix/modules/ymir.scm
index 98ae27d..199f14a 100644
--- a/.config/guix/modules/ymir.scm
+++ b/.config/guix/modules/ymir.scm
@@ -25,75 +25,85 @@
 ;;;; 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"))
+    (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))
+    ;; '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)))
+    ;; 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"
-                        "emacs"
-                        "git"
-                        "imagemagick"
-                        "mpd"
-                        "mpd-mpc"
-                        ;; "nss-certs" ;; was moved to base-packages
-                        "picom"
-                        "pulseaudio"
-                        "vim"
-                        "xmodmap"
-                        "xrdb"))
-               ,@%base-packages
-               ,dwm-packages))
+    ;; 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))))
+    ;; 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))
+             ;; 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))))
+    ;; OVERRIDE ME
+    (file-systems (cons*
+                   (file-system
+                     (mount-point "/")
+                     (device "none")
+                     (type "tmpfs")
+                     (check? #f))
+                   %base-file-systems))))