add tmux and emacs changes.

1 files changed, 36 insertions, 5 deletions

diff --git a/emacs/init.el b/emacs/init.el
index f4d3348..0b7290e 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -43,8 +43,8 @@
          (display-buffer-reuse-mode-window display-buffer-below-selected))
         ))
 
-;; (setq-default indent-tabs-mode nil)
-(setq-default tab-width 4)
+(setq-default tab-width 4
+              require-final-newline t)
 (setq inhibit-splash-screen t
       inhibit-startup-message t
       scroll-step 3
@@ -60,6 +60,9 @@
       frame-resize-pixelwise t
       mouse-drag-mode-line-buffer 1
       display-time-24hr-format t
+      use-short-answers t
+      read-answer-short 'auto
+      visible-cursor nil ;; no cursor blink in tui
       )
 
 ;; (global-hl-line-mode 1)
@@ -69,15 +72,31 @@
 (add-to-list 'package-archives
              '("melpa" . "https://melpa.org/packages/") t)
 
+(use-package icomplete
+  :ensure nil
+  :config
+  (setq completion-auto-select t
+        completions-sort 'historical
+        completions-max-height 20
+        completions-format 'one-column
+        completion-ignore-case t)
+  (fido-vertical-mode))
+
+(use-package ediff
+  :ensure nil
+  :config
+  (setq ediff-window-setup-function 'ediff-setup-windows-plain)
+  (setq ediff-split-window-function 'split-window-horizontally))
+
 (use-package compile
-  :ensure t
+  :ensure nil
   :config
   ;; pascal compilation errors
   (add-to-list 'compilation-error-regexp-alist
                '("^\\(.*\\)(\\([0-9]+\\)+\\,\\([0-9]+\\)).*" 1 2 3)))
 
 (use-package modus-themes
-  :ensure t
+  :ensure nil
   :config
   (setq modus-themes-org-blocks 'gray-background))
 
@@ -127,9 +146,18 @@
 (use-package vertico
   :ensure t
   :init
-  (vertico-mode 1)
+  ;; (vertico-mode 1)
   (setq vertico-cycle t))
 
+(use-package completion-preview
+  :ensure nil
+  :bind
+  (:map completion-preview-active-mode-map
+        ("M-n" . completion-preview-next-candidate)
+        ("M-p" . completion-preview-prev-candidate))
+  :hook
+  (emacs-lisp-mode . (lambda () (completion-preview-mode))))
+
 (use-package orderless
   :ensure t
   :custom
@@ -392,6 +420,7 @@
    '("e" . meow-next)
    '(";" . meow-temp-normal)
    '("/" . meow-visit)
+   '("v" . meow-search)
    '("<escape>" . ignore))
   (meow-leader-define-key
    '("?" . meow-cheatsheet)
@@ -481,6 +510,8 @@
   :config
   (add-to-list 'meow-mode-state-list '(notmuch-hello-mode . motion))
   (add-to-list 'meow-mode-state-list '(notmuch-search-mode . motion))
+  (add-to-list 'meow-mode-state-list '(godoc-mode . normal))
+  (add-to-list 'meow-mode-state-list '(ediff-mode . insert))
   (setq meow-use-clipboard t)
   (setq meow-keypad-self-insert-undefined nil)
   (jrk/meow-setup-colemakdh)