summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe <bousset.rudy@gmail.com>2022-06-28 10:58:31 +0200
committerJoe <bousset.rudy@gmail.com>2022-06-28 10:58:31 +0200
commit4c1e80c11793042af8a5ad5c068fe237b2ed44f3 (patch)
tree8565b85f0b663d4e9fbe92bafb993c0c53cd5319
parentUpdate (diff)
downloaddotfiles-bsd-4c1e80c11793042af8a5ad5c068fe237b2ed44f3.tar.gz
dotfiles-bsd-4c1e80c11793042af8a5ad5c068fe237b2ed44f3.tar.bz2
dotfiles-bsd-4c1e80c11793042af8a5ad5c068fe237b2ed44f3.tar.xz
dotfiles-bsd-4c1e80c11793042af8a5ad5c068fe237b2ed44f3.tar.zst
dotfiles-bsd-4c1e80c11793042af8a5ad5c068fe237b2ed44f3.zip
Update
-rw-r--r--.config/emacs/init.el2
-rw-r--r--.config/emacs/org/config.org85
2 files changed, 84 insertions, 3 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 9017c5a..d142bc2 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -41,7 +41,7 @@
'(jdee-db-spec-breakpoint-face-colors (cons "#1c1f2b" "#676E95"))
'(objed-cursor-color "#ff5370")
'(package-selected-packages
- '(treemacs edit-indirect yaml-mode lua-mode company-nginx company-fuzzy company-go company-shell helm-ag rainbow-identifiers nginx-mode evil-quickscope vc-fossil crontab-mode go-mode mutt-mode pacmacs gemini-mode org-evil glsl-mode vimrc-mode windresize evil evil-collection evil-leader evil-search-highlight-persist evil-mc evil-surround evil-ediff evil-visual-mark-mode evil-nerd-commenter evil-vimish-fold evil-numbers yasnippet yasnippet-classic-snippets yasnippet-snippets auto-yasnippet el-autoyas helm helm-xref helm-etags-plus helm-fuzzy helm-themes helm-make helm-projectile projectile company company-box which-key magit undo-tree shell-pop autopair paredit rainbow-delimiters color-identifiers-mode ibuffer-vc ibuffer-projectile eyebrowse diff-hl fzf font-utils restart-emacs string-utils dired-icon kaolin-themes doom-themes spacemacs-theme doom-modeline dashboard org-superstar toc-org pdf-tools dockerfile-mode web-mode ssh sudo-ext vimish-fold bind-key all-the-icons all-the-icons-dired all-the-icons-ibuffer))
+ '(treemacs-evil lsp-treemacs treemacs-projectile treemacs-icons-dired treemacs-magit treemacs-all-the-icons treemacs edit-indirect yaml-mode lua-mode company-nginx company-fuzzy company-go company-shell helm-ag rainbow-identifiers nginx-mode evil-quickscope vc-fossil crontab-mode go-mode mutt-mode pacmacs gemini-mode org-evil glsl-mode vimrc-mode windresize evil evil-collection evil-leader evil-search-highlight-persist evil-mc evil-surround evil-ediff evil-visual-mark-mode evil-nerd-commenter evil-vimish-fold evil-numbers yasnippet yasnippet-classic-snippets yasnippet-snippets auto-yasnippet el-autoyas helm helm-xref helm-etags-plus helm-fuzzy helm-themes helm-make helm-projectile projectile company company-box which-key magit undo-tree shell-pop autopair paredit rainbow-delimiters color-identifiers-mode ibuffer-vc ibuffer-projectile eyebrowse diff-hl fzf font-utils restart-emacs string-utils dired-icon kaolin-themes doom-themes spacemacs-theme doom-modeline dashboard org-superstar toc-org pdf-tools dockerfile-mode web-mode ssh sudo-ext vimish-fold bind-key all-the-icons all-the-icons-dired all-the-icons-ibuffer))
'(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 f7dd039..01f8a64 100644
--- a/.config/emacs/org/config.org
+++ b/.config/emacs/org/config.org
@@ -76,7 +76,7 @@
evil-visual-mark-mode evil-nerd-commenter evil-vimish-fold
evil-numbers evil-quickscope
lsp-mode lsp-ui
- ;; ccls
+ windresize
yasnippet yasnippet-classic-snippets yasnippet-snippets auto-yasnippet el-autoyas
helm helm-xref helm-lsp helm-etags-plus helm-fuzzy helm-themes helm-make helm-projectile
projectile
@@ -110,6 +110,7 @@
bind-key
all-the-icons all-the-icons-dired all-the-icons-ibuffer
mutt-mode vimrc-mode nginx-mode gemini-mode yaml-mode crontab-mode
+ treemacs treemacs-evil treemacs-magit treemacs-projectile treemacs-all-the-icons lsp-treemacs
))
(when (cl-find-if-not #'package-installed-p package-selected-packages)
@@ -762,6 +763,86 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(setq undo-tree-auto-save-history nil)
#+END_SRC
+*** treemacs
+#+BEGIN_SRC emacs-lisp
+ (require 'treemacs)
+ (require 'treemacs-evil)
+ (require 'treemacs-magit)
+ (require 'treemacs-projectile)
+ (require 'treemacs-all-the-icons)
+ (require 'lsp-treemacs)
+ (progn
+ (setq treemacs-collapse-dirs (if treemacs-python-executable 3 0)
+ treemacs-deferred-git-apply-delay 0.5
+ treemacs-directory-name-transformer #'identity
+ treemacs-display-in-side-window t
+ treemacs-eldoc-display 'simple
+ treemacs-file-event-delay 5000
+ treemacs-file-extension-regex treemacs-last-period-regex-value
+ treemacs-file-follow-delay 0.2
+ treemacs-file-name-transformer #'identity
+ treemacs-follow-after-init t
+ treemacs-expand-after-init t
+ treemacs-find-workspace-method 'find-for-file-or-pick-first
+ treemacs-git-command-pipe ""
+ treemacs-goto-tag-strategy 'refetch-index
+ treemacs-header-scroll-indicators '(nil . "^^^^^^")
+ treemacs-indentation 2
+ treemacs-indentation-string " "
+ treemacs-is-never-other-window nil
+ treemacs-max-git-entries 5000
+ treemacs-missing-project-action 'ask
+ treemacs-move-forward-on-expand nil
+ treemacs-no-png-images nil
+ treemacs-no-delete-other-windows t
+ treemacs-project-follow-cleanup nil
+ treemacs-persist-file (expand-file-name ".cache/treemacs-persist" user-emacs-directory)
+ treemacs-position 'left
+ treemacs-read-string-input 'from-child-frame
+ treemacs-recenter-distance 0.1
+ treemacs-recenter-after-file-follow nil
+ treemacs-recenter-after-tag-follow nil
+ treemacs-recenter-after-project-jump 'always
+ treemacs-recenter-after-project-expand 'on-distance
+ treemacs-litter-directories '("/node_modules" "/.venv" "/.cask")
+ treemacs-show-cursor nil
+ treemacs-show-hidden-files t
+ treemacs-silent-filewatch nil
+ treemacs-silent-refresh nil
+ treemacs-sorting 'alphabetic-asc
+ treemacs-select-when-already-in-treemacs 'move-back
+ treemacs-space-between-root-nodes t
+ treemacs-tag-follow-cleanup t
+ treemacs-tag-follow-delay 1.5
+ treemacs-text-scale nil
+ treemacs-user-mode-line-format nil
+ treemacs-user-header-line-format nil
+ treemacs-wide-toggle-width 70
+ treemacs-width 35
+ treemacs-width-increment 1
+ treemacs-width-is-initially-locked t
+ treemacs-workspace-switch-cleanup nil)
+
+ ;; The default width and height of the icons is 22 pixels. If you are
+ ;; using a Hi-DPI display, uncomment this to double the icon size.
+ ;;(treemacs-resize-icons 44)
+
+ (treemacs-follow-mode t)
+ (treemacs-filewatch-mode t)
+ (treemacs-fringe-indicator-mode 'always)
+ (when treemacs-python-executable
+ (treemacs-git-commit-diff-mode t))
+
+ (pcase (cons (not (null (executable-find "git")))
+ (not (null treemacs-python-executable)))
+ (`(t . t)
+ (treemacs-git-mode 'deferred))
+ (`(t . _)
+ (treemacs-git-mode 'simple)))
+
+ (treemacs-hide-gitignored-files-mode nil))
+
+#+END_SRC
** Compilation
*** Close window after errorless compilation
#+BEGIN_SRC emacs-lisp
@@ -788,7 +869,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] ')
+ (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)