x11 refactorings

1 files changed, 6 insertions, 70 deletions

diff --git a/init.el b/init.el
index b8ab4b5..57e6075 100644
--- a/init.el
+++ b/init.el
@@ -186,69 +186,6 @@
  (use-package app-launcher
    :bind (("s-R" . app-launcher-run-app))))
 
-;;;; brightness control
-(jao-when-linux
- (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 ()
-   (string-trim (or (cadr (jao-shell-cmd-lines "brightnessctl")) "(Unknown)")))
-
- (defun jao-bright-show ()
-   (interactive)
-   (message "%s" (jao-brightness)))
-
- (defun jao-bright-up ()
-   (interactive)
-   (jao-shell-exec "brightnessctl -q s 5%%+" t)
-   (jao-bright-show))
-
- (defun jao-bright-down ()
-   (interactive)
-   (jao-shell-exec "brightnessctl -q s 5%%-" t)
-   (jao-bright-show)))
-
-;;;; keyboard
-(jao-when-darwin
- (setq mac-command-modifier 'meta)
- (setq mac-option-modifier 'super)
- (global-set-key (kbd "£") [?#]))
-
-(use-package repeat
-  :demand t
-  :config
-  (setq repeat-echo-function 'repeat-echo-mode-line
-                repeat-exit-key "SHIFT"
-                repeat-exit-timeout 2)
-  (repeat-mode))
-
-(jao-when-linux
- (defun jao-kb-toggle (&optional lyt)
-   (interactive)
-   (shell-command-to-string (or lyt
-                                (if (jao-kb-toggled-p)
-                                    "setxkbmap us"
-                                  "setxkbmap us -variant intl"))))
-
- (defun jao-set-uk-kb (&optional lyt)
-   (interactive)
-   (jao-kb-toggle "setxkbmap gb"))
-
- (defun jao-kb-disable-laptop ()
-   (interactive)
-   (jao-shell-exec "xinput float 13"))
-
- (defun jao-kb-toggled-p ()
-   (not (string-empty-p
-         (shell-command-to-string "setxkbmap -query|grep variant")))))
-
-(customize-set-variable 'default-input-method "catalan-prefix")
-;; http://mbork.pl/2022-03-07_Transient_input_method
-(customize-set-variable 'default-transient-input-method "TeX")
-
-(setq echo-keystrokes 1
-      suggest-key-bindings nil)
-
 ;;;; transient
 (use-package transient
   :init (setq transient-show-popup t)
@@ -357,11 +294,10 @@
   `(jao-call-with-auth ,host (lambda (,usr ,pwd) ,@body)))
 
 ;;;; pass
-(when (> emacs-major-version 28)
-  (use-package password-store-menu
-   :ensure t
-   :config (password-store-menu-enable)
-   :custom (password-store-menu-key "C-c p")))
+(use-package password-store-menu
+  :ensure t
+  :config (password-store-menu-enable)
+  :custom (password-store-menu-key "C-c p"))
 
 ;;; Fonts and color themes
 ;;;; widgets
@@ -2170,8 +2106,8 @@
      ("r" "translate" reverso)
      ("f" "copy buffer file name" copy-buffer-file-name-as-kill)
      ("F" "kill ff url" jao-exwm-kill-firefox-url :if jao-exwm-enabled-p)
-     ("k" (lambda () (concat "keyboard" (when (jao-kb-toggled-p) "*")))
-      jao-kb-toggle :if jao-x11-p)]]))
+     ("k" (lambda () (concat "keyboard" (when (jao-x11-kb-toggled-p) "*")))
+      jao-x11-kb-toggle :if jao-x11-p)]]))
 
 (global-set-key (kbd "s-w") #'jao-transient-utils)