diff options
| author | Thomas Ulmer <thomasmulmer02@gmail.com> | 2025-03-17 15:56:01 -0700 |
|---|---|---|
| committer | Thomas Ulmer <thomasmulmer02@gmail.com> | 2025-03-17 15:56:01 -0700 |
| commit | 3bf89f4ceb8494848f5ca17cb4c3987b9eb706ba (patch) | |
| tree | f6c26dd1bb44f268ca9f1d51193a4d6ed384fb8b /emacs/site-lisp | |
| parent | d33a9964ecf98b0b5e14d1a3a237d9b23425081d (diff) | |
emacs cleanup and evil sandboxing
Diffstat (limited to 'emacs/site-lisp')
| -rwxr-xr-x | emacs/site-lisp/coding-config.el | 23 | ||||
| -rw-r--r-- | emacs/site-lisp/evil-config.el | 2 | ||||
| -rw-r--r-- | emacs/site-lisp/my-funcs.el | 28 |
3 files changed, 22 insertions, 31 deletions
diff --git a/emacs/site-lisp/coding-config.el b/emacs/site-lisp/coding-config.el index 143da4c..a8f34a9 100755 --- a/emacs/site-lisp/coding-config.el +++ b/emacs/site-lisp/coding-config.el @@ -52,16 +52,6 @@ (setq imenu-auto-rescan t) -;; make ibuffer play with projectile -(use-package ibuffer - :bind - ("C-x C-b" . ibuffer) - :hook - (ibuffer . (lambda () - (unless (eq ibuffer-sorting-mode 'alphabetic) - (ibuffer-do-sort-by-alphabetic))))) - - ;; make shells and whatnot slightly better (require 'comint) (setq comint-scroll-to-bottom-on-input t) @@ -96,12 +86,13 @@ (hs-minor-mode 1) (hl-todo-mode 1) (superword-mode 1) - (modify-syntax-entry ?_ "w") ) - (display-fill-column-indicator-mode 1) - (add-hook 'before-save-hook - (lambda () - (if (not (eq major-mode 'makefile-gmake-mode)) - (clean-prog-file (current-buffer)))))) + (modify-syntax-entry ?_ "w") + + (display-fill-column-indicator-mode 1) + (add-hook 'before-save-hook + (lambda () + (if (not (eq major-mode 'makefile-gmake-mode)) + (clean-prog-file (current-buffer))))))) ;; haskell flavor and tags (use-package haskell-mode diff --git a/emacs/site-lisp/evil-config.el b/emacs/site-lisp/evil-config.el index b64a720..582617e 100644 --- a/emacs/site-lisp/evil-config.el +++ b/emacs/site-lisp/evil-config.el @@ -76,5 +76,3 @@ (evil-define-key 'normal global-map (kbd "SPC s f") 'counsel-find-file) (evil-define-key 'normal global-map (kbd "SPC s r") 'counsel-rg) (evil-define-key 'normal global-map (kbd "SPC ;") 'frog-jump-buffer) - -(use-package treemacs-evil) diff --git a/emacs/site-lisp/my-funcs.el b/emacs/site-lisp/my-funcs.el index b1cfdec..8bed290 100644 --- a/emacs/site-lisp/my-funcs.el +++ b/emacs/site-lisp/my-funcs.el @@ -91,19 +91,21 @@ BEG and END define the region." (let ((transient-mark-mode nil)) (yank-advised-indent-function (region-beginning) (region-end))))) -(defadvice evil-paste-before (after yank-indent activate) - "If current mode is one of 'yank-indent-modes, indent yanked text (with prefix arg don't indent)." - (if (and (not (ad-get-arg 0)) - (member major-mode yank-indent-modes)) - (let ((transient-mark-mode nil)) - (yank-advised-indent-function (region-beginning) (region-end))))) - -(defadvice evil-paste-after (after yank-indent activate) - "If current mode is one of 'yank-indent-modes, indent yanked text (with prefix arg don't indent)." - (if (and (not (ad-get-arg 0)) - (member major-mode yank-indent-modes)) - (let ((transient-mark-mode nil)) - (yank-advised-indent-function (region-beginning) (region-end))))) +(if want-evil + (progn + (defadvice evil-paste-before (after yank-indent activate) + "If current mode is one of 'yank-indent-modes, indent yanked text (with prefix arg don't indent)." + (if (and (not (ad-get-arg 0)) + (member major-mode yank-indent-modes)) + (let ((transient-mark-mode nil)) + (yank-advised-indent-function (region-beginning) (region-end))))) + + (defadvice evil-paste-after (after yank-indent activate) + "If current mode is one of 'yank-indent-modes, indent yanked text (with prefix arg don't indent)." + (if (and (not (ad-get-arg 0)) + (member major-mode yank-indent-modes)) + (let ((transient-mark-mode nil)) + (yank-advised-indent-function (region-beginning) (region-end))))))) (defun fold-this-fold-forward (&optional arg) "Fold forward ARG number of sexps, defaulting to one." |