about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--configs/shared/.xsessionrc.shared5
-rw-r--r--emacs/Makefile5
-rw-r--r--emacs/default.nix6
3 files changed, 14 insertions, 2 deletions
diff --git a/configs/shared/.xsessionrc.shared b/configs/shared/.xsessionrc.shared
index 7c8428e406fa..4df221df65a6 100644
--- a/configs/shared/.xsessionrc.shared
+++ b/configs/shared/.xsessionrc.shared
@@ -26,5 +26,6 @@ unclutter &
 # Control X's pointer with the keyboard. Activate by pressing <C-;>
 keynav daemonize
 
-# Startup Emacs (and EXWM).
-exec emacs --debug-init --no-site-file --no-site-lisp
+# Startup Emacs (and EXWM). This is built by calling `make install` from within
+# ~/dotfiles/emacs.
+exec wpcarros-emacs
diff --git a/emacs/Makefile b/emacs/Makefile
new file mode 100644
index 000000000000..adaf8a61a132
--- /dev/null
+++ b/emacs/Makefile
@@ -0,0 +1,5 @@
+install:
+	# TODO: I'd rather support `nix-env -f '<universe>' -iA emacs`, but at the
+	# moment this fails. I think it's failing because of the way I'm using
+	# readTree. I will need to investigate this further.
+	nix-env -f . -i
diff --git a/emacs/default.nix b/emacs/default.nix
index 9ff5c1f2dfd1..18d9f2cc61f3 100644
--- a/emacs/default.nix
+++ b/emacs/default.nix
@@ -36,6 +36,12 @@ let
       neotree # TODO: Remove this dependency from my config.
       which-key
       ivy
+      restclient
+      package-lint
+      parsec
+      magit-popup
+      direnv
+      emr
       ivy-prescient
       all-the-icons
       all-the-icons-ivy