From cde7e0a32d5c3f85571f84055f5ba82524a03af1 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Mon, 27 Jul 2020 11:56:30 +1000 Subject: [PATCH 1/2] Change the escape-Insert-mode sequence from jk to my preferred jj --- config/doom/config.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/doom/config.el b/config/doom/config.el index ea36c04..c1bd9d0 100644 --- a/config/doom/config.el +++ b/config/doom/config.el @@ -36,6 +36,11 @@ ;; numbers are disabled. For relative line numbers, set this to `relative'. (setq display-line-numbers-type t) +;; Doom comes with evil-escape support for leaving Insert mode with a simple key +;; sequence, but it defaults that sequence to jk. I prefer jj, so let's change +;; it here. +(setq evil-escape-key-sequence "jj") + ;; Here are some additional functions/macros that could help you configure Doom: ;; From 7bb49a6484ad2d27ef7ce37b9393f79fb9665c45 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Mon, 27 Jul 2020 12:00:03 +1000 Subject: [PATCH 2/2] Switch from ~/.emacs.d to XDG_CONFIG_HOME/emacs (yay) --- .gitmodules | 2 +- .stow-rename | 1 - emacs.d => config/emacs | 0 config/zsh/login/emacs | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) rename emacs.d => config/emacs (100%) diff --git a/.gitmodules b/.gitmodules index a82e85e..087da60 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "emacs.d"] - path = emacs.d + path = config/emacs url = https://github.com/hlissner/doom-emacs diff --git a/.stow-rename b/.stow-rename index 37a3c9f..4376d30 100644 --- a/.stow-rename +++ b/.stow-rename @@ -1,2 +1 @@ config => .config -emacs.d => .emacs.d diff --git a/emacs.d b/config/emacs similarity index 100% rename from emacs.d rename to config/emacs diff --git a/config/zsh/login/emacs b/config/zsh/login/emacs index 8e07619..5c144ed 100644 --- a/config/zsh/login/emacs +++ b/config/zsh/login/emacs @@ -1,2 +1,2 @@ #! zsh -path+=(~/.emacs.d/bin) +path+=(~/.config/emacs/bin)