summaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
authorbd <bdunahu@operationnull.com>2024-07-21 22:16:59 -0600
committerbd <bdunahu@operationnull.com>2024-07-21 22:16:59 -0600
commit21f777d137bb532a67902946b1677cd3fc177db5 (patch)
tree294299df25d34c6ded4f415310e5a87b32a43e4f /.config
parent6146878603c138fd06d7fc85f6ad4ea8b075c028 (diff)
Revert to previous window-switching method
Diffstat (limited to '.config')
-rw-r--r--.config/emacs/modules/bd--emms.el20
-rw-r--r--.config/emacs/modules/bd--windows.el17
-rw-r--r--.config/guix/modules/base.scm3
3 files changed, 18 insertions, 22 deletions
diff --git a/.config/emacs/modules/bd--emms.el b/.config/emacs/modules/bd--emms.el
index c2a9a8e..f12733c 100644
--- a/.config/emacs/modules/bd--emms.el
+++ b/.config/emacs/modules/bd--emms.el
@@ -29,16 +29,18 @@ playback."
(message "The Ainur cannot hear you..."))))
(emms-playing-time-disable-display)
(setopt emms-track-description-function
- '(lambda (track)
- (let ((artist (emms-track-get track 'info-artist))
- (title (emms-track-get track 'info-title)))
+ '(lambda (track)
+ (let ((artist (emms-track-get track 'info-artist))
+ (title (emms-track-get track 'info-title)))
(cond
- ((and artist title)
- (concat artist " - " title))
- (title
- title)
- (t
- (emms-track-simple-description track))))))
+ ((and artist title)
+ (concat artist " - " title))
+ (title
+ title)
+ (t
+ (emms-track-simple-description track))))))
+ ;; "emms-playlist-mode-bury-buffer" plays poorly with shackle
+ (keymap-set emms-playlist-mode-map "q" #'quit-window)
:custom
;; make sure mpd is configured similarly
(emms-player-mpd-server-name "localhost")
diff --git a/.config/emacs/modules/bd--windows.el b/.config/emacs/modules/bd--windows.el
index e48e7fa..23ced37 100644
--- a/.config/emacs/modules/bd--windows.el
+++ b/.config/emacs/modules/bd--windows.el
@@ -12,18 +12,11 @@
(fringe-mode '(0 . 0))
;; movement
-(defvar-keymap bd/windmove
- :repeat t
- "b" #'windmove-left
- "n" #'windmove-down
- "f" #'windmove-right
- "p" #'windmove-up
- "B" #'windmove-swap-states-left
- "N" #'windmove-swap-states-down
- "F" #'windmove-swap-states-right
- "P" #'windmove-swap-states-up)
-
-(keymap-global-set "H-o" bd/windmove)
+(keymap-global-unset "C-x o")
+(keymap-global-set "H-n" 'other-window)
+(keymap-global-set "H-p" (lambda ()
+ (interactive)
+ (other-window -1)))
(repeat-mode 1)
diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm
index bf2e6e6..5faa0a9 100644
--- a/.config/guix/modules/base.scm
+++ b/.config/guix/modules/base.scm
@@ -32,7 +32,7 @@
cryptsetup ;; cryptsetup
curl ;; curl
databases ;; recutils
- fonts ;; font-terminus, font-openmoji
+ fonts ;; font-terminus, font-openmoji, font-awesome
fontutils ;; fontconfig
gimp ;; gimp-next
gnupg ;; gnupg, pinentry, pinentry-emacs
@@ -83,6 +83,7 @@
ffmpeg
flameshot
fontconfig
+ font-awesome
font-openmoji
font-terminus
gimp-next