Compare commits

..

No commits in common. "3dda6fd4ee6701f040f083779c7b97e57a18d4c7" and "06410177db104dd57d11268889f2dc909d88a02a" have entirely different histories.

7 changed files with 29 additions and 43 deletions

View File

@ -13,21 +13,6 @@ projects in other locations.")
(setq projectile-auto-discover t) (setq projectile-auto-discover t)
(setq projectile-project-search-path project-locations)) (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 (after! magit
(add-hook! 'after-save-hook #'magit-after-save-refresh-status) (add-hook! 'after-save-hook #'magit-after-save-refresh-status)
(setq magit-save-repository-buffers t ; ask to save modified files in repo (setq magit-save-repository-buffers t ; ask to save modified files in repo

View File

@ -0,0 +1,12 @@
;;; ../../.dotfiles/doom/.config/doom/+smudge.el -*- lexical-binding: t; -*-
(use-package! smudge
;; Do not load and error if credentials are not set
;; if client secret is bound, then client id should be fine as well
;; in $DOOM_DIR/.local.el:
;; (setq smudge-oauth2-client-id ""
;; smudge-oauth2-client-secret "")
:if (boundp 'smudge-oauth2-client-secret)
:config
(global-smudge-remote-mode)
(map! :map smudge-mode-map "M-p" #'smudge-command-map))

View File

@ -17,6 +17,7 @@
;; pop-ups ;; pop-ups
(setq which-key-idle-delay 0.25) (setq which-key-idle-delay 0.25)
(setq company-idle-delay 0.25)
;; centaur tabs issue: https://github.com/ema2159/centaur-tabs/issues/181 ;; centaur tabs issue: https://github.com/ema2159/centaur-tabs/issues/181
(after! centaur-tabs (after! centaur-tabs
@ -54,14 +55,10 @@ when this is not the case"
;; https://github.com/iqbalansari/emacs-emojify/issues/100, but keep for ;; https://github.com/iqbalansari/emacs-emojify/issues/100, but keep for
;; simplicity. ;; simplicity.
(setq emojify-download-emojis-p t) (setq emojify-download-emojis-p t)
(setq emojify-emoji-set "twemoji-v2")
(setq eros-eval-result-prefix " ") ; default => (use-package auto-dark
:config
(setq auto-dark-allow-osascript t)
;; (use-package auto-dark (setq auto-dark-dark-theme 'doom-gruvbox)
;; :config (setq auto-dark-light-theme 'doom-gruvbox-light)
;; (setq auto-dark-allow-osascript t) (auto-dark-mode t))
;; (setq auto-dark-dark-theme 'doom-gruvbox)
;; (setq auto-dark-light-theme 'doom-gruvbox-light)
;; (auto-dark-mode t))

View File

@ -14,6 +14,7 @@
(load! "+ui") ; theme, font, and appearance tweaks (load! "+ui") ; theme, font, and appearance tweaks
(load! "+projects") ; project-related (load! "+projects") ; project-related
(load! "+smudge") ; spotify
(load! "+ess") ; ess, R (load! "+ess") ; ess, R
(load! "+mail") ; mu4e (load! "+mail") ; mu4e
@ -37,8 +38,8 @@
;; company ;; company
(after! company (after! company
(setq company-idle-delay 0.2 (setq company-idle-delay 0.1
company-minimum-prefix-length 3 company-minimum-prefix-length 2
;; doesn't show in childframe, but might be useful in terminal ;; doesn't show in childframe, but might be useful in terminal
company-show-quick-access 1)) company-show-quick-access 1))
@ -65,9 +66,6 @@
;; :config ;; :config
;; (add-hook 'redacted-mode-hook (lambda () (read-only-mode (if redacted-mode 1 -1))))) ;; (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!) (add-hook 'nim-mode-local-vars-hook #'lsp!)
(use-package! subed (use-package! subed
@ -80,15 +78,12 @@
:leader :leader
:desc "MPV play/pause" "<RET>" #'subed-mpv-toggle-pause)) :desc "MPV play/pause" "<RET>" #'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 () (defun open-in-pympress ()
"Open the current buffer (assumed to be a tex file that has the same name as "Open the current buffer (assumed to be a tex file that has the same name as
the compiled PDF version) in pympress." the compiled PDF version) in pympress."
(interactive) (interactive)
(start-process "pympress" nil "pympress" (replace-regexp-in-string "\.tex" ".pdf" buffer-file-name))) (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) (add-hook! 'LaTeX-mode-hook #'hl-todo-mode)
@ -100,7 +95,7 @@ the compiled PDF version) in pympress."
(use-package! w3m) (use-package! w3m)
;; https://github.com/tarsius/keycast/issues/7 ;; https://github.com/tarsius/keycast/issues/7
(use-package! keycast (use-package keycast
:config :config
(define-minor-mode keycast-mode (define-minor-mode keycast-mode
"Show current command and its key binding in the mode line (fix for use with doom-mode-line)." "Show current command and its key binding in the mode line (fix for use with doom-mode-line)."
@ -110,16 +105,12 @@ the compiled PDF version) in pympress."
(remove-hook 'pre-command-hook 'keycast--update))) (remove-hook 'pre-command-hook 'keycast--update)))
(add-to-list 'global-mode-string '("" keycast-mode-line))) (add-to-list 'global-mode-string '("" keycast-mode-line)))
;; yasnippets
(setq yas-triggers-in-field t)
(use-package! edit-server (use-package! edit-server
:config :config
(edit-server-start)) (edit-server-start))
(defun assignment-ui-start() (defun assignment-ui-start()
"UI modifications when working on assignments (in Python) with long function "UI modifications when working on assignments (in Python) with long function headers"
headers"
(interactive) (interactive)
(which-function-mode +1) (which-function-mode +1)
(semantic-mode +1) (semantic-mode +1)

View File

@ -37,7 +37,7 @@
;;hydra ;;hydra
indent-guides ; highlighted indent columns indent-guides ; highlighted indent columns
ligatures ; ligatures and symbols to make your code pretty again 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 modeline ; snazzy, Atom-inspired modeline, plus API
nav-flash ; blink cursor line after big motions nav-flash ; blink cursor line after big motions
;;neotree ; a project drawer, like NERDTree for vim ;;neotree ; a project drawer, like NERDTree for vim

View File

@ -1,5 +1,5 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; tools/just/packages.el ;;; tools/just/packages.el
(package! just-mode :pin "d7f52eab8fa3828106f80acb1e2176e5877b7191e960e6930b34310e5506212b304") (package! just-mode :pin "35f1bd4748cd3e960e6930b34310e5506212b304")
(package! justl :pin "141daaa4b0dc07fe25423609dcd14441a9f2613e2c795ae1fca62081d5aea0b2703") (package! justl :pin "4dc372cb416912c795ae1fca62081d5aea0b2703")

View File

@ -52,6 +52,7 @@
(package! evil-tutor) (package! evil-tutor)
(package! focus) (package! focus)
(package! ghq :pin "582bd6daa505d04c7cc06d6c82ed8aee0624bfbe") (package! ghq :pin "582bd6daa505d04c7cc06d6c82ed8aee0624bfbe")
(package! smudge :pin "9e3488f485b7d7f3c97ebaad34ed552bb0cc228a")
(package! speed-type :pin "304cb8cd6c30d07577d7d864fd32858a29a73dba") (package! speed-type :pin "304cb8cd6c30d07577d7d864fd32858a29a73dba")
(package! pinentry) (package! pinentry)
(package! redacted) (package! redacted)