(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
(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)