diff options
| -rw-r--r-- | custom/jao-custom-x11.el (renamed from custom/jao-custom-window-system.el) | 8 | ||||
| -rw-r--r-- | init.el | 19 |
2 files changed, 19 insertions, 8 deletions
diff --git a/custom/jao-custom-window-system.el b/custom/jao-custom-x11.el index 32b3578..b72fe0b 100644 --- a/custom/jao-custom-window-system.el +++ b/custom/jao-custom-x11.el @@ -21,9 +21,6 @@ (defsubst jao-x11-goto-ws (n) (jao-xdotool t "set_desktop" (format "%s" n))) ;;; exwm -(defvar jao-exwm-enabled nil) -(defun jao-exwm-enabled-p () jao-exwm-enabled) - (defun jao-exwm-enable () (require 'jao-custom-exwm) (setq jao-exwm-enabled t) @@ -35,9 +32,6 @@ (jao-trisect t)) ;;; xmonad -(defvar jao-xmonad-enabled (string= "xmonad" (or (getenv "wm") ""))) -(defun jao-xmonad-enabled-p () jao-xmonad-enabled) - (defun jao-xmonad-enable () (setq jao-browse-doc-use-emacs-p (display-graphic-p)) (setq jao-mode-line-in-minibuffer nil) @@ -195,4 +189,4 @@ ;;; - provide -(provide 'jao-custom-window-system) +(provide 'jao-custom-x11) @@ -1656,7 +1656,24 @@ ;;; Graphical window system -(jao-when-linux (require 'jao-custom-window-system)) +(defvar jao-exwm-enabled nil) +(defun jao-exwm-enabled-p () jao-exwm-enabled) + +(defvar jao-xmonad-enabled + (jao-when-linux (string= "xmonad" (or (getenv "wm") "")))) +(defun jao-xmonad-enabled-p () jao-xmonad-enabled) + +(defvar jao-wayland-enabled + (jao-when-linux (string= "wayland" (or (getenv "XDG_SESSION_TYPE") "")))) + +(defvar jao-river-enabled + (jao-when-linux (jao-shell-running-p "river"))) + +(jao-when-darwin + (defun jao-wayland-enabled-p () nil) + (defun jao-river-enabled-p () nil)) + +(jao-when-linux (require 'jao-custom-x11)) ;;; Global transients (defun jao-list-packages () |