summary refs log tree commit diff stats
path: root/user
diff options
context:
space:
mode:
authorAlan Pearce2023-03-26 20:20:37 +0200
committerAlan Pearce2023-03-26 20:22:08 +0200
commit36f21cda40d2e4718c50fb2652001d1eefaa9c8c (patch)
tree4c0ba95fd7d50c33b6aa9f6c35dbf270b19c909f /user
parent8cdf1921592825b20e7f4bb005b418963356e135 (diff)
downloadnixfiles-36f21cda40d2e4718c50fb2652001d1eefaa9c8c.tar.lz
nixfiles-36f21cda40d2e4718c50fb2652001d1eefaa9c8c.tar.zst
nixfiles-36f21cda40d2e4718c50fb2652001d1eefaa9c8c.zip
emacs: remove some useless code
magit-define-global-key-bindings is t by default

editorconfig will always be available assuming I'm running emacs from nix/home-manager
Diffstat (limited to 'user')
-rw-r--r--user/emacs/early-init.el7
-rw-r--r--user/emacs/init.el7
2 files changed, 4 insertions, 10 deletions
diff --git a/user/emacs/early-init.el b/user/emacs/early-init.el
index e6ede93d..f2212c69 100644
--- a/user/emacs/early-init.el
+++ b/user/emacs/early-init.el
@@ -1,8 +1,9 @@
+(defvar package-quickstart t)
 (setq inhibit-startup-screen t
       initial-scratch-message ""
       initial-major-mode 'fundamental-mode
-      package-quickstart t
-      frame-inhibit-implied-resize t)
+      frame-inhibit-implied-resize t
+      byte-compile-warnings '(not free-vars unresolved noruntime lexical make-local cl-functions))
 
 ;; Disable all the bars, unless on macOS, in which case, keep the menu bar.
 (unless (eq window-system 'ns)
@@ -10,5 +11,3 @@
 (scroll-bar-mode -1)
 (tool-bar-mode -1)
 (set-fringe-mode '(4 . 4))
-
-(defvar evil-want-keybinding nil)
diff --git a/user/emacs/init.el b/user/emacs/init.el
index 83182439..353566d1 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -344,7 +344,7 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
                      "C-r" #'winner-redo))
 ;;; Evil
 
-(eval-when-compile
+(eval-and-compile
   (defvar evil-want-keybinding nil))
 (use-package evil
   :demand t
@@ -497,8 +497,6 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
   :defer 5
   :commands (magit-status magit-dispatch)
   :custom (magit-auto-revert-mode nil)
-  :init (progn
-          (setq magit-define-global-key-bindings t))
   :config (progn
             (setq magit-section-visibility-indicator nil
                   magit-diff-refine-hunk 'all
@@ -536,9 +534,6 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
 
 (use-package editorconfig
   :defer 2
-  :init (progn
-          (unless (executable-find "editorconfig")
-            (warn "Missing `editorconfig' executable.")))
   :config (editorconfig-mode +1))
 
 ;;; Completion