2 files changed, 47 insertions, 9 deletions
diff --git a/README.org b/README.org
index 26e02fb..cf91620 100644
--- a/README.org
+++ b/README.org
@@ -126,14 +126,21 @@ These settings ensure that block highlights aren't visible when collapsed.
 ** Projectile
 #+begin_src elisp
   (use-package projectile
-    :config (projectile-mode)
     :bind-keymap
-    ("C-c p" . projectile-command-map))
-#+end_src
-*** Counsel-Projectile
-#+begin_src elisp
+    ("C-c p" . projectile-command-map)
+    :config
+    ;; (setq counsel-projectile-switch-project-action #'dired)
+    (setq projectile-switch-project-action #'magit-status)
+    :init
+    (projectile-mode +1))
+
   (use-package counsel-projectile
-    :config (counsel-projectile-mode))
+    :after (projectile counsel)
+    :hook
+    (projectile-after-switch-project .
+      treemacs-add-and-display-current-project-exclusively)
+    :config
+    (counsel-projectile-mode))
 #+end_src
 ** Direnv
 #+begin_src elisp
@@ -141,6 +148,18 @@ These settings ensure that block highlights aren't visible when collapsed.
     :config
     (direnv-mode))
 #+end_src
+** Treemacs
+#+begin_src elisp
+  (use-package treemacs
+    :bind (("C-c t" . treemacs)))
+
+  (use-package treemacs-projectile
+    :after (treemacs projectile)
+    :ensure t)
+
+  (use-package lsp-treemacs
+    :after lsp)
+#+end_src
 * Version Control
 ** Magit
 #+begin_src lisp
diff --git a/init.el b/init.el
index 40f3e16..9eb7311 100644
--- a/init.el
+++ b/init.el
@@ -78,17 +78,36 @@
 (setq org-startup-indented t)
 
 (use-package projectile
-  :config (projectile-mode)
   :bind-keymap
-  ("C-c p" . projectile-command-map))
+  ("C-c p" . projectile-command-map)
+  :config
+  ;; (setq counsel-projectile-switch-project-action #'dired)
+  (setq projectile-switch-project-action #'magit-status)
+  :init
+  (projectile-mode +1))
 
 (use-package counsel-projectile
-  :config (counsel-projectile-mode))
+  :after (projectile counsel)
+  :hook
+  (projectile-after-switch-project .
+    treemacs-add-and-display-current-project-exclusively)
+  :config
+  (counsel-projectile-mode))
 
 (use-package direnv
   :config
   (direnv-mode))
 
+(use-package treemacs
+  :bind (("C-c t" . treemacs)))
+
+(use-package treemacs-projectile
+  :after (treemacs projectile)
+  :ensure t)
+
+(use-package lsp-treemacs
+  :after lsp)
+
 (use-package magit
   :commands (magit-status magit-get-current-branch)
   :custom