Fix broken C-u and C-r
package load order
This commit is contained in:
parent
ff200f4561
commit
2162c12271
42
init.el
42
init.el
|
@ -92,26 +92,6 @@
|
||||||
:config
|
:config
|
||||||
(add-hook 'prog-mode-hook #'ws-butler-mode))
|
(add-hook 'prog-mode-hook #'ws-butler-mode))
|
||||||
|
|
||||||
;; Project
|
|
||||||
(use-package projectile
|
|
||||||
:config
|
|
||||||
(define-key prog-mode-map (kbd "C-c p") 'projectile-command-map)
|
|
||||||
(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
|
|
||||||
(projectile-mode +1))
|
|
||||||
|
|
||||||
;; File tree (+ related integrations)
|
|
||||||
(use-package treemacs
|
|
||||||
:init
|
|
||||||
(setq treemacs-tag-follow-delay 0.5)
|
|
||||||
:config
|
|
||||||
(treemacs-resize-icons 15)
|
|
||||||
(treemacs-follow-mode +1)
|
|
||||||
(treemacs-tag-follow-mode +1)
|
|
||||||
(treemacs-project-follow-mode +1))
|
|
||||||
(use-package treemacs-evil)
|
|
||||||
(use-package treemacs-projectile)
|
|
||||||
(use-package treemacs-magit)
|
|
||||||
|
|
||||||
;; Code folding
|
;; Code folding
|
||||||
(use-package ts-fold
|
(use-package ts-fold
|
||||||
:straight (ts-fold :type git :host github :repo "emacs-tree-sitter/ts-fold"))
|
:straight (ts-fold :type git :host github :repo "emacs-tree-sitter/ts-fold"))
|
||||||
|
@ -139,8 +119,6 @@
|
||||||
evil-default-state 'emacs
|
evil-default-state 'emacs
|
||||||
evil-undo-system 'undo-redo)
|
evil-undo-system 'undo-redo)
|
||||||
:config
|
:config
|
||||||
(define-key evil-normal-state-map (kbd "C-u") 'evil-scroll-up)
|
|
||||||
(define-key evil-visual-state-map (kbd "C-u") 'evil-scroll-up)
|
|
||||||
(evil-set-initial-state 'prog-mode 'normal)
|
(evil-set-initial-state 'prog-mode 'normal)
|
||||||
(evil-mode +1))
|
(evil-mode +1))
|
||||||
|
|
||||||
|
@ -184,6 +162,26 @@
|
||||||
:config
|
:config
|
||||||
(evil-goggles-mode +1))
|
(evil-goggles-mode +1))
|
||||||
|
|
||||||
|
;; Project
|
||||||
|
(use-package projectile
|
||||||
|
:config
|
||||||
|
(define-key prog-mode-map (kbd "C-c p") 'projectile-command-map)
|
||||||
|
(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
|
||||||
|
(projectile-mode +1))
|
||||||
|
|
||||||
|
;; File tree (+ related integrations)
|
||||||
|
(use-package treemacs
|
||||||
|
:init
|
||||||
|
(setq treemacs-tag-follow-delay 0.5)
|
||||||
|
:config
|
||||||
|
(treemacs-resize-icons 15)
|
||||||
|
(treemacs-follow-mode +1)
|
||||||
|
(treemacs-tag-follow-mode +1)
|
||||||
|
(treemacs-project-follow-mode +1))
|
||||||
|
(use-package treemacs-evil)
|
||||||
|
(use-package treemacs-projectile)
|
||||||
|
(use-package treemacs-magit)
|
||||||
|
|
||||||
;; Explanations for keybindings
|
;; Explanations for keybindings
|
||||||
(use-package which-key
|
(use-package which-key
|
||||||
:config
|
:config
|
||||||
|
|
Loading…
Reference in a new issue