summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.org18
-rw-r--r--init.el17
2 files changed, 27 insertions, 8 deletions
diff --git a/README.org b/README.org
index bf0cea4..e77590c 100644
--- a/README.org
+++ b/README.org
@@ -151,9 +151,6 @@ These settings ensure that block highlights aren't visible when collapsed.
(use-package counsel-projectile
:after (projectile counsel)
- :hook
- (projectile-after-switch-project .
- treemacs-add-and-display-current-project-exclusively)
:config
(counsel-projectile-mode))
#+end_src
@@ -166,7 +163,7 @@ These settings ensure that block highlights aren't visible when collapsed.
** Treemacs
#+begin_src elisp
(use-package treemacs
- :bind (("C-c t" . treemacs)))
+ :bind (("C-c t" . dk/treemacs-toggle)))
(use-package treemacs-projectile
:after (treemacs projectile)
@@ -174,7 +171,20 @@ These settings ensure that block highlights aren't visible when collapsed.
(use-package lsp-treemacs
:after lsp)
+
+ (lsp-treemacs-sync-mode 1)
+
+ (defun dk/treemacs-toggle ()
+ "Toggle treemacs-projectile and lsp symbols"
+ (interactive)
+ (if (treemacs-current-visibility)
+ (treemacs)
+ (progn
+ (treemacs-projectile)
+ (treemacs-add-and-display-current-project-exclusively)
+ )))
#+end_src
+
* Version Control
** Magit
#+begin_src lisp
diff --git a/init.el b/init.el
index dec4f30..461a677 100644
--- a/init.el
+++ b/init.el
@@ -98,9 +98,6 @@
(use-package counsel-projectile
:after (projectile counsel)
- :hook
- (projectile-after-switch-project .
- treemacs-add-and-display-current-project-exclusively)
:config
(counsel-projectile-mode))
@@ -109,7 +106,7 @@
(direnv-mode))
(use-package treemacs
- :bind (("C-c t" . treemacs)))
+ :bind (("C-c t" . dk/treemacs-toggle)))
(use-package treemacs-projectile
:after (treemacs projectile)
@@ -118,6 +115,18 @@
(use-package lsp-treemacs
:after lsp)
+(lsp-treemacs-sync-mode 1)
+
+(defun dk/treemacs-toggle ()
+ "Toggle treemacs-projectile and lsp symbols"
+ (interactive)
+ (if (treemacs-current-visibility)
+ (treemacs)
+ (progn
+ (treemacs-projectile)
+ (treemacs-add-and-display-current-project-exclusively)
+ )))
+
(use-package magit
:commands (magit-status magit-get-current-branch)
:custom