4 files changed, 10 insertions(+), 26 deletions(-)

M emacs.org
M exwm.org
M exwm/start-exwm.sh
M init.el

@@ 266,6 266,12 @@ heard much good about straight, so time to put that to the test.
 Inspired from a multitude of different configs, this removes the Emacs menu bar
 and other bits of the UI, and includes some limits I consider useful.
 
+Hide annoying minor modes that will always be on anyway.
+
+#+BEGIN_SRC emacs-lisp
+(use-package diminish)
+#+END_SRC
+
 Let's get rid of the ugly UI elements that take up screen space.
 
 #+BEGIN_SRC emacs-lisp


@@ 432,12 438,6 @@ emojis.
   :commands emojify-mode)
 #+END_SRC
 
-Hide annoying minor modes that will always be on anyway.
-
-#+BEGIN_SRC emacs-lisp
-(use-package diminish)
-#+END_SRC
-
 Improve text scaling.
 
 #+BEGIN_SRC emacs-lisp


@@ 2391,14 2391,3 @@ wasn't sure what section to put this in.
       (if (and b e (< (point) e)) (setq rlt nil)))
     (setq ad-return-value rlt)))
 #+END_SRC
-
-* EXWM
-Although EXWM is in another file, I still need to require it in my
-main config.
-
-#+BEGIN_SRC emacs-lisp
-(setq catster/use-exwm t)
-
-(when catster/use-exwm
-   (require 'catsters-exwm))
-#+END_SRC

@@ 79,7 79,7 @@ export EDITOR="$VISUAL"
 # Allows scrolling in GTK 3 apps
 export GDK_CORE_DEVICE_EVENTS=1
 
-exec dbus-launch emacs --eval "(dw/start-panel)" --eval "(require 'exwm)" -f exwm-enable
+exec dbus-launch emacs --eval "(progn (add-to-list 'load-path \"~/.emacs.d/lisp/\") (require 'catsters-exwm))" --eval "(dw/start-panel)" --eval "(require 'exwm)" -f exwm-enable
 #+END_SRC
 
 *** exwm_screen_layout

@@ 24,4 24,4 @@ export EDITOR="$VISUAL"
 # Allows scrolling in GTK 3 apps
 export GDK_CORE_DEVICE_EVENTS=1
 
-exec dbus-launch emacs --eval "(dw/start-panel)" --eval "(require 'exwm)" -f exwm-enable
+exec dbus-launch emacs --eval "(progn (add-to-list 'load-path \"~/.emacs.d/lisp/\") (require 'catsters-exwm))" --eval "(dw/start-panel)" --eval "(require 'exwm)" -f exwm-enable

@@ 153,6 153,8 @@
 (straight-use-package 'use-package)
 (setq straight-use-package-by-default t)
 
+(use-package diminish)
+
 (scroll-bar-mode -1)
 (tool-bar-mode   -1)
 (tooltip-mode    -1)


@@ 239,8 241,6 @@
   :hook (erc-mode . emojify-mode)
   :commands emojify-mode)
 
-(use-package diminish)
-
 (use-package default-text-scale
   :defer 1
   :config


@@ 1676,8 1676,3 @@
         (if b (setq e (re-search-forward end-regexp nil t))))
       (if (and b e (< (point) e)) (setq rlt nil)))
     (setq ad-return-value rlt)))
-
-(setq catster/use-exwm t)
-
-(when catster/use-exwm
-   (require 'catsters-exwm))