Compare commits
8 Commits
8919b21ba7
...
82087e73b5
Author | SHA1 | Date |
---|---|---|
David Morgan | 82087e73b5 | |
David Morgan | b81f1571e8 | |
David Morgan | 2376adf93a | |
David Morgan | fb42e8dfce | |
David Morgan | fe4e881156 | |
David Morgan | 8b81aa24e1 | |
David Morgan | 1fb68411e8 | |
David Morgan | 2ba485853a |
|
@ -14,17 +14,17 @@
|
||||||
(use-feature hippie-expand
|
(use-feature hippie-expand
|
||||||
:config
|
:config
|
||||||
(setq hippie-expand-try-functions-list
|
(setq hippie-expand-try-functions-list
|
||||||
'(;yas-hippie-try-expand
|
'(;yas-hippie-try-expand
|
||||||
try-expand-dabbrev
|
try-expand-dabbrev
|
||||||
try-expand-all-abbrevs
|
try-expand-all-abbrevs
|
||||||
try-expand-dabbrev-all-buffers
|
try-expand-dabbrev-all-buffers
|
||||||
try-expand-dabbrev-from-kill
|
try-expand-dabbrev-from-kill
|
||||||
try-complete-file-name-partially
|
try-complete-file-name-partially
|
||||||
try-complete-file-name
|
try-complete-file-name
|
||||||
try-expand-list
|
try-expand-list
|
||||||
try-expand-line
|
try-expand-line
|
||||||
try-complete-lisp-symbol-partially
|
try-complete-lisp-symbol-partially
|
||||||
try-complete-lisp-symbol))
|
try-complete-lisp-symbol))
|
||||||
;; https://www.emacswiki.org/emacs/HippieExpand#h5o-9
|
;; https://www.emacswiki.org/emacs/HippieExpand#h5o-9
|
||||||
(defadvice he-substitute-string (after he-paredit-fix)
|
(defadvice he-substitute-string (after he-paredit-fix)
|
||||||
"Remove extra paren when expanding line in paredit."
|
"Remove extra paren when expanding line in paredit."
|
||||||
|
|
|
@ -179,7 +179,7 @@
|
||||||
(add-to-list 'aggressive-indent-dont-indent-if
|
(add-to-list 'aggressive-indent-dont-indent-if
|
||||||
'(and (derived-mode-p 'prog-mode)
|
'(and (derived-mode-p 'prog-mode)
|
||||||
(string-match "^\s*;"
|
(string-match "^\s*;"
|
||||||
(thing-at-point 'line))))
|
(or (thing-at-point 'line) ""))))
|
||||||
:hook
|
:hook
|
||||||
(emacs-lisp-mode . aggressive-indent-mode))
|
(emacs-lisp-mode . aggressive-indent-mode))
|
||||||
|
|
||||||
|
|
|
@ -7,9 +7,8 @@
|
||||||
(ediff-setup-windows-plain 'ediff-setup-windows-plain))
|
(ediff-setup-windows-plain 'ediff-setup-windows-plain))
|
||||||
|
|
||||||
(use-package diff-hl
|
(use-package diff-hl
|
||||||
:config
|
|
||||||
(global-diff-hl-mode +1)
|
|
||||||
:hook
|
:hook
|
||||||
|
(emacs-startup . global-diff-hl-mode)
|
||||||
(dired-mode . diff-hl-dired-mode)
|
(dired-mode . diff-hl-dired-mode)
|
||||||
(magit-post-refresh . diff-hl-magit-post-refresh))
|
(magit-post-refresh . diff-hl-magit-post-refresh))
|
||||||
|
|
||||||
|
@ -294,8 +293,6 @@
|
||||||
(call-interactively #'magit-delta-mode)
|
(call-interactively #'magit-delta-mode)
|
||||||
(magit-refresh)))
|
(magit-refresh)))
|
||||||
|
|
||||||
(use-package magit-todos)
|
|
||||||
|
|
||||||
(use-package forge
|
(use-package forge
|
||||||
:after magit)
|
:after magit)
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,7 @@
|
||||||
;(size-indication-mode t) ; TODO
|
;(size-indication-mode t) ; TODO
|
||||||
|
|
||||||
(use-feature which-func
|
(use-feature which-func
|
||||||
:config
|
:hook (after-init . which-function-mode))
|
||||||
(which-function-mode 1))
|
|
||||||
|
|
||||||
(use-package simple-modeline
|
(use-package simple-modeline
|
||||||
:hook (after-init . simple-modeline-mode)
|
:hook (after-init . simple-modeline-mode)
|
||||||
|
|
|
@ -76,7 +76,7 @@ Or remove all highlighted symbols in the current buffer (with`ARG')."
|
||||||
(use-package gumshoe
|
(use-package gumshoe
|
||||||
:defer 5
|
:defer 5
|
||||||
:after perspective
|
:after perspective
|
||||||
:diminish global-gumshoe-persp-mode
|
:diminish global-gumshoe-mode
|
||||||
:custom
|
:custom
|
||||||
(gumshoe-show-footprints-p nil)
|
(gumshoe-show-footprints-p nil)
|
||||||
(gumshoe-idle-time 5)
|
(gumshoe-idle-time 5)
|
||||||
|
|
|
@ -171,23 +171,34 @@
|
||||||
("C-<" . buffer-ring-prev-buffer)
|
("C-<" . buffer-ring-prev-buffer)
|
||||||
("C->" . buffer-ring-next-buffer)))
|
("C->" . buffer-ring-next-buffer)))
|
||||||
|
|
||||||
(use-package cbm
|
|
||||||
:config
|
|
||||||
(defvar cbm-repeat-map
|
|
||||||
(let ((map (make-sparse-keymap)))
|
|
||||||
(define-key map (kbd "<") #'cbm-cycle)
|
|
||||||
map))
|
|
||||||
(put 'cbm-cycle 'repeat-map 'cbm-repeat-map)
|
|
||||||
:bind
|
|
||||||
("C-c C-b <" . cbm-cycle)
|
|
||||||
("C-c C-b C-b" . cbm-switch-buffer))
|
|
||||||
|
|
||||||
(use-package buffer-flip
|
(use-package buffer-flip
|
||||||
|
:custom (buffer-flip-skip-patterns '("^[*]"))
|
||||||
|
:config
|
||||||
|
;; (defun persp-buffer-flip-skip-buffer (orig &rest args)
|
||||||
|
;; (or (apply orig args)
|
||||||
|
;; (persp-buffer-filter (car args))))
|
||||||
|
;; (advice-add 'buffer-flip-skip-buffer :around 'persp-buffer-flip-skip-buffer)
|
||||||
|
(defun persp-buffer-flip-skip-buffer (orig-val)
|
||||||
|
(or orig-val (persp-buffer-filter (car args))))
|
||||||
|
(advice-add 'buffer-flip-skip-buffer :filter-return 'persp-buffer-flip-skip-buffer)
|
||||||
:bind (("C-c C-<left>" . buffer-flip)
|
:bind (("C-c C-<left>" . buffer-flip)
|
||||||
(:map buffer-flip-map
|
(:map buffer-flip-map
|
||||||
( "C-<left>" . buffer-flip-forward)
|
( "C-<left>" . buffer-flip-forward)
|
||||||
( "C-<right>" . buffer-flip-backward)
|
( "C-<right>" . buffer-flip-backward)
|
||||||
( "C-g" . buffer-flip-abort))))
|
( "C-g" . buffer-flip-abort))))
|
||||||
|
|
||||||
|
(use-package iflipb
|
||||||
|
:config
|
||||||
|
(defun iflipb-persp-buffer-list ()
|
||||||
|
"Buffer list for iflipb."
|
||||||
|
(seq-filter 'buffer-live-p (persp-current-buffers* t)))
|
||||||
|
(dolist (cmd '(iflipb-previous-buffer iflipb-next-buffer))
|
||||||
|
(put cmd 'repeat-map 'iflipb-repeat-map))
|
||||||
|
:custom (iflipb-buffer-list-function 'iflipb-persp-buffer-list)
|
||||||
|
:bind
|
||||||
|
("C-x k" . iflipb-kill-buffer) ;; TODO replace with a kill currently selected buffer command
|
||||||
|
("<f12>" . iflipb-previous-buffer)
|
||||||
|
("<f11>" . iflipb-next-buffer))
|
||||||
|
|
||||||
(provide 'init-windows)
|
(provide 'init-windows)
|
||||||
;;; init-windows.el ends here
|
;;; init-windows.el ends here
|
||||||
|
|
|
@ -87,7 +87,9 @@ in
|
||||||
|
|
||||||
localVariables = {
|
localVariables = {
|
||||||
PER_DIRECTORY_HISTORY_TOGGLE = "^\\\\"; # ^\\ is ^#
|
PER_DIRECTORY_HISTORY_TOGGLE = "^\\\\"; # ^\\ is ^#
|
||||||
HISTORY_START_WITH_GLOBAL=true;
|
HISTORY_START_WITH_GLOBAL = true;
|
||||||
|
|
||||||
|
ZSH_AUTOSUGGEST_STRATEGY = ["history" "completion"];
|
||||||
|
|
||||||
NVM_AUTO_USE = true;
|
NVM_AUTO_USE = true;
|
||||||
NVM_LAZY_LOAD = true;
|
NVM_LAZY_LOAD = true;
|
||||||
|
|
Loading…
Reference in New Issue