mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert Nixified Emacs configuration

Browse source 
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.
This commit is contained in:
William Carroll 2020-01-06 15:01:39 +00:00
parent 069ca63082
commit 6e77fc7978
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configs/shared/.emacs.d/init.el
View file

@ -1,8 +1,4 @@
(require 'wpc-package "~/.emacs.d/wpc/packages/wpc-package.el") (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 ;; load order is intentional
(require 'constants) (require 'constants)
@ -15,7 +11,7 @@
(require 'kaomoji) (require 'kaomoji)
;; Google ;; Google
;; (require 'google-stuff) (require 'google-stuff)
;; Laptop XF-functionality ;; Laptop XF-functionality
(require 'pulse-audio) (require 'pulse-audio)
@ -45,7 +41,7 @@
(require 'wpc-lisp) (require 'wpc-lisp)
(require 'wpc-haskell) (require 'wpc-haskell)
(require 'wpc-reasonml) (require 'wpc-reasonml)
;; (require 'wpc-ocaml) (require 'wpc-ocaml)
(require 'wpc-elixir) (require 'wpc-elixir)
(require 'wpc-nix) (require 'wpc-nix)
(require 'wpc-rust) (require 'wpc-rust)
@ -54,5 +50,3 @@
(require 'wpc-javascript) (require 'wpc-javascript)
(require 'wpc-java) (require 'wpc-java)
(require 'wpc-prolog) (require 'wpc-prolog)
(run-hooks 'after-init-hook)

8
configs/shared/.xsessionrc.shared
View file

@ -26,7 +26,7 @@ tmux new -d -s main
# Start the Emacs server # Start the Emacs server
# TODO: Consider starting this with `systemctl --user enable emacs.service` # TODO: Consider starting this with `systemctl --user enable emacs.service`
# emacs --daemon emacs --daemon
# Start ssh-agent # Start ssh-agent
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
@ -43,6 +43,6 @@ unclutter &
# Startup Emacs (and EXWM). # Startup Emacs (and EXWM).
# TODO: Does this prevent the Emacs server (i.e. `emacs --daemon`) from running? # 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 # TODO: Do I even want `--exit-with-session`? This makes debugging Emacs more
# `CWD=~/Dropbox/dotfiles` # expensive than perhaps it should be.
exec dbus-launch --exit-with-session wpcarros-emacs exec dbus-launch --exit-with-session emacs