Add pam-reattch

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

@@ -154,6 +154,12 @@
         (list beg end (completion-table-dynamic (lambda (_) completion))
               :annotation-function #'cider-annotate-symbol))))
   (advice-add 'cider-complete-at-point :override 'my/cider-complete-at-point)
+
+  (defun fix-duplicate-windows ()
+    "When all windows are the same, delete all of them except the current one."
+    (when (apply #'eq (mapcar 'window-buffer (window-list)))
+      (delete-other-windows)))
+  (advice-add #'cider-close-ancillary-buffers :after #'fix-duplicate-windows)
   :bind
   (:map cider-mode-map
         ("C-c M-l" . cider-load-file)

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

@@ -46,9 +46,12 @@
   :bind ("M-/" . fancy-dabbrev-expand))
 
 (use-feature emacs
-  :init
+  :config
   (setq completion-cycle-threshold 3)
-  (setq tab-always-indent 'complete))
+  (setq tab-always-indent 'complete)
+  (setq read-buffer-completion-ignore-case t
+        read-file-name-completion-ignore-case t
+        completion-ignore-case t))
 
 (use-package orderless
   :defer 2

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

@@ -7,6 +7,8 @@
   (ediff-setup-windows-plain 'ediff-setup-windows-plain))
 
 (use-package diff-hl
+  :custom
+  (diff-hl-flydiff-mode t)
   :hook
   (elpaca-after-init . global-diff-hl-mode)
   (dired-mode . diff-hl-dired-mode)

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

@@ -48,6 +48,10 @@
         use-package-always-defer t
         package-native-compile t
         elpaca-queue-limit 10)
+  (setq use-package-verbose init-file-debug
+        use-package-expand-minimally (not init-file-debug)
+        use-package-compute-statistics nil
+        debug-on-error init-file-debug)
   (bind-key "C-c e u" 'elpaca-fetch-all)
   (bind-key "C-c e m" 'elpaca-manager))
 
@@ -58,12 +62,12 @@
 
 ;; https://github.com/progfolio/elpaca/wiki/Logging#how-to-change-a-commands-log-query
 (with-eval-after-load 'elpaca-log
-  (setf (alist-get '(eval-buffer eval-region eval-defun eval-last-sexp org-ctrl-c-ctrl-c)
+  (setf (alist-get '(eval-buffer eval-region eval-defun eval-last-sexp org-ctrl-c-ctrl-c eval-region-or-defun eros-eval-defun eros-eval-last-sexp)
                    elpaca-log-command-queries nil nil #'equal)
         "#unique | !finished"))
 
 ;; https://github.com/progfolio/elpaca/wiki/Logging#auto-hiding-the-elpaca-log-buffer
-(defvar +elpaca-hide-log-commands '(eval-buffer eval-region eval-defun eval-last-sexp org-ctrl-c-ctrl-c)
+(defvar +elpaca-hide-log-commands '(eval-buffer eval-region eval-defun eval-last-sexp org-ctrl-c-ctrl-c eval-region-or-defun eros-eval-defun eros-eval-last-sexp)
   "List of commands for which a successfully processed log is auto hidden.")
 (defun +elpaca-hide-successful-log ()
   "Hide Elpaca log buffer if queues processed successfully."
@@ -83,7 +87,7 @@
 
 ;; https://github.com/radian-software/radian/blob/e3aad124c8e0cc870ed09da8b3a4905d01e49769/emacs/radian.el#L352
 (defmacro use-feature (name &rest args)
-  "Like `use-package', but with `elpaca-use-package-by-default' disabled.
+  "Like `use-package', but without elpaca integration.
 `NAME' and `ARGS' are as with `use-package'"
   (declare (indent defun))
   `(use-package ,name

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

@@ -30,7 +30,8 @@
   (delq 'eshell-handle-ansi-color eshell-output-filter-functions)
   (setenv "TERM" "xterm-256color"))
 
-(use-package multi-vterm
+;; Installed with home-manager
+(use-feature multi-vterm
   :bind (("C-c t" . multi-vterm-next)
          ("C-x p t" . multi-vterm-project)
          ("C-c C-M-t" . multi-vterm)

nix-conf/home/includes/darwin.nix

@@ -32,7 +32,7 @@ in
     coreutils
     curl
     diffutils
-    ((emacsPackagesFor emacsMacport).emacsWithPackages(ps: [ ps.vterm ]))
+    ((emacsPackagesFor emacs29-macport).emacsWithPackages(ps: [ ps.vterm ps.multi-vterm ]))
     findutils
     gh
     gh-dash
@@ -50,6 +50,7 @@ in
     nix # on darwin we are not using nixos (duh)
     nodejs
     openvpn
+    pam-reattach
     pinentry_mac
     pgcli
     pgformatter

nix-conf/home/includes/linux-dev.nix

@@ -7,7 +7,7 @@
   programs.emacs = {
     enable = true;
     package = pkgs.emacs28NativeComp;
-    extraPackages = (epkgs: [ epkgs.vterm ] );
+    extraPackages = (epkgs: [ epkgs.vterm epkgs.multi-vterm ] );
   };
 
   home.packages = with pkgs; [