From 60fd538a1024212397ccb3ebcfa01c06cef0041d Mon Sep 17 00:00:00 2001 From: William Carroll Date: Mon, 7 Sep 2020 23:28:20 +0100 Subject: [PATCH] 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. --- emacs/.emacs.d/init.el | 3 --- emacs/default.nix | 1 - 2 files changed, 4 deletions(-) diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 35c388f1d..a54ab1835 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 7e4075aff..804cf354f 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