From ee86108d4ebd8dbc25a67e3cde1394bbf124f6d6 Mon Sep 17 00:00:00 2001
From: Lucas Sta Maria <lucas@priime.dev>
Date: Sat, 24 Aug 2024 17:28:06 -0700
Subject: [PATCH] fix(emacs): switch from neotree to treemacs, clean up

---
 .emacs.d/include/misc.el | 23 -----------------------
 .emacs.d/init.el         | 28 +++++++++++++++++-----------
 2 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/.emacs.d/include/misc.el b/.emacs.d/include/misc.el
index bd36107..f5ec284 100644
--- a/.emacs.d/include/misc.el
+++ b/.emacs.d/include/misc.el
@@ -10,7 +10,6 @@
 (require 'eglot)
 (require 'git-gutter)
 (require 'elfeed)
-(require 'neotree)
 (require 'copilot)
 (require 'seq)
 
@@ -217,28 +216,6 @@
 ;; Magit
 (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
 (setq hledger-currency-string "$")
 (add-to-list 'auto-mode-alist '("\\.journal\\'" . hledger-mode))
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 6c22526..6ad64b7 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -71,15 +71,17 @@
   :hook (prog-mode . ws-butler-mode))
 
 ;; Convenience
-(use-package projectile       :straight t)
-(use-package bufler           :straight t
+(use-package projectile :straight t
+  :bind (("C-c p" . 'projectile-command-map))
+  :init
+  (projectile-mode))
+(use-package bufler :straight t
   :bind (("C-x C-b" . bufler-list)
          ("C-x b" . bufler-switch-buffer))
   :init
   (bufler-mode 1))
 (use-package embark :straight t
-  :bind
-  (("C-." . embark-act)))
+  :bind (("C-." . embark-act)))
 (use-package embark-consult   :straight t)
 (use-package wgrep            :straight t)
 (use-package perspective      :straight t
@@ -97,13 +99,17 @@
          ("C-x g" . magit-status)))
 (use-package forge :straight t
   :after (magit))
-(use-package neotree :straight t
-  :custom
-  ((neo-theme 'icons)
-   (neo-smart-open t)
-   (neo-window-fixed-size nil)))
-(use-package all-the-icons  :straight t)
-(use-package git-gutter     :straight t
+(use-package treemacs :straight t
+  :bind (("C-c t" . treemacs)))
+(use-package treemacs-magit :straight t
+  :after (treemacs magit))
+(use-package treemacs-persp :straight t
+  :after (treemacs persp-mode)
+  :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)
   :custom
   (git-gutter:update-interval 1)