a few keybindings reshuffled

3 files changed, 22 insertions, 21 deletions

diff --git a/exwm.org b/exwm.org
index a04a59c..b659310 100644
--- a/exwm.org
+++ b/exwm.org
@@ -487,10 +487,10 @@
        ([?\s-\`] . jao-exwm-switch-to-next-x)
        ([s-tab] . jao-exwm-switch-to-next-class)
        ([print] . jao-exwm-import-screen)
+       ([f4] . jao-toggle-audio-applet)
        ([f5] . jao-weather)
-       ([f6] . jao-bright-show)
-       ([f7] . jao-toggle-audio-applet)
-       ([f8] . jao-toggle-nm-applet)))
+       ([f8] . jao-toggle-nm-applet)
+       ([f9] . jao-bright-show)))
 
     ;; (customize-set-variable 'exwm-input-global-keys exwm-input-global-keys)
 
diff --git a/init.org b/init.org
index 7b534ee..a3e5fd1 100644
--- a/init.org
+++ b/init.org
@@ -3738,6 +3738,8 @@
             (jao-audio-applet)
           (jao-exec-string "killall pasystray")))
 
+      (global-set-key (kbd "<f4>") #'jao-toggle-audio-applet)
+
     #+end_src
 *** emms
 ***** configuration
@@ -4023,9 +4025,9 @@
         ("Play"
          (("m" jao-player-toggle "toggle")
           ("n" jao-player-next "next")
-          ("f" jao-player-seek-forward "seek fwd")
-          ("F" jao-player-seek-backward "seek bwd")
-          ("p" jao-player-previous "previous"))
+          ("p" jao-player-previous "previous")
+          ("f" jao-player-seek-forward "seek fwd" :color red)
+          ("F" jao-player-seek-backward "seek bwd" :color red))
          "Browse"
          (("b" jao-player-browse "browse")
           ("l" jao-player-list "show play list")
@@ -4033,13 +4035,13 @@
           ("w" jao-player-echo "now playing (text)")
           ("s" jao-player-search "search"))
          "Master volume"
-         (("M" jao-mixer-master-toggle "master toggle")
-          ("d" jao-mixer-master-down "master down")
-          ("u" jao-mixer-master-up "master up")
+         (("d" jao-mixer-master-down "master down" :color red)
+          ("u" jao-mixer-master-up "master up" :color red)
+          ("M" jao-mixer-master-toggle "master toggle")
           ("v" (jao-mixer-get-level "Master") "show"))
          "Capture volume"
-         (("D" jao-mixer-capture-down "capture down")
-          ("U" jao-mixer-capture-up "capture up")
+         (("D" jao-mixer-capture-down "capture down" :color red)
+          ("U" jao-mixer-capture-up "capture up" :color red)
           ("V" (jao-mixer-get-level "Capture") "show"))
          "Utilities"
          (("C" jao-emms-update-cache "refresh cache")
@@ -4052,14 +4054,14 @@
     #+end_src
 * Key bindings
   #+begin_src emacs-lisp
-    (global-set-key "\M-\\" 'hippie-expand)
-    (global-set-key "\C-c." 'goto-last-change)
-    (global-set-key "\C-cj" 'join-line)
-    (global-set-key "\C-co" 'ff-find-other-file)
-    (global-set-key "\C-cq" 'auto-fill-mode)
-    (global-set-key "\C-xr\M-w" 'kill-rectangle-save)
-    (global-set-key "\C-c\C-z" 'comment-or-uncomment-region)
-    (global-set-key "\C-z" 'comment-or-uncomment-region)
+    (global-set-key "\M-\\" #'hippie-expand)
+    (global-set-key "\C-c." #'goto-last-change)
+    (global-set-key "\C-cj" #'join-line)
+    (global-set-key "\C-co" #'ff-find-other-file)
+    (global-set-key "\C-cq" #'auto-fill-mode)
+    (global-set-key "\C-xr\M-w" #'kill-rectangle-save)
+    (global-set-key "\C-c\C-z" #'comment-or-uncomment-region)
+    (global-set-key "\C-z" #'comment-or-uncomment-region)
 
     (pretty-hydra-define jao-hydra-emacs-utils (:color blue :quit-key "q")
       ("Notes"
diff --git a/org.org b/org.org
index 9864917..5b70594 100644
--- a/org.org
+++ b/org.org
@@ -302,5 +302,4 @@
       (global-set-key "\C-cL" 'org-insert-link-global)
       (global-set-key "\C-cO" 'org-open-at-point-global)
       (global-set-key "\C-ca" 'org-agenda)
-      (global-set-key [(f3)] #'org-capture-goto-last-stored)
-     #+end_src
+    #+end_src