summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.emacs.d/init.el7
m---------.emacs.d/lisp/exwm0
m---------.emacs.d/lisp/xelb0
-rw-r--r--.gitmodules6
-rwxr-xr-x.xinitrc4
5 files changed, 15 insertions, 2 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 975d314..381bcef 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -416,6 +416,13 @@ for all frames."
(add-to-list 'load-path (b/emacs.d "lisp"))
+(when (member (system-name) '("adelita"))
+ (add-to-list 'load-path (b/emacs.d "lisp/xelb"))
+ (add-to-list 'load-path (b/emacs.d "lisp/exwm"))
+ (require 'exwm)
+ (require 'exwm-config)
+ (exwm-config-example))
+
;; recently opened files
(run-with-idle-timer 0.2 nil #'require 'recentf)
(with-eval-after-load 'recentf
diff --git a/.emacs.d/lisp/exwm b/.emacs.d/lisp/exwm
new file mode 160000
+Subproject f00b5ca655a0471a10d21a3e75b1a442a8d2894
diff --git a/.emacs.d/lisp/xelb b/.emacs.d/lisp/xelb
new file mode 160000
+Subproject 25589d15117c9e13ce804b8b446bdd5ba25d52e
diff --git a/.gitmodules b/.gitmodules
index 7f92d04..d433a32 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,9 @@
[submodule "debian-el"]
path = .emacs.d/lisp/debian-el
url = https://salsa.debian.org/emacsen-team/debian-el.git
+[submodule "xelb"]
+ path = .emacs.d/lisp/xelb
+ url = https://github.com/emacs-exwm/xelb
+[submodule "exwm"]
+ path = .emacs.d/lisp/exwm
+ url = https://github.com/emacs-exwm/exwm
diff --git a/.xinitrc b/.xinitrc
index 0d3ba6b..f08673a 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -6,5 +6,5 @@ fi
# launch with dbus in part so that pinentry-gnome3 -- seemingly the
# pinentry du jour -- doesn't fall back to curses and screw us.
-#[ -x "$(command -v emacs)" ] && dbus-run-session ssh-agent emacs -ib 0
-exec i3
+[ -x "$(command -v emacs)" ] && dbus-run-session ssh-agent emacs -ib 0
+#exec i3