Update Emacs packages

Signed-off-by: Magic_RB <magic_rb@redalder.org>
This commit is contained in:
Magic_RB 2021-07-31 13:19:53 +02:00
parent 4f426e302a
commit 9c4af92771
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
2 changed files with 84 additions and 83 deletions

View file

@ -4,70 +4,71 @@
#+NAME: evil
#+BEGIN_SRC emacs-lisp
(use-package evil
:straight t
:init
(setq evil-want-keybinding nil)
:bind (:map evil-motion-state-map
("h" . nil)
("j" . evil-backward-char)
("k" . evil-previous-line)
("l" . evil-next-line)
("ö" . evil-forward-char)
:map evil-insert-state-map
("<escape>" . nil))
:config
(evil-mode 1)
(with-eval-after-load "treemacs"
(evil-define-key 'treemacs treemacs-mode-map (kbd "h") 'ignore)
(evil-define-key 'treemacs treemacs-mode-map (kbd "j") 'ignore)
(evil-define-key 'treemacs treemacs-mode-map (kbd "k") 'treemacs-previous-line)
(evil-define-key 'treemacs treemacs-mode-map (kbd "l") 'treemacs-next-line)
(evil-define-key 'treemacs treemacs-mode-map (kbd "ö") 'ignore))
;; :q should kill the current buffer rather than quitting emacs entirely
(evil-ex-define-cmd "q" 'kill-this-buffer)
;; Need to type out :quit to close emacs
(evil-ex-define-cmd "quit" 'evil-quit)
;; save and close buffer
(defun liu233w/ex-save-kill-buffer-and-close ()
(interactive)
(save-buffer)
(kill-this-buffer))
(evil-ex-define-cmd "wq" 'liu233w/ex-save-kill-buffer-and-close))
(use-package evil-collection
:straight t
:config
(evil-collection-init 'vterm)
(defun evil-collection-vterm-escape-stay ()
"Go back to normal state but don't move cursor backwards.
Moving cursor backwards is the default vim behavior but
it is not appropriate in some cases like terminals."
(setq-local evil-move-cursor-back nil))
(add-hook 'vterm-mode-hook #'evil-collection-vterm-escape-stay))
(use-package evil-surround
:straight t
:after evil
:config
(global-evil-surround-mode 1))
(use-package key-chord
:straight t
:config
(defun magic_rb/key-chord-define-nonsymmetric (keymap keys command)
(if (/= 2 (length keys))
(error "Key-chord keys must have two elements"))
(let ((key1 (logand 255 (aref keys 0)))
(key2 (logand 255 (aref keys 1))))
(if (eq key1 key2)
(define-key keymap (vector 'key-chord key1 key2) command)
(define-key keymap (vector 'key-chord key1 key2) command)
)))
(setq key-chord-two-keys-delay 0.15)
(key-chord-define evil-insert-state-map "jj" 'evil-normal-state)
(key-chord-mode 1))
(use-package evil
:straight t
:init
(setq evil-want-keybinding nil)
:bind (:map evil-motion-state-map
("h" . nil)
("j" . evil-backward-char)
("k" . evil-previous-visual-line)
("l" . evil-next-visual-line)
("ö" . evil-forward-char)
:map evil-insert-state-map
("<escape>" . nil))
:config
(setq evil-respect-visual-line-mode t)
(evil-mode 1)
(with-eval-after-load "treemacs"
(evil-define-key 'treemacs treemacs-mode-map (kbd "h") 'ignore)
(evil-define-key 'treemacs treemacs-mode-map (kbd "j") 'ignore)
(evil-define-key 'treemacs treemacs-mode-map (kbd "k") 'treemacs-previous-line)
(evil-define-key 'treemacs treemacs-mode-map (kbd "l") 'treemacs-next-line)
(evil-define-key 'treemacs treemacs-mode-map (kbd "ö") 'ignore))
;; :q should kill the current buffer rather than quitting emacs entirely
(evil-ex-define-cmd "q" 'kill-this-buffer)
;; Need to type out :quit to close emacs
(evil-ex-define-cmd "quit" 'evil-quit)
;; save and close buffer
(defun liu233w/ex-save-kill-buffer-and-close ()
(interactive)
(save-buffer)
(kill-this-buffer))
(evil-ex-define-cmd "wq" 'liu233w/ex-save-kill-buffer-and-close))
(use-package evil-collection
:straight t
:config
(evil-collection-init 'vterm)
(defun evil-collection-vterm-escape-stay ()
"Go back to normal state but don't move cursor backwards.
Moving cursor backwards is the default vim behavior but
it is not appropriate in some cases like terminals."
(setq-local evil-move-cursor-back nil))
(add-hook 'vterm-mode-hook #'evil-collection-vterm-escape-stay))
(use-package evil-surround
:straight t
:after evil
:config
(global-evil-surround-mode 1))
(use-package key-chord
:straight t
:config
(defun magic_rb/key-chord-define-nonsymmetric (keymap keys command)
(if (/= 2 (length keys))
(error "Key-chord keys must have two elements"))
(let ((key1 (logand 255 (aref keys 0)))
(key2 (logand 255 (aref keys 1))))
(if (eq key1 key2)
(define-key keymap (vector 'key-chord key1 key2) command)
(define-key keymap (vector 'key-chord key1 key2) command)
)))
(setq key-chord-two-keys-delay 0.15)
(key-chord-define evil-insert-state-map "jj" 'evil-normal-state)
(key-chord-mode 1))
#+END_SRC
** Evil org-mode

View file

@ -1,7 +1,7 @@
(("ESS" . "4fefd0feaae688e28d6a0c36c9eaa219c448903f")
("ace-window" . "c7cb315c14e36fded5ac4096e158497ae974bec9")
("all-the-icons-ivy-rich" . "b20df3e2c901a107441b6246b9d03fa3dc57f47f")
("all-the-icons.el" . "9d97c074b08000eacefc03ebc5dadbdc33888cc2")
("all-the-icons-ivy-rich" . "2a4baba0343d1e4dcabc29e5ccca596fd032ac90")
("all-the-icons.el" . "e01eeb40858f971e45c014726a14c75556d8cc8f")
("annalist.el" . "134fa3f0fb91a636a1c005c483516d4b64905a6d")
("avy" . "e92cb37457b43336b765630dbfbea8ba4be601fa")
("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470")
@ -16,19 +16,18 @@
("elisp" . "8a3b529d5ece261a8847298ea03ed35615cc9bfa")
("emacs-async" . "9a8cd0c3d5c120bfa03187c54dba6e33f6e3ca19")
("emacs-ccls" . "675a5704c14a27931e835a431beea3631d92e8e6")
("emacs-doom-themes" . "b7995ac041f8dadb021cd2445e85d29c9bf718ae")
("emacs-doom-themes" . "65fb964f36939cf412d03b3fe410618caf99c494")
("emacs-hcl-mode" . "e12b1df2ca28d2b06c471cd709c038a2dc0bcdbd")
("emacs-libvterm" . "d9dfa624679afdd5db6ad25429ef86d3dd91401e")
("emacs-sbt-mode" . "e29464a82bf706ef921f4e0052ce04fc74c34c84")
("emacs-scala-mode" . "598cb680f321d9609295aa9b4679040cc703b602")
("emacs-tree-sitter" . "7f5d0938002092ec08830a73f64961021303e1e9")
("emacs-w3m" . "635a71df74d755113f26a6c6d9ae48ccb485393d")
("emacs_chrome" . "1632acab5624637031326bd902e2ad7ccb6b4c90")
("emacsmirror-mirror" . "c5261c7625cd849a8657faf04ec7cb7881a93a37")
("emacsmirror-mirror" . "b0d77288d51b360224c778f310c34b588590ca5e")
("emacsql" . "9dca5996168c4963eb67e61c7f17fdcb8228e314")
("envrc" . "8a9a142cf9d35e62a70d9d100a946f78fe0b066a")
("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
("evil" . "32058519bedc482ad62870a15b68a4be00b75e47")
("evil" . "5c28294d830a5a79e9b9da2c32e7675d52d76720")
("evil-collection" . "8d10ad4ea59752595de37a8ddc44e8d3fb14fe89")
("evil-magit" . "98c076fbeb6d2d7d71e02dc204ba3ad5d577abda")
("evil-org-mode" . "80ef38fb378541937f6ddfe836809e76eda1e355")
@ -48,22 +47,23 @@
("let-alist" . "6708ec0b2e6dff80ff5b64698aa009d9070a2ed2")
("lsp-haskell" . "eb37ac4a6a43277263bbb17aed6a862a0992ae8e")
("lsp-metals" . "9f82ebee48d32cd7bbc3e64b84d1ef5b0926195b")
("lsp-mode" . "ac3b7e6efd1f8d4bb92aa4d89fc361fce3208c46")
("lsp-mode" . "f996db04e1159299c4fce2cbf3dc0cfa0e3966c4")
("lsp-origami" . "bedea3d25552d6969e917a15a0acc3d333ddc742")
("lsp-pyright" . "9a0637e59d2a08a66c49fe8cda708e995ec156ed")
("lsp-treemacs" . "905cc74726438cf06d8ad7cabb2efae75aeb2359")
("lsp-ui" . "4283414de69312298d51b03e938d95d37d238391")
("magit" . "0f4963b0ec68d96716a3f9aa9346bbe31611763b")
("magit" . "d40336f018c3386796b80f64c56686ea848a730b")
("magit-todos" . "78d24cf419138b543460f40509c8c1a168b52ca0")
("markdown-mode" . "f3c4fd9230252503e3a9f2de6f5d469c4ac270ae")
("melpa" . "3ac69fa433b31d7a1a171e76458c9678f851b44d")
("markdown-mode" . "8158bc8239c531756fbf6602f4b4dea8d52eb4cc")
("melpa" . "f0f88655608fec94c0a218e261cef10436aa8265")
("nix-mode" . "3cca5b6527a69c4701394f424726282a1462ede3")
("openscad" . "cff035686cc9505d114115646e4d98edac307512")
("org" . "604bfd9d755770e12c368c15148780ec723211df")
("openscad" . "bb54b9743aca98017746959e2cf0d9c9e0844110")
("org" . "3ba46cbe4ace6cbc12eec4af1060f41c84367591")
("org-fragtog" . "479e0a1c3610dfe918d89a5f5a92c8aec37f131d")
("org-ol-tree" . "207c748aa5fea8626be619e8c55bdb1c16118c25")
("org-roam" . "d1e3a5d9be085b9177381503d9da823915042b7c")
("org-roam" . "e8b720faad8aaae0e0516b5cfb1a42364d9980a6")
("org-superstar-mode" . "9d64c42e5029910153ec74cb9b5747b074281140")
("org-transclusion" . "8bf2ecc2dffc9d365e0f14d45158f44df587fb12")
("origami.el" . "e558710a975e8511b9386edc81cd6bdd0a5bda74")
("pcre2el" . "0b5b2a2c173aab3fd14aac6cf5e90ad3bf58fa7d")
("pdf-tools" . "5f77dae43eb8f71e52e10ba8cf994883f74c3fb7")
@ -71,7 +71,7 @@
("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
("popper" . "4c51182f5f5dd7a1ffa69fb994ef5ef6f9592686")
("posframe" . "f97c4aff2c2c376ca62276d5597aa108546633a9")
("prescient.el" . "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9")
("prescient.el" . "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e")
("project" . "4072f35d85bf0a1c669329d66633e4819f497c1c")
("projectile" . "da08a9103b5ba3b38ef031a9627a19436eb318b5")
("rjsx-mode" . "b697fe4d92cc84fa99a7bcb476f815935ea0d919")
@ -81,17 +81,17 @@
("spinner" . "34905eae12a236753fa88abc831eff1e41e8576e")
("spray" . "74d9dcfa2e8b38f96a43de9ab0eb13364300cb46")
("straight.el" . "1e27b0590df77a5d478970ca58fd6606971692f5")
("swiper" . "56139df678d9886d0612c0a192cce2cf6f156628")
("swiper" . "20d78ae4fe2b128411f0ddb0aa22ba25aa5d6d3f")
("tablist" . "faab7a035ef2258cc4ea2182f67e3aedab7e2af9")
("terraform-mode" . "e560caaa9d9a11b0868adf6d9dcae5ebb5055730")
("transient" . "769219b5f5757f1373a28e993f36b6a41c778651")
("tree-sitter-langs" . "5d362ce98dcf656d7a55fcad6ae21c0a2caca861")
("treemacs" . "e4a85e3266581b8a8f526dbf4142c26d6e76d294")
("transient" . "efdf91980a6f8bcb151debb877302ead8751ab65")
("tree-sitter-langs" . "a516144aa9b109582e89702e5d76217e8fae907b")
("treemacs" . "ac920b2265ca24c0536dd4502f792f06638a6fdc")
("typescript.el" . "b369d7d2518fa11760ac3908a383405350cd51d2")
("use-package" . "a7422fb8ab1baee19adb2717b5b47b9c3812a84c")
("web-mode" . "8ef47935d638902ba35a557cae5edd6ab6ab1346")
("with-editor" . "5519b6a67ecd66865b4fdd5447425eee900c54f4")
("xref" . "16d655ef944c6e9299698b52731f1014ecff6bff")
("xref" . "270b9b40dd31f4fc55240920d5a709084646a4a7")
("xterm-color" . "1a4012854c69a5cdaeb5a73d2ad705011892fca3")
("yaml-mode" . "3a57058468211f3cb18e71aecc630dcacb87636b")
("yasnippet" . "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6"))