summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emacs/.config/emacs-kj/development.el1
-rw-r--r--emacs/.config/emacs-kj/init.el6
2 files changed, 6 insertions, 1 deletions
diff --git a/emacs/.config/emacs-kj/development.el b/emacs/.config/emacs-kj/development.el
index 891a3fc..994a78a 100644
--- a/emacs/.config/emacs-kj/development.el
+++ b/emacs/.config/emacs-kj/development.el
@@ -7,6 +7,7 @@
;; Only used to get better eglot snippets.
(use-package yasnippet
:config
+ (add-to-list 'yas-snippet-dirs (expand-file-name "yasnippets" user-emacs-directory))
(yas-global-mode))
(use-package rustic
diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el
index 973cecf..8130051 100644
--- a/emacs/.config/emacs-kj/init.el
+++ b/emacs/.config/emacs-kj/init.el
@@ -695,6 +695,7 @@
:bind
(("C-w" . backward-kill-word)
("C-c d" . kill-region)
+ ("C-c m" . smerge-ediff)
("C-c b r" . revert-buffer)
("C-c r l" . consult-flymake)
("C-c r f" . eglot-format)
@@ -733,7 +734,7 @@
("M-h" . ace-mc-add-single-cursor)))
;; Disable VC over tramp.
-(setq-default vc-handled-backends nil)
+;;(setq-default vc-handled-backends nil)
(defun kj/vc-off-if-remote ()
(if (file-remote-p (buffer-file-name))
(setq-local vc-handled-backends nil)))
@@ -919,3 +920,6 @@
;; (setq ispell-local-dictionary "en_US")
;; (add-hook 'text-mode-hook flyspell-mode)
;; (add-hook 'prog-mode-hook flyspell-prog-mode)
+
+;; Enabled commands
+(put 'narrow-to-region 'disabled nil)