summaryrefslogtreecommitdiff
path: root/emacs/init.el
diff options
context:
space:
mode:
Diffstat (limited to 'emacs/init.el')
-rw-r--r--emacs/init.el52
1 files changed, 3 insertions, 49 deletions
diff --git a/emacs/init.el b/emacs/init.el
index ffcbd00..27eef38 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -492,54 +492,6 @@ With ARG, don't save the current layout."
(use-package battery ; battery in modeline etc
)
-(progn ; viper, ancient vi emulation
- (setq-default viper-want-ctl-h-help t
- viper-inhibit-startup-message 't
- viper-expert-level 5
- viper-is-in-minibuffer nil
- viper-vi-style-in-minibuffer nil
- viper-enable-minibuffer-faces nil
- viper-syntax-preference 'emacs
- viper-ex-style-motion nil
- viper-auto-indent t
- viper-buffer-search-char ?g
- viper-insert-state-mode-list nil
- viper-vi-state-mode-list nil
- viper-emacs-state-mode-list nil
- viper-major-mode-modifier-list nil
- viper-mode nil)
- (require 'viper)
- (require 'viper-ex)
- (advice-add 'viper-this-major-mode-requires-vi-state :override
- ;; when viper, always, otherwise never
- (lambda (&rest r) viper-mode))
- (advice-add 'viper-toggle-key-action :around
- (lambda (func &optional arg)
- (interactive "P")
- (if arg
- (progn (toggle-viper-mode) (force-window-update))
- (and viper-mode (call-interactively func)))))
- (define-key my/keys-mode-map (kbd "C-;") 'viper-ex)
- (define-key my/keys-mode-map (kbd "C-z") 'viper-toggle-key-action)
- (advice-add 'viper-ex :around 'my/display-lines-advice)
- (define-key viper-vi-global-user-map (kbd "C-y") 'yank)
- (define-key viper-vi-global-user-map (kbd "C-e") 'end-of-line)
- (define-key viper-vi-global-user-map (kbd "C-f") 'forward-char)
- (define-key viper-vi-global-user-map (kbd "C-b") 'backward-char)
- (define-key viper-vi-global-user-map (kbd "C-u") 'universal-argument)
- (define-key viper-insert-global-user-map (kbd "C-u") 'universal-argument)
- (define-key viper-insert-global-user-map (kbd "C-d") 'delete-char)
- ;; TODO this is still somehow broken, I get the completion and the newline
- ;; (define-key viper-insert-global-user-map (kbd "RET")
- ;; #'(lambda ()
- ;; (interactive)
- ;; (if completion-in-region-mode
- ;; (corfu-insert)
- ;; (viper-autoindent))))
- )
-
-
-
(progn ; indent code when pasting
(require 'dash)
(defvar yank-indent-modes '(prog-mode LaTeX-mode TeX-mode)
@@ -978,7 +930,7 @@ With ARG, don't save the current layout."
:config
(minions-mode 1)
:custom
- (minions-prominent-modes '(persp-mode auto-fill-mode eldoc-mode eglot-mode lsp-mode)))
+ (minions-prominent-modes '(my/temp-nonmodal-mode persp-mode auto-fill-mode eldoc-mode eglot-mode lsp-mode)))
(use-package ispell ; spellchecker
:demand t
@@ -992,6 +944,8 @@ With ARG, don't save the current layout."
(advice-add 'ispell-mode :before 'debug)
(setq-default text-mode-hook (cons 'ispell-minor-mode (remove 'ispell-mode text-mode-hook))))
+(load-file "/home/tmu/.emacs.d/site-lisp/my-modal.el")
+
;;; Optional files for occasional loading:
;; if you want exwm, include from ~/.emacs.d/site-lisp/my-exwm.el