fix(emacs): switch from neotree to treemacs, clean up
This commit is contained in:
parent
4472e81c02
commit
ee86108d4e
2 changed files with 17 additions and 34 deletions
|
@ -10,7 +10,6 @@
|
||||||
(require 'eglot)
|
(require 'eglot)
|
||||||
(require 'git-gutter)
|
(require 'git-gutter)
|
||||||
(require 'elfeed)
|
(require 'elfeed)
|
||||||
(require 'neotree)
|
|
||||||
(require 'copilot)
|
(require 'copilot)
|
||||||
(require 'seq)
|
(require 'seq)
|
||||||
|
|
||||||
|
@ -217,28 +216,6 @@
|
||||||
;; Magit
|
;; Magit
|
||||||
(setq auth-sources '("~/.authinfo"))
|
(setq auth-sources '("~/.authinfo"))
|
||||||
|
|
||||||
;; Projectile
|
|
||||||
(projectile-mode +1)
|
|
||||||
(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
|
|
||||||
|
|
||||||
;; Neotree
|
|
||||||
(defun neotree-toggle-current-directory ()
|
|
||||||
"Toggle neotree at the current directory."
|
|
||||||
(interactive)
|
|
||||||
(let ((current-directory
|
|
||||||
(or (and buffer-file-name (file-name-directory buffer-file-name))
|
|
||||||
(and (eq major-mode 'dired-mode) (dired-current-directory))
|
|
||||||
(and (eq major-mode 'magit-status-mode) (magit-toplevel))
|
|
||||||
"~")))
|
|
||||||
(if (and (fboundp 'neo-global--window-exists-p)
|
|
||||||
(neo-global--window-exists-p))
|
|
||||||
(neotree-hide)
|
|
||||||
(neotree-dir current-directory))))
|
|
||||||
|
|
||||||
(keymap-global-set "C-c t" #'neotree-toggle-current-directory)
|
|
||||||
(add-hook 'neotree-mode-hook (lambda () (text-scale-set -0.5)))
|
|
||||||
;(add-hook 'neotree-mode-hook (lambda () (buffer-face-set :background "#ffffff")))
|
|
||||||
|
|
||||||
;; hledger
|
;; hledger
|
||||||
(setq hledger-currency-string "$")
|
(setq hledger-currency-string "$")
|
||||||
(add-to-list 'auto-mode-alist '("\\.journal\\'" . hledger-mode))
|
(add-to-list 'auto-mode-alist '("\\.journal\\'" . hledger-mode))
|
||||||
|
|
|
@ -71,15 +71,17 @@
|
||||||
:hook (prog-mode . ws-butler-mode))
|
:hook (prog-mode . ws-butler-mode))
|
||||||
|
|
||||||
;; Convenience
|
;; Convenience
|
||||||
(use-package projectile :straight t)
|
(use-package projectile :straight t
|
||||||
(use-package bufler :straight t
|
:bind (("C-c p" . 'projectile-command-map))
|
||||||
|
:init
|
||||||
|
(projectile-mode))
|
||||||
|
(use-package bufler :straight t
|
||||||
:bind (("C-x C-b" . bufler-list)
|
:bind (("C-x C-b" . bufler-list)
|
||||||
("C-x b" . bufler-switch-buffer))
|
("C-x b" . bufler-switch-buffer))
|
||||||
:init
|
:init
|
||||||
(bufler-mode 1))
|
(bufler-mode 1))
|
||||||
(use-package embark :straight t
|
(use-package embark :straight t
|
||||||
:bind
|
:bind (("C-." . embark-act)))
|
||||||
(("C-." . embark-act)))
|
|
||||||
(use-package embark-consult :straight t)
|
(use-package embark-consult :straight t)
|
||||||
(use-package wgrep :straight t)
|
(use-package wgrep :straight t)
|
||||||
(use-package perspective :straight t
|
(use-package perspective :straight t
|
||||||
|
@ -97,13 +99,17 @@
|
||||||
("C-x g" . magit-status)))
|
("C-x g" . magit-status)))
|
||||||
(use-package forge :straight t
|
(use-package forge :straight t
|
||||||
:after (magit))
|
:after (magit))
|
||||||
(use-package neotree :straight t
|
(use-package treemacs :straight t
|
||||||
:custom
|
:bind (("C-c t" . treemacs)))
|
||||||
((neo-theme 'icons)
|
(use-package treemacs-magit :straight t
|
||||||
(neo-smart-open t)
|
:after (treemacs magit))
|
||||||
(neo-window-fixed-size nil)))
|
(use-package treemacs-persp :straight t
|
||||||
(use-package all-the-icons :straight t)
|
:after (treemacs persp-mode)
|
||||||
(use-package git-gutter :straight t
|
:config (treemacs-set-scope-type 'Perspectives))
|
||||||
|
(use-package treemacs-projectile :straight t
|
||||||
|
:after (treemacs projectile-mode))
|
||||||
|
(use-package all-the-icons :straight t)
|
||||||
|
(use-package git-gutter :straight t
|
||||||
:hook (prog-mode . git-gutter-mode)
|
:hook (prog-mode . git-gutter-mode)
|
||||||
:custom
|
:custom
|
||||||
(git-gutter:update-interval 1)
|
(git-gutter:update-interval 1)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue