From 50c17ff520a8e5b256e0f66a370b43a1b125f511 Mon Sep 17 00:00:00 2001 From: KemoNine Date: Fri, 26 Aug 2022 10:25:29 -0400 Subject: [PATCH] cleanup and tune persp-mode and projectile --- .gitignore | 3 ++- code/init.el | 24 ++++++++++++++++++++++++ common/_global.el | 20 -------------------- org/init.el | 2 +- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index c10f907..02b4505 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ org/deft **/beancount-mode **/transient **/.org-id-locations -**/xapian-lite.so \ No newline at end of file +**/xapian-lite.so +**/projectile.cache \ No newline at end of file diff --git a/code/init.el b/code/init.el index 31156c4..1ca43d0 100644 --- a/code/init.el +++ b/code/init.el @@ -66,6 +66,30 @@ ; misc config (set-default 'truncate-lines t) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; projectile +(projectile-mode +1) +(define-key projectile-mode-map (kbd "C-c j") 'projectile-command-map) +(setq projectile-mode-line-function '(lambda () (format " [%s]" (projectile-project-name)))) +;(setq projectile-project-search-path '("~/../src/")) + +(require 'helm-projectile) +(helm-projectile-on) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; persp-mode +(diminish 'projectile-mode) +(with-eval-after-load "persp-mode-projectile-bridge-autoloads" + (add-hook 'persp-mode-projectile-bridge-mode-hook + #'(lambda () + (if persp-mode-projectile-bridge-mode + (persp-mode-projectile-bridge-find-perspectives-for-all-buffers) + (persp-mode-projectile-bridge-kill-perspectives)))) + (add-hook 'after-init-hook + #'(lambda () + (persp-mode-projectile-bridge-mode 1)) + t)) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; programming ; general diff --git a/common/_global.el b/common/_global.el index 0d91f11..03cbe87 100644 --- a/common/_global.el +++ b/common/_global.el @@ -345,16 +345,6 @@ (add-to-list 'helm-completing-read-handlers-alist '(org-capture . helm-org-completing-read-tags)) (add-to-list 'helm-completing-read-handlers-alist '(org-set-tags . helm-org-completing-read-tags)) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; projectile -(projectile-mode +1) -(define-key projectile-mode-map (kbd "C-c j") 'projectile-command-map) -(setq projectile-mode-line-function '(lambda () (format " [%s]" (projectile-project-name)))) -;(setq projectile-project-search-path '("~/../src/")) - -(require 'helm-projectile) -(helm-projectile-on) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; persp-mode (setq persp-auto-resume-time 0.25) @@ -363,16 +353,6 @@ (setq wg-morph-on nil) ;; switch off animation (setq persp-autokill-buffer-on-remove 'kill-weak) (add-hook 'window-setup-hook #'(lambda () (persp-mode 1)))) -(with-eval-after-load "persp-mode-projectile-bridge-autoloads" - (add-hook 'persp-mode-projectile-bridge-mode-hook - #'(lambda () - (if persp-mode-projectile-bridge-mode - (persp-mode-projectile-bridge-find-perspectives-for-all-buffers) - (persp-mode-projectile-bridge-kill-perspectives)))) - (add-hook 'after-init-hook - #'(lambda () - (persp-mode-projectile-bridge-mode 1)) - t)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; diminish config diff --git a/org/init.el b/org/init.el index 54d7d11..e034214 100644 --- a/org/init.el +++ b/org/init.el @@ -142,7 +142,7 @@ (with-eval-after-load "persp-mode-autoload" (with-eval-after-load "org" - (persp-def-auto-persp "KmN" + (persp-def-auto-persp "kmn" :mode-name ".*org-mode.*" :noauto :dyn-env '(after-switch-to-buffer-functions ;; prevent recursion