chris/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moving evil and general behind their own sections

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

58
README.org
View file

@ -473,6 +473,9 @@ Here let's try to add ligatures to our font system since the VictorMono Nerd Fon
:ID: 20230626T163736.174293 :ID: 20230626T163736.174293
:END: :END:
There are two major packages we need to get the functionality I desire. Evil and general. There are two major packages we need to get the functionality I desire. Evil and general.
*** Evil
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package evil (use-package evil
:init :init
@ -500,6 +503,23 @@ This evil-collection package includes a lot of other evil based things.
:config (evil-collection-init)) :config (evil-collection-init))
#+end_src #+end_src
#+begin_src emacs-lisp
(use-package evil-escape
:after evil
:init (evil-escape-mode +1)
:config
(setq evil-escape-key-sequence (kbd "fd")
evil-escape-delay 0.3))
#+end_src
#+begin_src emacs-lisp
(use-package evil-surround
:after evil
:config
(global-evil-surround-mode +1))
#+end_src
*** General
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package general (use-package general
:init :init
@ -615,22 +635,6 @@ This evil-collection package includes a lot of other evil based things.
"C-<tab>" 'indent-for-tab-command)) "C-<tab>" 'indent-for-tab-command))
#+end_src #+end_src
#+begin_src emacs-lisp
(use-package evil-escape
:after evil
:init (evil-escape-mode +1)
:config
(setq evil-escape-key-sequence (kbd "fd")
evil-escape-delay 0.3))
#+end_src
#+begin_src emacs-lisp
(use-package evil-surround
:after evil
:config
(global-evil-surround-mode +1))
#+end_src
** Org Mode ** Org Mode
Org-Mode needs to be loaded pretty high in the file so that we are ensuring things get picked up in the correct order. This has been a problem for me in the past so I prefer it right after setting some keybindings and then much later loading things like =roam= =super-agenda= and others. Org-Mode needs to be loaded pretty high in the file so that we are ensuring things get picked up in the correct order. This has been a problem for me in the past so I prefer it right after setting some keybindings and then much later loading things like =roam= =super-agenda= and others.
@ -2964,14 +2968,14 @@ I'd like to start learning and using rust if I can.
:general :general
(general-def 'normal rustic-mode-map (general-def 'normal rustic-mode-map
"!" 'rustic-run-shell-command "!" 'rustic-run-shell-command
"gC" 'rustic-cargo-check
"gC" 'rustic-cargo-clippy "gC" 'rustic-cargo-clippy
"gA" 'rustic-cargo-add "gA" 'rustic-cargo-add
"gt" 'rustic-cargo-test) "gt" 'rustic-cargo-test)
(chris/leader-keys (chris/leader-keys
:states 'normal :states 'normal
:keymaps 'override :keymaps 'rustic-mode
"gc" 'rustic-compile)) "gc" 'rustic-compile
"gr" 'rustic-cargo-run-rerun))
#+end_src #+end_src
#+begin_src emacs-lisp #+begin_src emacs-lisp
@ -3476,7 +3480,7 @@ Ledger mode
:END: :END:
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package mu4e (use-package mu4e
;; :load-path "~/.guix-home/profile/share/emacs/site-lisp/mu4e/" :load-path "~/.guix-home/profile/share/emacs/site-lisp/mu4e/"
:init :init
(setq mu4e-maildir "~/mail" (setq mu4e-maildir "~/mail"
@ -3899,8 +3903,8 @@ Let's add our own eshell prompt. and set the password cache to a significantly h
("ksb" "/home/chris/dev/kde/src/kdesrc-build/kdesrc-build") ("ksb" "/home/chris/dev/kde/src/kdesrc-build/kdesrc-build")
("ws" "rsync -avzP public/ chris@staff.tfcconnection.org:tfcconnection") ("ws" "rsync -avzP public/ chris@staff.tfcconnection.org:tfcconnection")
("wttr" "curl wttr.in/@home.cochrun.xyz") ("wttr" "curl wttr.in/@home.cochrun.xyz")
("gh" "guix home -L ~/dotfiles/guix reconfigure /home/chris/dotfiles/guix/home.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")))) ("gs" ,(concat "sudo guix system -L ~/.dotfiles/guix reconfigure /home/chris/.dotfiles/guix/" (system-name) ".scm"))))
(defun chris/eshell-new() (defun chris/eshell-new()
"Open a new eshell buffer" "Open a new eshell buffer"
@ -3925,8 +3929,6 @@ Let's add our own eshell prompt. and set the password cache to a significantly h
(other-window 1) (other-window 1)
(delete-window))) (delete-window)))
(add-hook 'eshell-load-hook #'eat-eshell-mode)
:general :general
(chris/leader-keys (chris/leader-keys
:states 'normal :states 'normal
@ -3976,8 +3978,9 @@ Using sly makes a lot better common-lisp interaction within emacs.
:general :general
(chris/leader-keys (chris/leader-keys
:states 'normal :states 'normal
:keymaps 'lisp-mode-shared-map :keymaps 'override
"os" 'sly) "os" 'sly
"gc" 'compile)
(general-def 'normal lisp-mode-shared-map (general-def 'normal lisp-mode-shared-map
"gcr" 'sly)) "gcr" 'sly))
@ -4051,7 +4054,8 @@ With empv we can perhaps control mpv much more fine grainly and even search yout
:config :config
(setq empv-invidious-instance "https://vid.puffyan.us/api/v1" (setq empv-invidious-instance "https://vid.puffyan.us/api/v1"
empv-video-file-extensions '("mkv" "mp4" "avi" "mov" "webm") 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) (empv-embark-initialize-extra-actions)
(general-auto-unbind-keys) (general-auto-unbind-keys)
(add-hook 'empv-resultes-mode-hook #'evil-normal-state) (add-hook 'empv-resultes-mode-hook #'evil-normal-state)

46
init.el
View file

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