moving evil and general behind their own sections

This commit is contained in:
Chris Cochrun 2023-10-21 16:51:36 -05:00
parent 6638ccfc18
commit 8701afbf55
2 changed files with 54 additions and 50 deletions

46
init.el
View file

@ -231,6 +231,18 @@
:after evil
:config (evil-collection-init))
(use-package evil-escape
:after evil
:init (evil-escape-mode +1)
:config
(setq evil-escape-key-sequence (kbd "fd")
evil-escape-delay 0.3))
(use-package evil-surround
:after evil
:config
(global-evil-surround-mode +1))
(use-package general
:init
(general-evil-setup)
@ -344,18 +356,6 @@
"TAB" 'indent-according-to-mode
"C-<tab>" 'indent-for-tab-command))
(use-package evil-escape
:after evil
:init (evil-escape-mode +1)
:config
(setq evil-escape-key-sequence (kbd "fd")
evil-escape-delay 0.3))
(use-package evil-surround
:after evil
:config
(global-evil-surround-mode +1))
(setq lpr-command "lpr -o sides=two-sided-long-edge -# ")
(defun chris/org-mode-setup ()
(interactive)
@ -2224,14 +2224,14 @@ targets."
:general
(general-def 'normal rustic-mode-map
"!" 'rustic-run-shell-command
"gC" 'rustic-cargo-check
"gC" 'rustic-cargo-clippy
"gA" 'rustic-cargo-add
"gt" 'rustic-cargo-test)
(chris/leader-keys
:states 'normal
:keymaps 'override
"gc" 'rustic-compile))
:keymaps 'rustic-mode
"gc" 'rustic-compile
"gr" 'rustic-cargo-run-rerun))
(use-package slint-mode
:mode "\\.slint\\'")
@ -2477,7 +2477,7 @@ targets."
(use-package ledger-mode)
(use-package mu4e
;; :load-path "~/.guix-home/profile/share/emacs/site-lisp/mu4e/"
:load-path "~/.guix-home/profile/share/emacs/site-lisp/mu4e/"
:init
(setq mu4e-maildir "~/mail"
@ -2842,8 +2842,8 @@ targets."
("ksb" "/home/chris/dev/kde/src/kdesrc-build/kdesrc-build")
("ws" "rsync -avzP public/ chris@staff.tfcconnection.org:tfcconnection")
("wttr" "curl wttr.in/@home.cochrun.xyz")
("gh" "guix home -L ~/dotfiles/guix reconfigure /home/chris/dotfiles/guix/home.scm")
("gs" ,(concat "sudo guix system -L ~/dotfiles/guix reconfigure /home/chris/dotfiles/guix/" (system-name) ".scm"))))
("gh" "guix home -L ~/.dotfiles/guix reconfigure /home/chris/.dotfiles/guix/home.scm")
("gs" ,(concat "sudo guix system -L ~/.dotfiles/guix reconfigure /home/chris/.dotfiles/guix/" (system-name) ".scm"))))
(defun chris/eshell-new()
"Open a new eshell buffer"
@ -2868,8 +2868,6 @@ targets."
(other-window 1)
(delete-window)))
(add-hook 'eshell-load-hook #'eat-eshell-mode)
:general
(chris/leader-keys
:states 'normal
@ -2901,8 +2899,9 @@ targets."
:general
(chris/leader-keys
:states 'normal
:keymaps 'lisp-mode-shared-map
"os" 'sly)
:keymaps 'override
"os" 'sly
"gc" 'compile)
(general-def 'normal lisp-mode-shared-map
"gcr" 'sly))
@ -2949,7 +2948,8 @@ targets."
:config
(setq empv-invidious-instance "https://vid.puffyan.us/api/v1"
empv-video-file-extensions '("mkv" "mp4" "avi" "mov" "webm")
empv-mpv-args '("--no-terminal" "--idle" "--input-ipc-server=/tmp/empv-socket"))
empv-mpv-args '("--no-terminal" "--idle" "--input-ipc-server=/tmp/empv-socket")
empv-video-dir "~/vids")
(empv-embark-initialize-extra-actions)
(general-auto-unbind-keys)
(add-hook 'empv-resultes-mode-hook #'evil-normal-state)