about summary refs log tree commit diff
path: root/configs
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2020-01-06T15·01+0000
committerWilliam Carroll <wpcarro@gmail.com>2020-01-17T10·56+0000
commit6e77fc79782864e77e064383669617ef33d71b8d (patch)
treec8e15a056a7e35973613c58b8b29cbe62ecd0002 /configs
parent069ca630828435280cd41e30d3e75057180f333c (diff)
Revert Nixified Emacs configuration
I attempted to Nixify my Emacs over winter break. I made some meaningful
progress, but not enough progress to use my Nixified Emacs setup. Since Emacs is
my primary editor and my window manager at work and at home, having a partially
baked setup is untenable at the moment.

Reverting these changes so that I can get on with my work, but checking them in
so that I can pick up where I left off one day.
Diffstat (limited to 'configs')
-rw-r--r--configs/shared/.emacs.d/init.el10
-rw-r--r--configs/shared/.xsessionrc.shared8
2 files changed, 6 insertions, 12 deletions
diff --git a/configs/shared/.emacs.d/init.el b/configs/shared/.emacs.d/init.el
index c02b56f3f864..e07157c70f3f 100644
--- a/configs/shared/.emacs.d/init.el
+++ b/configs/shared/.emacs.d/init.el
@@ -1,8 +1,4 @@
 (require 'wpc-package "~/.emacs.d/wpc/packages/wpc-package.el")
-(require 'f)
-(setq user-init-file (or load-file-name (buffer-file-name)))
-(setq user-emacs-directory (f-dirname user-init-file))
-;; TODO: Troubleshoot broken terminator.
 
 ;; load order is intentional
 (require 'constants)
@@ -15,7 +11,7 @@
 (require 'kaomoji)
 
 ;; Google
-;; (require 'google-stuff)
+(require 'google-stuff)
 
 ;; Laptop XF-functionality
 (require 'pulse-audio)
@@ -45,7 +41,7 @@
 (require 'wpc-lisp)
 (require 'wpc-haskell)
 (require 'wpc-reasonml)
-;; (require 'wpc-ocaml)
+(require 'wpc-ocaml)
 (require 'wpc-elixir)
 (require 'wpc-nix)
 (require 'wpc-rust)
@@ -54,5 +50,3 @@
 (require 'wpc-javascript)
 (require 'wpc-java)
 (require 'wpc-prolog)
-
-(run-hooks 'after-init-hook)
diff --git a/configs/shared/.xsessionrc.shared b/configs/shared/.xsessionrc.shared
index f0f8355a820d..e22499b2866a 100644
--- a/configs/shared/.xsessionrc.shared
+++ b/configs/shared/.xsessionrc.shared
@@ -26,7 +26,7 @@ tmux new -d -s main
 
 # Start the Emacs server
 # TODO: Consider starting this with `systemctl --user enable emacs.service`
-# emacs --daemon
+emacs --daemon
 
 # Start ssh-agent
 eval "$(ssh-agent -s)"
@@ -43,6 +43,6 @@ unclutter &
 
 # Startup Emacs (and EXWM).
 # TODO: Does this prevent the Emacs server (i.e. `emacs --daemon`) from running?
-# NOTE: wpcarros-emacs is built with `nix-env -iA emacs -f .` from
-# `CWD=~/Dropbox/dotfiles`
-exec dbus-launch --exit-with-session wpcarros-emacs
+# TODO: Do I even want `--exit-with-session`? This makes debugging Emacs more
+# expensive than perhaps it should be.
+exec dbus-launch --exit-with-session emacs