Remove magit-todos

.emacs.d/lisp/init-completion.el

@@ -14,17 +14,17 @@
 (use-feature hippie-expand
   :config
   (setq hippie-expand-try-functions-list
-      '(;yas-hippie-try-expand
-        try-expand-dabbrev
-        try-expand-all-abbrevs
-        try-expand-dabbrev-all-buffers
-        try-expand-dabbrev-from-kill
-        try-complete-file-name-partially
-        try-complete-file-name
-        try-expand-list
-        try-expand-line
-        try-complete-lisp-symbol-partially
-        try-complete-lisp-symbol))
+        '(;yas-hippie-try-expand
+          try-expand-dabbrev
+          try-expand-all-abbrevs
+          try-expand-dabbrev-all-buffers
+          try-expand-dabbrev-from-kill
+          try-complete-file-name-partially
+          try-complete-file-name
+          try-expand-list
+          try-expand-line
+          try-complete-lisp-symbol-partially
+          try-complete-lisp-symbol))
   ;; https://www.emacswiki.org/emacs/HippieExpand#h5o-9
   (defadvice he-substitute-string (after he-paredit-fix)
     "Remove extra paren when expanding line in paredit."

.emacs.d/lisp/init-editor.el

@@ -179,7 +179,7 @@
   (add-to-list 'aggressive-indent-dont-indent-if
                '(and (derived-mode-p 'prog-mode)
                      (string-match "^\s*;"
-                                   (thing-at-point 'line))))
+                                   (or (thing-at-point 'line) ""))))
   :hook
   (emacs-lisp-mode . aggressive-indent-mode))
 

.emacs.d/lisp/init-git.el

@@ -7,9 +7,8 @@
   (ediff-setup-windows-plain 'ediff-setup-windows-plain))
 
 (use-package diff-hl
-  :config
-  (global-diff-hl-mode +1)
   :hook
+  (emacs-startup . global-diff-hl-mode)
   (dired-mode . diff-hl-dired-mode)
   (magit-post-refresh . diff-hl-magit-post-refresh))
 
@@ -294,8 +293,6 @@
     (call-interactively #'magit-delta-mode)
     (magit-refresh)))
 
-(use-package magit-todos)
-
 (use-package forge
   :after magit)
 

.emacs.d/lisp/init-modeline.el

@@ -7,8 +7,7 @@
 ;(size-indication-mode t) ; TODO
 
 (use-feature which-func
-  :config
-  (which-function-mode 1))
+  :hook (after-init . which-function-mode))
 
 (use-package simple-modeline
   :hook (after-init . simple-modeline-mode)

.emacs.d/lisp/init-navigation.el

@@ -76,7 +76,7 @@ Or remove all highlighted symbols in the current buffer (with`ARG')."
 (use-package gumshoe
   :defer 5
   :after perspective
-  :diminish global-gumshoe-persp-mode
+  :diminish global-gumshoe-mode
   :custom
   (gumshoe-show-footprints-p nil)
   (gumshoe-idle-time 5)

.emacs.d/lisp/init-windows.el

@@ -171,23 +171,34 @@
         ("C-<" . buffer-ring-prev-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
+  :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)
           (:map buffer-flip-map
                 ( "C-<left>" .   buffer-flip-forward)
                 ( "C-<right>" . buffer-flip-backward)
                 ( "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)
 ;;; init-windows.el ends here

nix-conf/home/includes/zsh.nix

@@ -87,7 +87,9 @@ in
 
     localVariables = {
       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_LAZY_LOAD = true;