From 7aa49f1c0c1045d71b87529f9cc5eb8949421cb6 Mon Sep 17 00:00:00 2001 From: Joe Frikker Date: Sat, 31 Jan 2026 13:39:52 -0500 Subject: [PATCH] wip --- flake.lock | 12 +++--- home.org | 118 ++++++++++++++++++++++++++--------------------------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index 5216f3b..112172a 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1767910483, - "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=", + "lastModified": 1768949235, + "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=", "owner": "nix-community", "repo": "home-manager", - "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c", + "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767799921, - "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", + "lastModified": 1769318308, + "narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", + "rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c", "type": "github" }, "original": { diff --git a/home.org b/home.org index 6868ff2..bb40f56 100644 --- a/home.org +++ b/home.org @@ -130,7 +130,7 @@ are still Shibumi-specific; ideally I'd find another way to install them. #+BEGIN_SRC nix aws-iam-authenticator - awscli + awscli2 iosevka kube kubectl @@ -650,8 +650,8 @@ Turn off some default settings that I don't find useful. (scroll-bar-mode -1) (tool-bar-mode -1) (setq make-backup-files nil) - (setq split-window-threshold 200) - (setq split-height-threshold 200) + (setq split-width-threshold 200) + (setq split-height-threshold nil) (setopt display-buffer-base-action '((display-buffer-reuse-window display-buffer-same-window display-buffer-in-previous-window @@ -834,53 +834,51 @@ windows. I place windows in the bottom or on the right mostly depending on how w content to be. #+BEGIN_SRC elisp :noweb no :noweb-ref emacs_config - (cl-flet ((defbottom (&optional (slot 1)) - (lambda (rule) - `(,rule - (display-buffer-reuse-window display-buffer-in-side-window) - (side . bottom) - (slot . ,slot) - (window-height . 0.33) - (window-parameters (no-delete-other-windows . t))))) - (defright (&optional (slot 0)) - (lambda (rule) - `(,rule - (display-buffer-reuse-window display-buffer-in-side-window) + (setopt display-buffer-alist + '(((or "\\*Flymake diagnostics *" + "\\*Embark Export *" + "\\*Embark Collect *" + "\\*xref*" + "\\*compilation\\*" + "\\*sly-mrepl *" + "\\*Messages\\*" + "\\*lispy-message\\*" + "\\*EGLOT connections\\*" + "\\*trace-output\\*" + "\\*occur\\*" + "*eshell\\*") + (display-buffer-reuse-window display-buffer-in-side-window) + (side . bottom) + (slot . 0) + (window-height . 0.33) + (window-parameters (no-delete-other-windows . t) + (no-other-window . t))) + ((or "magit: *" + "magit-revision: *" + "\\*eldoc\\*" + "\\*Help\\*" + "\\*rustfmt\\*" + "\\*slack: *" + "\\*forge: *" + "new-pullreq") + (display-buffer-reuse-window display-buffer-in-side-window) + (side . right) + (slot . 0) + (window-width . 0.5) + (window-parameters (no-delete-other-windows . t) + (no-other-window . t))) + ("\\*Embark Actions\\*" + (display-buffer-reuse-window display-buffer-in-side-window) (side . right) - (slot . ,slot) + (slot . -1) (window-width . 0.5) - (window-parameters (no-delete-other-windows . t))))) - (defall (def &rest rules) - (mapcar (lambda (rule) (funcall def rule)) rules))) - (let* ((bottom-window-params '((side . bottom) - (slot . 1) - (window-height . 0.33) - (window-parameters (no-delete-other-windows . t)))) - (right-window-params '((side . right) - (window-width . 0.5) - (window-parameters (no-delete-other-windows . t)))) - (right-window-slot-1-params (cons '(slot . 1) right-window-params))) - (setopt display-buffer-alist - (append - (defall (defbottom) - "\\*Flymake diagnostics *" - "\\*Embark Export *" - "\\*Embark Collect *" - "\\*xref*" - "\\*compilation\\*" - "\\*sly-mrepl *" - "\\*Messages\\*" - "\\*lispy-message\\*" - "\\*EGLOT connections\\*" - "\\*trace-output\\*" - "\\*occur\\*") - (defall (defright) - "magit: *" - "magit-revision: *" - "\\*eldoc\\*" - "\\*Help\\*") - (defall (defright -1) - "\\*Embark Actions\\*"))))) + (window-parameters (no-delete-other-windows . t) + (no-other-window . t))))) + + (setopt window-persistent-parameters + (cl-list* '(no-delete-other-windows . writable) + '(no-other-window . writable) + window-persistent-parameters)) #+END_SRC ** Editing @@ -935,7 +933,7 @@ its own devil-mode-only repeat maps that don't interfere when using normal modif ((or god-local-mode buffer-read-only) 'box) (t 'bar)))) - (add-hook 'post-command-hook #'my-god-mode-update-cursor-type) + (add-hook 'post-command-hook 'my-god-mode-update-cursor-type) (which-key-enable-god-mode-support)) #+END_SRC @@ -1218,15 +1216,15 @@ available? It seems to work for now anyway... (add-hook 'prog-mode-hook 'jf-init-fill-column) (add-hook 'java-mode-hook (lambda () (c-set-offset 'arglist-intro '+))) - (dolist (hook - (list 'grep-mode-hook - 'flymake-project-diagnostics-mode-hook - 'xref--xref-buffer-mode-hook - 'embark-collect-mode-hook - 'compilation-mode-hook - 'sly-mrepl-mode-hook - 'eglot-list-connections-mode-hook)) - (add-hook hook 'tab-line-mode)) + ;; (dolist (hook + ;; (list 'grep-mode-hook + ;; 'flymake-project-diagnostics-mode-hook + ;; 'xref--xref-buffer-mode-hook + ;; 'embark-collect-mode-hook + ;; 'compilation-mode-hook + ;; 'sly-mrepl-mode-hook + ;; 'eglot-list-connections-mode-hook)) + ;; (add-hook hook 'tab-line-mode)) (setq ediff-split-window-function 'split-window-horizontally) #+END_SRC @@ -1270,7 +1268,9 @@ available? It seems to work for now anyway... (remove-hook 'magit-status-headers-hook 'magit-insert-tags-header)) (use-package forge - :after magit) + :after magit + :custom + (forge-edit-post-hook '(forge-create-pullreq-insert-single-commit-message))) (use-package diff-hl :after magit