X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/7c054dcebe12d7121f067b279a772f874b29d3da..a567a3276f8d953c60b2ad9a25a6509a90f61034:/.emacs.d/init.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index b4a16cc..e23653b 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -272,8 +272,7 @@
 
 (with-eval-after-load 'ediff
   (setq ediff-window-setup-function 'ediff-setup-windows-plain
-        ediff-split-window-function 'split-window-horizontally)
-  (add-hook 'ediff-after-quit-hook-internal #'winner-undo))
+        ediff-split-window-function 'split-window-horizontally))
 
 (with-eval-after-load 'face-remap
   (setq
@@ -491,8 +490,14 @@ for all frames."
  (expand-file-name
   (convert-standard-filename "lisp") user-emacs-directory))
 
-(when (member (system-name) '("chaman"))
-  (require 'bandali-exwm))
+(when
+    (and
+     (display-graphic-p)
+     ;; we're not running in another WM/DE
+     (not (getenv "XDG_CURRENT_DESKTOP"))
+     (member (system-name) '("chaman" "langa")))
+  (require 'bandali-exwm)
+  (global-set-key (kbd "C-x b") #'exwm-workspace-switch-to-buffer))
 
 (require 'bandali-org)