switch-window is harmless in foot

1 files changed, 3 insertions, 7 deletions

diff --git a/init.el b/init.el
index b1ff066..5bb2baa 100644
--- a/init.el
+++ b/init.el
@@ -1022,7 +1022,7 @@
 (define-key ctl-x-4-map (kbd "t") 'transpose-windows)
 
 ;;;; switch window
-(when window-system
+(when (or window-system jao-wayland-enabled)
   (use-package switch-window
     :ensure t
     :custom ((switch-window-minibuffer-shortcut ?z)
@@ -1031,7 +1031,6 @@
              (switch-window-shortcut-appearance 'text)
              (switch-window-timeout 7)
              (switch-window-threshold 2))
-    :init (defalias 'jao-other-window 'switch-window)
     :config
     (defun jao-switch-window--then (prompt cmd)
       (let ((f `(lambda ()
@@ -1051,13 +1050,10 @@
       (interactive)
       (jao-switch-window--then "Switch to buffer" 'consult-buffer))
 
-    :bind (;; ("M-o" . switch-window)
-           ;; ("M-O" . switch-window-then-swap-buffer)
-           ("s-o" . switch-window)
-           ("s-O" . switch-window-then-swap-buffer)
-           ("C-x 4 d" . jao-switch-window-then-dired)
+    :bind (("C-x 4 d" . jao-switch-window-then-dired)
            ("C-x 4 f" . jao-switch-window-then-find-file)
            ("C-x 4 b" . jao-switch-window-then-consult-buffer))))
+
 ;;;; winner mode
 (winner-mode 1)