remove ido mode, add undo tree
This commit is contained in:
@@ -7,9 +7,9 @@
|
|||||||
'(custom-enabled-themes '(modus-operandi))
|
'(custom-enabled-themes '(modus-operandi))
|
||||||
'(eglot-code-action-indications '(eldoc-hint))
|
'(eglot-code-action-indications '(eldoc-hint))
|
||||||
'(package-selected-packages
|
'(package-selected-packages
|
||||||
'(cape dumber-jump evil evil-collection exec-path-from-shell fish-mode
|
'(cape dart-mode dumber-jump evil evil-collection exec-path-from-shell
|
||||||
jai-mode magit move-text multiple-cursors yaml-mode
|
fish-mode jai-mode magit move-text multiple-cursors
|
||||||
yasnippet yasnippet-snippets))
|
undo-tree yaml-mode yasnippet yasnippet-snippets))
|
||||||
'(package-vc-selected-packages
|
'(package-vc-selected-packages
|
||||||
'((jai-mode :url "https://github.com/valignatev/jai-mode.git"))))
|
'((jai-mode :url "https://github.com/valignatev/jai-mode.git"))))
|
||||||
(custom-set-faces
|
(custom-set-faces
|
||||||
@@ -17,4 +17,4 @@
|
|||||||
;; If you edit it by hand, you could mess it up, so be careful.
|
;; If you edit it by hand, you could mess it up, so be careful.
|
||||||
;; Your init file should contain only one such instance.
|
;; Your init file should contain only one such instance.
|
||||||
;; If there is more than one, they won't work right.
|
;; If there is more than one, they won't work right.
|
||||||
)
|
'(eglot-inlay-hint-face ((t (:inherit shadow :height 0.8)))))
|
||||||
|
|||||||
27
init.el
27
init.el
@@ -50,7 +50,6 @@
|
|||||||
use-package-enable-imenu-support t)
|
use-package-enable-imenu-support t)
|
||||||
|
|
||||||
(electric-pair-mode 1)
|
(electric-pair-mode 1)
|
||||||
(ido-mode 1)
|
|
||||||
(fido-mode 1)
|
(fido-mode 1)
|
||||||
(global-completion-preview-mode 1)
|
(global-completion-preview-mode 1)
|
||||||
(tab-bar-mode -1)
|
(tab-bar-mode -1)
|
||||||
@@ -84,6 +83,7 @@
|
|||||||
(evil-want-C-u-scroll t)
|
(evil-want-C-u-scroll t)
|
||||||
(evil-want-Y-yank-to-eol t)
|
(evil-want-Y-yank-to-eol t)
|
||||||
(evil-move-beyond-eol t)
|
(evil-move-beyond-eol t)
|
||||||
|
(evil-undo-system 'undo-tree)
|
||||||
:ensure t
|
:ensure t
|
||||||
:init
|
:init
|
||||||
(setq evil-want-integration t) ;; This is optional since it's already set to t by default.
|
(setq evil-want-integration t) ;; This is optional since it's already set to t by default.
|
||||||
@@ -98,7 +98,8 @@
|
|||||||
(evil-global-set-key 'motion (kbd "<leader>h") #'help-command)
|
(evil-global-set-key 'motion (kbd "<leader>h") #'help-command)
|
||||||
|
|
||||||
(evil-global-set-key 'motion (kbd "<leader>w") evil-window-map)
|
(evil-global-set-key 'motion (kbd "<leader>w") evil-window-map)
|
||||||
(evil-global-set-key 'motion (kbd "<leader>p") project-prefix-map))
|
(evil-global-set-key 'motion (kbd "<leader>p") project-prefix-map)
|
||||||
|
(evil-global-set-key 'visual (kbd "TAB") #'indent-region))
|
||||||
|
|
||||||
(use-package evil-collection
|
(use-package evil-collection
|
||||||
:after evil
|
:after evil
|
||||||
@@ -123,7 +124,10 @@
|
|||||||
:rev :newest))
|
:rev :newest))
|
||||||
|
|
||||||
(use-package magit
|
(use-package magit
|
||||||
:bind ("C-x g" . magit-status))
|
:bind ("C-x g" . magit-status)
|
||||||
|
:config
|
||||||
|
(when (require 'evil nil 'noerror)
|
||||||
|
(evil-global-set-key 'normal (kbd "<leader>gg") #'magit-status)))
|
||||||
|
|
||||||
(use-package multiple-cursors
|
(use-package multiple-cursors
|
||||||
:custom
|
:custom
|
||||||
@@ -167,9 +171,12 @@
|
|||||||
dumber-jump-find-rules))
|
dumber-jump-find-rules))
|
||||||
|
|
||||||
(use-package eglot
|
(use-package eglot
|
||||||
:hook (jai-mode . eglot-ensure)
|
:custom
|
||||||
|
(eglot-code-action-indicator "*")
|
||||||
|
:hook ((jai-mode . eglot-ensure)
|
||||||
|
(dart-mode . eglot-ensure))
|
||||||
:config
|
:config
|
||||||
(push '(jai-mode "jails" "-jai_path" (concat (getenv "HOME") "/.local/jai/") eglot-server-programs))
|
(push `(jai-mode "jails" "-jai_path" ,(concat (getenv "HOME") "/.local/jai/")) eglot-server-programs)
|
||||||
(push '(sql-mode "postgres-language-server" "lsp-proxy") eglot-server-programs))
|
(push '(sql-mode "postgres-language-server" "lsp-proxy") eglot-server-programs))
|
||||||
|
|
||||||
(use-package yaml-mode)
|
(use-package yaml-mode)
|
||||||
@@ -178,6 +185,14 @@
|
|||||||
|
|
||||||
(use-package fish-mode)
|
(use-package fish-mode)
|
||||||
|
|
||||||
(use-package yasnippet)
|
(use-package yasnippet
|
||||||
|
:config
|
||||||
|
(yas-global-mode 1))
|
||||||
|
|
||||||
(use-package yasnippet-snippets)
|
(use-package yasnippet-snippets)
|
||||||
|
|
||||||
|
(use-package undo-tree
|
||||||
|
:config
|
||||||
|
(global-undo-tree-mode 1))
|
||||||
|
|
||||||
|
(use-package dart-mode)
|
||||||
|
|||||||
Reference in New Issue
Block a user