ok

2 files changed, 29 insertions, 18 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index c3a6e93..a5385cb 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -37,7 +37,7 @@
  '(jdee-db-spec-breakpoint-face-colors (cons "#1c1f2b" "#676E95"))
  '(objed-cursor-color "#ff5370")
  '(package-selected-packages
-   '(ibuffer-vc ibuffer-projectile eyebrowse diff-hl difflib fzf helm-fuzzy helm-fuzzy-find helm-ag evil-numbers ccls org-superstar company-lsp lsp-ui lsp-mode evil-mc evil-surround cl-format company-irony neotree irony xr font-utils org-evil evil-vimish-fold crontab-mode symon toc-org yaml-mode helm-w3m helm-mu htmlize babel org-pdftools shell-pop which-key dmenu lua-mode dionysos helm-c-yasnippet helm-emms emms font-lock-cl restart-emacs w3m string-utils go-mode major-mode-icons dired-icon mode-icons evil-collection sed-mode zones kaolin-themes gruvbox-theme helm-themes yasnippet-classic-snippets yasnippet-snippets auto-yasnippet php-auto-yasnippets el-autoyas yasnippet cargo evil-ediff windresize helm-make spacemacs-theme centaur-tabs evil-magit dashboard ssh sudo-ext dockerfile-mode docker frame-local ov dash-functional helm-addressbook org-mime flyspell-correct pdf-tools websocket request emojify-logos emojify oauth2 circe web-mode doom-themes doom-modeline all-the-icons-dired all-the-icons-gnus all-the-icons html5-schema phps-mode org-babel-eval-in-repl rust-mode smart-mode-line-powerline-theme eshell-prompt-extras eshell-fixed-prompt pyenv-mode s realgud-lldb ranger ## color-theme-modern auto-complete-c-headers command-log-mode auto-complete magit smart-tabs-mode airline-themes paredit autopair tabbar-ruler tabbar use-package-el-get color-theme-approximate diminish rainbow-delimiters color-identifiers-mode use-package helm evil-visual-mark-mode))
+   '(helm-etags-plus helm-xref treemacs-projectile treemacs-magit treemacs-evil treemacs ibuffer-vc ibuffer-projectile eyebrowse diff-hl difflib fzf helm-fuzzy helm-fuzzy-find helm-ag evil-numbers ccls org-superstar company-lsp lsp-ui lsp-mode evil-mc evil-surround cl-format company-irony neotree irony xr font-utils org-evil evil-vimish-fold crontab-mode symon toc-org yaml-mode helm-w3m helm-mu htmlize babel org-pdftools shell-pop which-key dmenu lua-mode dionysos helm-c-yasnippet helm-emms emms font-lock-cl restart-emacs w3m string-utils go-mode major-mode-icons dired-icon mode-icons evil-collection sed-mode zones kaolin-themes gruvbox-theme helm-themes yasnippet-classic-snippets yasnippet-snippets auto-yasnippet php-auto-yasnippets el-autoyas yasnippet cargo evil-ediff windresize helm-make spacemacs-theme centaur-tabs evil-magit dashboard ssh sudo-ext dockerfile-mode docker frame-local ov dash-functional helm-addressbook org-mime flyspell-correct pdf-tools websocket request emojify-logos emojify oauth2 circe web-mode doom-themes doom-modeline all-the-icons-dired all-the-icons-gnus all-the-icons html5-schema phps-mode org-babel-eval-in-repl rust-mode smart-mode-line-powerline-theme eshell-prompt-extras eshell-fixed-prompt pyenv-mode s realgud-lldb ranger ## color-theme-modern auto-complete-c-headers command-log-mode auto-complete magit smart-tabs-mode airline-themes paredit autopair tabbar-ruler tabbar use-package-el-get color-theme-approximate diminish rainbow-delimiters color-identifiers-mode use-package helm evil-visual-mark-mode))
  '(pdf-view-midnight-colors (cons "#EEFFFF" "#292D3E"))
  '(pos-tip-background-color "#2E2A29")
  '(pos-tip-foreground-color "#d4d4d6")
diff --git a/.config/emacs/org/config.org b/.config/emacs/org/config.org
index cc4de37..f40ede0 100644
--- a/.config/emacs/org/config.org
+++ b/.config/emacs/org/config.org
@@ -42,12 +42,14 @@
 		   desktop-auto-save-timeout 60)
 	 (desktop-save-mode 1)
    #+END_SRC
+
 ** GC
    #+BEGIN_SRC emacs-lisp
 	 (add-hook 'focus-out-hook 'garbage-collect)
 	 (add-hook 'minibuffer-setup-hook 'my/set-max-gc-cons-threshold) ;; defined in early-init.el
 	 (add-hook 'minibuffer-exit-hook 'my/set-default-gc-cons-threshold)
    #+END_SRC
