WIP: fix persp-buffer-flip-skip-buffer

.emacs.d/.ignore

@@ -5,6 +5,7 @@ cider-history
 recentf
 savehist
 saveplace
+workspace
 save
 elpa
 el-get

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

@@ -21,7 +21,7 @@
       ("ddb" "#d/dbg")
       ("dbn" "#d/dbgn")))
 
-  (defalias 'cape-clojure (cape-super-capf #'cider-complete-at-point
+  (defalias 'cape-clojure (cape-capf-super #'cider-complete-at-point
                                            #'lsp-completion-at-point))
   (defun set-clojure-capf ()
     (add-hook 'completion-at-point-functions #'cape-clojure -99 t))
@@ -144,6 +144,7 @@
         ;; nrepl-log-messages t
         cider-connection-message-fn nil
         cider-show-error-buffer 'except-in-repl
+        cider-test-fail-fast nil
         clojure-toplevel-inside-comment-form t)
   (setq cider-clojure-compilation-error-phases nil)
   (setq-default cider-use-overlays t)

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

@@ -233,8 +233,9 @@
               ("q" . selected-off)
               ("u" . upcase-region)
               ("l" . downcase-region)
-              ("c" . count-words-region)
+              ("C" . count-words-region)
               ("m" . apply-macro-to-region-lines)
+              ("c" . copy-region-as-kill)
               ("M-d" . sp-delete-region)
               ("j" . jq-format-json-region)
               ("i" . indent-region)

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

@@ -323,6 +323,14 @@ GitHub/Bitbucket/GitLab/... The URL will be added to the kill ring.  If
       (if (null (car remote-info))
           (message "Remote `%s' contains an unsupported URL" remote)
         (git-link--new (format "https://%s/%s/tree/%s" (car remote-info) (cadr remote-info) branch)))))
+  ;; https://clojurians.slack.com/archives/C099W16KZ/p1699983189128519?thread_ts=1699981599.260029&cid=C099W16KZ
+  (defun git-link-blame ()
+    (interactive)
+    (cl-flet ((git-link--new* (x) (replace-regexp-in-string "/blob/" "/blame/" x)))
+      (advice-add 'git-link--new :override #'git-link--new*)
+      (let ((link (call-interactively 'git-link)))
+        (advice-remove 'git-link--new #'git-link--new*)
+        (git-link--new link))))
   :custom (git-link-use-commit t)
   :bind
   ("C-c g s" . git-link)

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

@@ -59,6 +59,18 @@
 
 (elpaca diminish)
 
+;; Temporary workaround for packages needing newer version of seq (https://github.com/progfolio/elpaca/issues/216#issuecomment-1868444883))
+(defun +elpaca-unload-seq (e)
+  (and (featurep 'seq) (unload-feature 'seq t))
+  (elpaca--continue-build e))
+
+(defun +elpaca-seq-build-steps ()
+  (append (butlast (if (file-exists-p (expand-file-name "seq" elpaca-builds-directory))
+                       elpaca--pre-built-steps elpaca-build-steps))
+          (list '+elpaca-unload-seq 'elpaca--activate-package)))
+
+(elpaca `(seq :build ,(+elpaca-seq-build-steps)))
+
 ;; Block until current queue processed.
 (elpaca-wait)
 

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

@@ -176,13 +176,13 @@
 (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)
+  (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 &rest args)
+  ;;   (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)

nix-conf/home/includes/zsh.nix

@@ -202,12 +202,20 @@ in
           return 2
         fi
 
-        DOAS=$(command -v doas)
-        if  [ $1 -eq 0 ] ; then
-          $DOAS nix-collect-garbage -d
+        if [ $1 -eq 0 ] ; then
+         GC_ARGS=(-d)
         else
-          $DOAS nix-collect-garbage --delete-older-than ''${1}d
+          GC_ARGS=(--delete-older-than ''${1}d)
         fi
+
+        DOAS=$(command -v doas)
+
+        # Run as the current user (as well as root) to clean up hm generations
+        nix-collect-garbage ''${GC_ARGS[@]}
+        if [ -n $DOAS ] ; then
+          $DOAS nix-collect-garbage ''${GC_ARGS[@]}
+        fi
+
         df -h
         date
       }

nix-conf/machines/djmuk2/configuration.nix

@@ -69,6 +69,8 @@
    ];
 
    nix.settings.trusted-users = [ "root" "djm" ];
+   nix.optimise.automatic = true;
+   nix.optimise.dates = [ "03:00" ];
 
    i18n.defaultLocale = "en_GB.UTF-8";
 

nix-conf/machines/edrahil/configuration.nix

@@ -73,6 +73,8 @@
    ];
 
    nix.settings.trusted-users = [ "root" "djm" ];
+   nix.optimise.automatic = true;
+   nix.optimise.dates = [ "03:00" ];
 
    i18n.defaultLocale = "en_GB.UTF-8";