diff --git a/init.el b/init.el index 8c62785..73b6efa 100644 --- a/init.el +++ b/init.el @@ -92,26 +92,6 @@ :config (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 (use-package ts-fold :straight (ts-fold :type git :host github :repo "emacs-tree-sitter/ts-fold")) @@ -139,8 +119,6 @@ evil-default-state 'emacs evil-undo-system 'undo-redo) :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-mode +1)) @@ -184,6 +162,26 @@ :config (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 (use-package which-key :config