about summary refs log tree commit diff
path: root/emacs
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2020-09-07T22·28+0100
committerWilliam Carroll <wpcarro@gmail.com>2020-09-07T22·28+0100
commit60fd538a1024212397ccb3ebcfa01c06cef0041d (patch)
treee30313e6be88aa528beccbdb760a755fad5a0c9d /emacs
parent11015d637460330239ce22bb511266399b6c2569 (diff)
Remove Emacs config for Google languages
My custom language settings conflict with Google-Emacs's language settings, and
I'm not interested in finding a more harmonious solution. For now, I'm dropping
my settings altogether in favor of Google-Emacs's settings.
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/init.el3
-rw-r--r--emacs/default.nix1
2 files changed, 0 insertions, 4 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 35c388f1d00c..a54ab18351ca 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -18,7 +18,4 @@
 (require 'wpc-nix)
 (require 'wpc-rust)
 (require 'wpc-clojure)
-(require 'wpc-python)
-(require 'wpc-javascript)
 (require 'wpc-prolog)
-(require 'wpc-golang)
diff --git a/emacs/default.nix b/emacs/default.nix
index 7e4075aff61f..804cf354f505 100644
--- a/emacs/default.nix
+++ b/emacs/default.nix
@@ -49,7 +49,6 @@ let
       password-store
       ivy-pass
       clipmon # TODO: Prefer an Emacs client for clipmenud.
-      protobuf-mode # TODO: Determine if this is coming from google-emacs.
       evil
       evil-collection
       evil-magit