diff options
| -rw-r--r-- | init.el | 2 | ||||
| -rw-r--r-- | lisp/general.el | 26 |
2 files changed, 16 insertions, 12 deletions
@@ -82,7 +82,7 @@ '(custom-safe-themes '("a6f9dd4844bfbfaf1162f04ae3c52070154ef28d18b5d482566015cf429492b0" "f149d9986497e8877e0bd1981d1bef8c8a6d35be7d82cba193ad7e46f0989f6a" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" default)) '(package-selected-packages - '(kaolin-themes ement dart-mode yaml-mode meson-mode eglot autothemer pyenv-mode pyvenv plantuml-mode ledger-mode centered-window perfect-margin-mode org-download helm-rg htmlize mood-line org-super-agenda material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2)) + '(treemacs-nerd-icons treemacs-all-the-icons nerd-icons kaolin-themes ement dart-mode yaml-mode meson-mode eglot autothemer pyenv-mode pyvenv plantuml-mode ledger-mode centered-window perfect-margin-mode org-download helm-rg htmlize mood-line org-super-agenda material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2)) '(safe-local-variable-values '((js-indent-level . 4))) '(warning-suppress-types '((comp)))) (custom-set-faces diff --git a/lisp/general.el b/lisp/general.el index 79cafe2..fab6d93 100644 --- a/lisp/general.el +++ b/lisp/general.el @@ -183,7 +183,7 @@ :ensure t :config (projectile-mode +1) - (setq projectile-switch-project-action 'treemacs-add-and-display-current-project-exclusively) + ;(setq projectile-switch-project-action 'treemacs-add-and-display-current-project-exclusively) (setq projectile-indexing-method 'native) (setq projectile-enable-caching t) (setq projectile-use-git-grep t) @@ -200,16 +200,21 @@ ) ;; Tree -(use-package treemacs - :ensure t - :config - (add-hook 'treemacs-mode-hook treemacs-filewatch-mode) - (add-hook 'treemacs-mode-hook treemacs-git-mode) - ) +;; (use-package treemacs +;; :ensure t +;; :config +;; (add-hook 'treemacs-mode-hook treemacs-filewatch-mode) +;; (add-hook 'treemacs-mode-hook treemacs-git-mode) +;; ) -(use-package treemacs-projectile - :ensure t - :after (treemacs projectile)) +;; (use-package treemacs-nerd-icons +;; :config +;; (treemacs-load-theme "nerd-icons")) + +;; (use-package treemacs-projectile +;; :ensure t +;; :after (treemacs projectile)) +;; (bind-key* (kbd "C-;") 'treemacs) ;; Git @@ -251,7 +256,6 @@ ;; Global key binds (bind-key* (kbd "M-.") 'xref-find-definitions) (bind-key* (kbd "C-x k") 'kill-this-buffer) -(bind-key* (kbd "C-;") 'treemacs) (use-package company :ensure t |