From 3dda6fd4ee6701f040f083779c7b97e57a18d4c7 Mon Sep 17 00:00:00 2001 From: earnest ma Date: Tue, 2 May 2023 12:38:18 -0400 Subject: [PATCH] Update doom emacs config (lots) --- doom/.config/doom/+projects.el | 15 ++++++++++++++ doom/.config/doom/+ui.el | 17 +++++++++------- doom/.config/doom/config.el | 20 ++++++++++++++----- doom/.config/doom/init.el | 2 +- .../doom/modules/tools/just/packages.el | 4 ++-- 5 files changed, 43 insertions(+), 15 deletions(-) diff --git a/doom/.config/doom/+projects.el b/doom/.config/doom/+projects.el index e15e740..1811a13 100644 --- a/doom/.config/doom/+projects.el +++ b/doom/.config/doom/+projects.el @@ -13,6 +13,21 @@ projects in other locations.") (setq projectile-auto-discover t) (setq projectile-project-search-path project-locations)) +(use-package! treemacs + :init + (setq treemacs-missing-project-action 'remove) + :config + (treemacs-project-follow-mode +1) + (treemacs-hide-gitignored-files-mode +1)) + +(after! treemacs + (define-key treemacs-mode-map [mouse-1] #'treemacs-single-click-expand-action)) + +(use-package treemacs-persp ;;treemacs-perspective if you use perspective.el vs. persp-mode + :after (treemacs persp-mode) ;;or perspective vs. persp-mode + :ensure t + :config (treemacs-set-scope-type 'Perspectives)) + (after! magit (add-hook! 'after-save-hook #'magit-after-save-refresh-status) (setq magit-save-repository-buffers t ; ask to save modified files in repo diff --git a/doom/.config/doom/+ui.el b/doom/.config/doom/+ui.el index d1482f2..f7b130d 100644 --- a/doom/.config/doom/+ui.el +++ b/doom/.config/doom/+ui.el @@ -17,7 +17,6 @@ ;; pop-ups (setq which-key-idle-delay 0.25) -(setq company-idle-delay 0.25) ;; centaur tabs issue: https://github.com/ema2159/centaur-tabs/issues/181 (after! centaur-tabs @@ -55,10 +54,14 @@ when this is not the case" ;; https://github.com/iqbalansari/emacs-emojify/issues/100, but keep for ;; simplicity. (setq emojify-download-emojis-p t) +(setq emojify-emoji-set "twemoji-v2") -(use-package auto-dark - :config - (setq auto-dark-allow-osascript t) - (setq auto-dark-dark-theme 'doom-gruvbox) - (setq auto-dark-light-theme 'doom-gruvbox-light) - (auto-dark-mode t)) +(setq eros-eval-result-prefix " ") ; default => + + +;; (use-package auto-dark +;; :config +;; (setq auto-dark-allow-osascript t) +;; (setq auto-dark-dark-theme 'doom-gruvbox) +;; (setq auto-dark-light-theme 'doom-gruvbox-light) +;; (auto-dark-mode t)) diff --git a/doom/.config/doom/config.el b/doom/.config/doom/config.el index 30c898a..b8a9cbc 100644 --- a/doom/.config/doom/config.el +++ b/doom/.config/doom/config.el @@ -37,8 +37,8 @@ ;; company (after! company - (setq company-idle-delay 0.1 - company-minimum-prefix-length 2 + (setq company-idle-delay 0.2 + company-minimum-prefix-length 3 ;; doesn't show in childframe, but might be useful in terminal company-show-quick-access 1)) @@ -65,6 +65,9 @@ ;; :config ;; (add-hook 'redacted-mode-hook (lambda () (read-only-mode (if redacted-mode 1 -1))))) +;; disable tidy +(add-to-list '+format-on-save-enabled-modes 'web-mode :append) + (add-hook 'nim-mode-local-vars-hook #'lsp!) (use-package! subed @@ -77,12 +80,15 @@ :leader :desc "MPV play/pause" "" #'subed-mpv-toggle-pause)) + +;; NOTE I use Skim on MacOS and pdf-tools on Linux infrequently. Consider +;; "p d f modeline" from tecosaur's config + (defun open-in-pympress () "Open the current buffer (assumed to be a tex file that has the same name as the compiled PDF version) in pympress." (interactive) (start-process "pympress" nil "pympress" (replace-regexp-in-string "\.tex" ".pdf" buffer-file-name))) - ;; (async-shell-command (concat "pympress " (replace-regexp-in-string "\.tex" ".pdf" buffer-file-name)))) (add-hook! 'LaTeX-mode-hook #'hl-todo-mode) @@ -94,7 +100,7 @@ the compiled PDF version) in pympress." (use-package! w3m) ;; https://github.com/tarsius/keycast/issues/7 -(use-package keycast +(use-package! keycast :config (define-minor-mode keycast-mode "Show current command and its key binding in the mode line (fix for use with doom-mode-line)." @@ -104,12 +110,16 @@ the compiled PDF version) in pympress." (remove-hook 'pre-command-hook 'keycast--update))) (add-to-list 'global-mode-string '("" keycast-mode-line))) +;; yasnippets +(setq yas-triggers-in-field t) + (use-package! edit-server :config (edit-server-start)) (defun assignment-ui-start() - "UI modifications when working on assignments (in Python) with long function headers" + "UI modifications when working on assignments (in Python) with long function +headers" (interactive) (which-function-mode +1) (semantic-mode +1) diff --git a/doom/.config/doom/init.el b/doom/.config/doom/init.el index 7d4b6ff..cf1f01d 100644 --- a/doom/.config/doom/init.el +++ b/doom/.config/doom/init.el @@ -37,7 +37,7 @@ ;;hydra indent-guides ; highlighted indent columns ligatures ; ligatures and symbols to make your code pretty again - ;;minimap ; show a map of the code on the side + minimap ; show a map of the code on the side modeline ; snazzy, Atom-inspired modeline, plus API nav-flash ; blink cursor line after big motions ;;neotree ; a project drawer, like NERDTree for vim diff --git a/doom/.config/doom/modules/tools/just/packages.el b/doom/.config/doom/modules/tools/just/packages.el index cf50fac..ab6fa1d 100644 --- a/doom/.config/doom/modules/tools/just/packages.el +++ b/doom/.config/doom/modules/tools/just/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- ;;; tools/just/packages.el -(package! just-mode :pin "35f1bd4748cd3e960e6930b34310e5506212b304") -(package! justl :pin "4dc372cb416912c795ae1fca62081d5aea0b2703") +(package! just-mode :pin "d7f52eab8fa3828106f80acb1e2176e5877b7191e960e6930b34310e5506212b304") +(package! justl :pin "141daaa4b0dc07fe25423609dcd14441a9f2613e2c795ae1fca62081d5aea0b2703")