x11 fixesmain

4 files changed, 26 insertions, 27 deletions

diff --git a/custom/jao-custom-exwm.el b/custom/jao-custom-exwm.el
index d36c8f1..90e3bef 100644
--- a/custom/jao-custom-exwm.el
+++ b/custom/jao-custom-exwm.el
@@ -124,7 +124,7 @@
 (define-key exwm-mode-map (kbd "M-o") #'jao-afio-toggle)
 (define-key exwm-mode-map (kbd "M-p") #'jao-prev-window)
 
-(setq
+(setopt
  exwm-input-global-keys
  '(([?\s-0] . jao-afio-goto-scratch)
    ([?\s-1] . jao-afio-goto-main)
@@ -143,10 +143,9 @@
    ([?\s-p] . jao-prev-window)
    ([?\s-R] . app-launcher-run-app)
    ([?\s-r] . jao-transient-recoll)
-   ([?\s-s] . jao-transient-streaming)
    ([?\s-n] . jao-transient-ednc)
-   ([?\s-t] . eat)
-   ([?\s-w] . jao-transient-utils)
+   ([?\s-s] . jao-transient-utils)
+   ([?\s-t] . jao-exwm-xterm)
    ([?\s-z] . jao-transient-sleep)
    ([XF86AudioMute] . jao-mixer-master-toggle)
    ([XF86AudioPlay] . jao-player-toggle)
@@ -156,14 +155,14 @@
    ([XF86AudioStop] . jao-player-stop)
    ([XF86AudioRaiseVolume] . jao-mixer-master-up)
    ([XF86AudioLowerVolume] . jao-mixer-master-down)
-   ([XF86MonBrightnessUp] . jao-bright-up)
-   ([XF86MonBrightnessDown] . jao-bright-down)
+   ([XF86MonBrightnessUp] . jao-x11-bright-up)
+   ([XF86MonBrightnessDown] . jao-x11-bright-down)
    ([?\s-\`] . jao-exwm-switch-to-next-x)
    ([s-tab] . jao-exwm-switch-to-next-class)
    ([print] . jao-exwm-import-screen)
    ([f6] . jao-toggle-audio-applet)
    ([f8] . jao-toggle-nm-applet)
-   ([f9] . jao-bright-show)))
+   ([f9] . jao-x11-bright-show)))
 
 ;; (customize-set-variable 'exwm-input-global-keys exwm-input-global-keys)
 (exwm-wm-mode)
diff --git a/init.el b/init.el
index 57e6075..e339e39 100644
--- a/init.el
+++ b/init.el
@@ -2087,11 +2087,11 @@
      ("w" "set wallpaper" jao-set-wallpaper)
      ("W" "set radom wallpaper" jao-set-random-wallpaper)
      ("B u" (lambda ()
-              (let ((b (jao-brightness)))
+              (let ((b (jao-x11-brightness)))
                 (format "bright up %s" (and (string-match ".*\\((.+)\\).*" b)
                                             (match-string 1 b)))))
-      jao-bright-up :transient t)
-     ("B d" "bright down" jao-bright-down :transient t)]
+      jao-x11-bright-up :transient t)
+     ("B d" "bright down" jao-x11-bright-down :transient t)]
     ["Utilities"
      ("a" "aptitude" jao-term-aptitude)
      ("l" "packages" jao-list-packages)
diff --git a/lib/wm/jao-exwm.el b/lib/wm/jao-exwm.el
index 7027df4..27ddeb0 100644
--- a/lib/wm/jao-exwm.el
+++ b/lib/wm/jao-exwm.el
@@ -211,17 +211,17 @@
       (switch-to-buffer b)
       (exwm-input--fake-key ?y)
       (exwm-input--fake-key ?y)
-      (prog1 (current-kill 1)
+      (prog1 (message "%s" (current-kill 1))
         (switch-to-buffer cb)))))
 
 (defun jao-exwm-firefox-search (query)
   (interactive "sQuery: ")
   (jao-exwm-firefox)
-  (sit-for 0.5)
+  (sit-for 0.2)
   (exwm-input--fake-key ?s)
   (dolist (k (string-to-list query))
     (exwm-input--fake-key k))
-  (sit-for 0.5)
+  (sit-for 0.2)
   (exwm-input--fake-key ?\r))
 
 (provide 'jao-exwm)
diff --git a/lib/wm/jao-x11.el b/lib/wm/jao-x11.el
index 16566d8..788bfe6 100644
--- a/lib/wm/jao-x11.el
+++ b/lib/wm/jao-x11.el
@@ -23,53 +23,53 @@
 (jao-shell-def-exec jao-bright-set-up "brightnessctl" "-q" "s" "5%+")
 (jao-shell-def-exec jao-bright-set-down "brightnessctl" "-q" "s" "5%-")
 
-(defun jao-brightness ()
+(defun jao-x11-brightness ()
   (string-trim (or (cadr (jao-shell-cmd-lines "brightnessctl")) "(Unknown)")))
 
 ;;;###autoload
-(defun jao-bright-show ()
+(defun jao-x11-bright-show ()
   (interactive)
-  (message "%s" (jao-brightness)))
+  (message "%s" (jao-x11-brightness)))
 
 ;;;###autoload
-(defun jao-bright-up ()
+(defun jao-x11-bright-up ()
   (interactive)
   (jao-shell-exec "brightnessctl -q s 5%%+" t)
-  (jao-bright-show))
+  (jao-x11-bright-show))
 
 ;;;###autoload
-(defun jao-bright-down ()
+(defun jao-x11-bright-down ()
   (interactive)
   (jao-shell-exec "brightnessctl -q s 5%%-" t)
-  (jao-bright-show))
+  (jao-x11-bright-show))
 
 ;;; Keyboard
 ;;;###autoload
-(defun jao-kb-layout ()
+(defun jao-x11-kb-layout ()
   (string-trim
    (shell-command-to-string
     "setxkbmap -query | grep 'layout:' | awk '{print $2}'")))
 
 ;;;###autoload
-(defun jao-kb-set (lyt &optional intl)
+(defun jao-x11-kb-set (lyt &optional intl)
   (interactive "sLayout: ")
   (let ((intl (if intl " -variant intl" "")))
     (shell-command-to-string (format "setxkbmap %s%s" lyt intl))))
 
 ;;;###autoload
-(defun jao-kb-toggled-p ()
+(defun jao-x11-kb-toggled-p ()
   (not (string-empty-p
         (shell-command-to-string "setxkbmap -query|grep variant"))))
 
 ;;;###autoload
-(defun jao-kb-toggle ()
+(defun jao-x11-kb-toggle ()
   (interactive)
-  (jao-kb-set (jao-kb-layout) (not (jao-kb-toggled-p))))
+  (jao-x11-kb-set (jao-x11-kb-layout) (not (jao-x11-kb-toggled-p))))
 
 ;;;###autoload
-(defun jao-kb-disable-laptop ()
+(defun jao-x11-kb-disable-laptop ()
   (interactive)
   (jao-shell-exec "xinput float 13"))
 
-(provide 'jao-x11-kbd)
+(provide 'jao-x11)
 ;;; jao-x11.el ends here