From 4d043f0652429cb54987d2b69bf5d44929a4cd9f Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Thu, 3 Feb 2022 20:05:57 +0000
Subject: better detection of x/wayland environment

---
 init.org | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

(limited to 'init.org')

diff --git a/init.org b/init.org
index ffecd87..b020a42 100644
--- a/init.org
+++ b/init.org
@@ -465,8 +465,6 @@
         (let ((level (if jao-transparent-frame 100 jao-frames-default-alpha)))
           (jao-set-transparency level all)))
 
-      (add-hook 'after-init-hook #'jao-set-transparency)
-
     #+end_src
 *** exwm
     To start emacs in an exwm session we use the flag
@@ -481,11 +479,28 @@
         (setq jao-exwm-enabled t)
         (display-time-mode -1)
         (exwm-enable)
-        (setq jao-transparent-only-bg nil jao-frames-default-alpha 88)
-        (jao-set-transparency nil)
+        (setq jao-transparent-only-bg t jao-frames-default-alpha 88)
+        (jao-set-transparency)
         (x-change-window-property "_XMONAD_TRAYPAD" "" nil nil nil nil 0)
         (jao-trisect t))
     #+end_src
+*** xmonad
+    #+begin_src emacs-lisp
+      (defvar jao-xmonad-enabled (string= "xmonad" (or (getenv "wm") "")))
+
+      (defun jao-xmonad-enable ()
+        (setq jao-browse-doc-use-emacs-p t)
+        (setq jao-minibuffer-right-margin " ")
+        (setq jao-wallpaper-random-wake nil)
+        (jao-trisect)
+        (setq jao-transparent-only-bg t jao-frames-default-alpha 88)
+        (jao-set-transparency)
+        (jao-themes-setup)
+        (message "Welcome to xmonad"))
+
+      (when jao-xmonad-enabled (add-hook 'after-init-hook #'jao-xmonad-enable))
+
+    #+end_src
 *** sway
     When starting emacs inside a sway session, we use ~-f
     jao-sway-enable~ and don't load any separate configuration file.
@@ -500,7 +515,8 @@
            (jao-swaymsg ,msg)))
       (jao-def-swaymsg firefox "[app_id=firefox] focus")
 
-      (defvar jao-sway-enabled (eq window-system 'pgtk))
+      (defvar jao-sway-enabled
+        (and (eq window-system 'pgtk) (not jao-xmonad-enabled)))
 
       (defun jao-sway-set-wallpaper (f)
         (jao-swaymsg (format "output * bg %s fill" f))
@@ -513,7 +529,6 @@
           (start-process-shell-command cmd nil cmd)))
 
       (defun jao-sway-enable ()
-        ;; (setq jao-sway-enabled t)
         (setq jao-browse-doc-use-emacs-p t)
         (setq jao-minibuffer-right-margin "")
         (setq jao-wallpaper-random-wake nil)
-- 
cgit v1.2.3