+
 ** MELPA and non-MELPA
 #+BEGIN_SRC emacs-lisp
 (require 'package)
@@ -313,23 +315,31 @@
 
 *** NeoTree
 #+BEGIN_SRC emacs-lisp
-  (require 'neotree)
-  (setq neo-vc-integration '(face))
-  (evil-define-key 'normal neotree-mode-map (kbd "TAB") 'neotree-enter)
-  (evil-define-key 'normal neotree-mode-map (kbd "SPC") 'neotree-quick-look)
-  (evil-define-key 'normal neotree-mode-map (kbd "q") 'neotree-hide)
-  (evil-define-key 'normal neotree-mode-map (kbd "RET") 'neotree-enter)
-  (evil-define-key 'normal neotree-mode-map (kbd "g") 'neotree-refresh)
-  (evil-define-key 'normal neotree-mode-map (kbd "n") 'neotree-next-line)
-  (evil-define-key 'normal neotree-mode-map (kbd "p") 'neotree-previous-line)
-  (evil-define-key 'normal neotree-mode-map (kbd "A") 'neotree-stretch-toggle)
-  (evil-define-key 'normal neotree-mode-map (kbd "H") 'neotree-hidden-file-toggle)
-  (evil-define-key 'normal neotree-mode-map (kbd "|") 'neotree-enter-vertical-split)
-  (evil-define-key 'normal neotree-mode-map (kbd "S") 'neotree-enter-vertical-split)
-  (evil-define-key 'normal neotree-mode-map (kbd "/") 'neotree-enter-horizontal-split)
-  (evil-define-key 'normal neotree-mode-map (kbd "s") 'neotree-enter-horizontal-split)
+ ;; (require 'neotree)
+ ;; (setq neo-vc-integration '(face))
+ ;; (evil-define-key 'normal neotree-mode-map (kbd "TAB") 'neotree-enter)
+ ;; (evil-define-key 'normal neotree-mode-map (kbd "SPC") 'neotree-quick-look)
+ ;; (evil-define-key 'normal neotree-mode-map (kbd "q") 'neotree-hide)
+ ;; (evil-define-key 'normal neotree-mode-map (kbd "RET") 'neotree-enter)
+ ;; (evil-define-key 'normal neotree-mode-map (kbd "g") 'neotree-refresh)
+ ;; (evil-define-key 'normal neotree-mode-map (kbd "n") 'neotree-next-line)
+ ;; (evil-define-key 'normal neotree-mode-map (kbd "p") 'neotree-previous-line)
+ ;; (evil-define-key 'normal neotree-mode-map (kbd "A") 'neotree-stretch-toggle)
+ ;; (evil-define-key 'normal neotree-mode-map (kbd "H") 'neotree-hidden-file-toggle)
+ ;; (evil-define-key 'normal neotree-mode-map (kbd "|") 'neotree-enter-vertical-split)
+ ;; (evil-define-key 'normal neotree-mode-map (kbd "S") 'neotree-enter-vertical-split)
+ ;; (evil-define-key 'normal neotree-mode-map (kbd "/") 'neotree-enter-horizontal-split)
+ ;; (evil-define-key 'normal neotree-mode-map (kbd "s") 'neotree-enter-horizontal-split)
 #+END_SRC
 
+*** Treemacs
+	#+BEGIN_SRC emacs-lisp
+(require 'treemacs)
+(require 'treemacs-evil)
+(require 'treemacs-magit)
+(require 'treemacs-projectile)
+	#+END_SRC
+
 *** Helm, projectile
 	#+BEGIN_SRC emacs-lisp
 	  (require 'helm-config)
@@ -686,7 +696,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
   (setq ccls-sem-highlight-method 'font-lock)
   (setq lsp-enable-indentation nil)
   (setq lsp-completion-enable t)
-  ;; (ccls-use-default-rainbow-sem-highlight)
+  (setq lsp-headerline-breadcrumb-enable nil)
 #+END_SRC
 
 *** diff-hl
@@ -736,6 +746,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
 				  (unless (eq ibuffer-sorting-mode 'alphabetic)
 					(ibuffer-do-sort-by-alphabetic))))
 	#+END_SRC
+
 ** Compilation
 *** Close window after errorless compilation
 #+BEGIN_SRC emacs-lisp
@@ -762,7 +773,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
    #+BEGIN_SRC emacs-lisp
 	 (defun my/nothing ())
 	 (global-set-key [f1] 'shell-pop)
-	 (global-set-key [f2] 'neotree-toggle)
+	 (global-set-key [f2] 'treemacs)
 	 (global-set-key [f3] 'flymake-show-diagnostics-buffer)
 	 (global-set-key [f4] 'helm-make-projectile)
 	 (global-set-key [f5] 'undo-tree-visualize)