wee tweaks

1 files changed, 25 insertions, 31 deletions

diff --git a/exwm.org b/exwm.org
index d4dc150..4feef4e 100644
--- a/exwm.org
+++ b/exwm.org
@@ -218,16 +218,10 @@
 
     (defun jao-exwm-workspace (n)
       (if jao-exwm--use-afio
-          (cl-case n
-            ((1) (jao-afio--goto-main))
-            ((2) (jao-afio--goto-mail))
-            ((3) (jao-afio--goto-www))
-            ((4) (jao-afio--goto-docs))
-            ((5) (jao-afio--goto-scratch-1))
-            ((0) (jao-afio--goto-scratch)))
+          (jao-afio-goto-nth n)
         (exwm-workspace-switch-create n)))
 
-    (defmacro jao-def-runner (name ws class &rest args)
+    (defmacro jao-def-exwm-runner (name ws class &rest args)
       `(defun ,name (&rest other-args)
          (interactive)
          ,@(when ws `((jao-exwm-workspace ,ws)))
@@ -242,10 +236,10 @@
                                                            " "))
               args))))
 
-    (jao-def-runner jao-exwm-spotify 0 "Spotify" "spotify")
-    (jao-def-runner jao-exwm-spt 0 "spt" "xterm" "-e" "spt")
+    (jao-def-exwm-runner jao-exwm-spotify 0 "Spotify" "spotify")
+    (jao-def-exwm-runner jao-exwm-spt 0 "spt" "xterm" "-e" "spt")
 
-    (jao-def-runner jao-exwm-firefox 5 "Firefox" "firefox")
+    (jao-def-exwm-runner jao-exwm-firefox 5 "Firefox" "firefox")
 
     (defun jao-exwm-firefox-1 ()
       (interactive)
@@ -257,31 +251,31 @@
       (apply #'browse-url-firefox args))
     (setq browse-url-secondary-browser-function #'jao-exwm-browse-with-firefox)
 
-    (jao-def-runner jao-exwm-vlc 4 "VLC" "vlc")
+    (jao-def-exwm-runner jao-exwm-vlc 4 "VLC" "vlc")
 
-    (jao-def-runner jao-exwm-slack 0 "Slack" "slack")
-    (jao-def-runner jao-exwm-signal 0 "Signal" "signal-desktop")
+    (jao-def-exwm-runner jao-exwm-slack 0 "Slack" "slack")
+    (jao-def-exwm-runner jao-exwm-signal 0 "Signal" "signal-desktop")
 
-    (jao-def-runner jao-exwm-proton-bridge 0 "*proton-bridge*" "protonmail-bridge")
+    (jao-def-exwm-runner jao-exwm-proton-bridge 0 "*proton-bridge*" "protonmail-bridge")
 
-    ;; (jao-def-runner jao-exwm-htop 0 "htop-xterm"
+    ;; (jao-def-exwm-runner jao-exwm-htop 0 "htop-xterm"
     ;;                 "xterm" "-title" "htop-xterm" "-e" "htop")
-    (jao-def-runner jao-exwm-htop 0 "htop" jao-term-htop)
+    (jao-def-exwm-runner jao-exwm-htop 0 "htop" jao-term-htop)
 
-    ;; (jao-def-runner jao-exwm-aptitude 0 "aptitude-xterm"
+    ;; (jao-def-exwm-runner jao-exwm-aptitude 0 "aptitude-xterm"
     ;;                 "xterm" "-title" "aptitude-xterm" "-e" "aptitude")
-    (jao-def-runner jao-exwm-aptitude 0 "aptitude" jao-term-aptitude)
+    (jao-def-exwm-runner jao-exwm-aptitude 0 "aptitude" jao-term-aptitude)
 
-    (jao-def-runner jao-exwm-blueman 0 "Blueman-manager" "blueman-manager")
-    (jao-def-runner jao-exwm-ncmpcpp 0 "ncmpcpp" "xterm" "-e" "ncmpcpp" "-p" "6669")
-    (jao-def-runner jao-exwm-mpc 0 "*MPC-Status*" mpc)
+    (jao-def-exwm-runner jao-exwm-blueman 0 "Blueman-manager" "blueman-manager")
+    (jao-def-exwm-runner jao-exwm-ncmpcpp 0 "ncmpcpp" "xterm" "-e" "ncmpcpp" "-p" "6669")
+    (jao-def-exwm-runner jao-exwm-mpc 0 "*MPC-Status*" mpc)
 
-    (jao-def-runner jao-exwm-proton-vpn 0 "*pvpn*" proton-vpn-status)
-    (jao-def-runner jao-exwm-enwc 0 "*ENWC*" enwc)
-    (jao-def-runner jao-exwm-bluetooth 0 "*Bluetooth*" bluetooth-list-devices)
-    (jao-def-runner jao-exwm-paradox 0 "*Packages*" paradox-list-packages nil)
-    (jao-def-runner jao-exwm-packages 0 "*Packages*" list-packages nil)
-    (jao-def-runner jao-exwm-proced 0 "*Proced*" proced)
+    (jao-def-exwm-runner jao-exwm-proton-vpn 0 "*pvpn*" proton-vpn-status)
+    (jao-def-exwm-runner jao-exwm-enwc 0 "*ENWC*" enwc)
+    (jao-def-exwm-runner jao-exwm-bluetooth 0 "*Bluetooth*" bluetooth-list-devices)
+    (jao-def-exwm-runner jao-exwm-paradox 0 "*Packages*" paradox-list-packages nil)
+    (jao-def-exwm-runner jao-exwm-packages 0 "*Packages*" list-packages nil)
+    (jao-def-exwm-runner jao-exwm-proced 0 "*Proced*" proced)
 
     (defun jao-exwm-kill-xmobar ()
       (interactive)
@@ -292,9 +286,9 @@
       (jao-exwm-kill-xmobar)
       (start-process "" nil "xmobar-exwm" "-d"))
 
-    (jao-def-runner jao-exwm-open-with-zathura nil nil "zathura" (buffer-file-name))
-    (jao-def-runner jao-exwm-open-with-mupdf nil nil "mupdf" (buffer-file-name))
-    (jao-def-runner jao-exwm-xterm 0 nil "xterm")
+    (jao-def-exwm-runner jao-exwm-open-with-zathura nil nil "zathura" (buffer-file-name))
+    (jao-def-exwm-runner jao-exwm-open-with-mupdf nil nil "mupdf" (buffer-file-name))
+    (jao-def-exwm-runner jao-exwm-xterm 0 nil "xterm")
 
     (defun jao-exwm-import-screen (&optional area)
       (interactive "P")