Flake update, and fixing side window sizes
This commit is contained in:
Generated
+9
-9
@@ -25,11 +25,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1779969295,
|
||||
"narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=",
|
||||
"lastModified": 1782233665,
|
||||
"narHash": "sha256-h/xOtrByoA/Ak1lWHn0O1lVZz4qWYbwOSLQ8YSwQO0I=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "61e2c9659324181e0f0ed911958c536333b1d4f6",
|
||||
"rev": "062581938b4a378a82dfbb294b494808157153a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -65,11 +65,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1779604987,
|
||||
"narHash": "sha256-ZQ5z+fVhxYKtIFwtqGp5O0PD84BM1riASvqDaN5Xs+s=",
|
||||
"lastModified": 1782030356,
|
||||
"narHash": "sha256-h4WpMr455AfRub0FXBaon6Vcpe0waUyJ4GivIW6oyd4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "8fba98c80b48fa013820e0163c5096922fea4ddd",
|
||||
"rev": "3017088b49efd404f78e3b104f553b97e4af786b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -80,11 +80,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1779560665,
|
||||
"narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
|
||||
"lastModified": 1781577229,
|
||||
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
|
||||
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -171,11 +171,7 @@ are still Redbook-specific; ideally I'd find another way to install them.
|
||||
{pkgs, kube, ...}:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
aws-iam-authenticator
|
||||
awscli2
|
||||
kube
|
||||
kubectl
|
||||
mariadb.client
|
||||
postgresql
|
||||
openssh
|
||||
];
|
||||
|
||||
@@ -206,7 +202,9 @@ These programs require a full desktop environment:
|
||||
{pkgs, ...}:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
linear
|
||||
slack
|
||||
teams
|
||||
];
|
||||
}
|
||||
#+END_SRC
|
||||
@@ -987,6 +985,23 @@ windows. I place windows in the bottom or on the right mostly depending on how w
|
||||
content to be.
|
||||
|
||||
#+BEGIN_SRC elisp
|
||||
(defun jf/100-px-window (window)
|
||||
(let* ((desired (min (/ (frame-width) 2) 101))
|
||||
(current (window-width window))
|
||||
(delta (- desired current)))
|
||||
(window-resize window delta :horizontal t)))
|
||||
|
||||
(defun jf/enforce-right-side-heights (win)
|
||||
(let ((slot-heights '((-1 . 10)))
|
||||
(parent (window-parent win)))
|
||||
(when parent
|
||||
(let ((child (window-child parent)))
|
||||
(while child
|
||||
(when-let* (((eq (window-parameter child 'window-side) 'right))
|
||||
(height (alist-get (window-parameter child 'window-slot) slot-heights)))
|
||||
(window-resize child (- height (window-height child))))
|
||||
(setq child (window-next-sibling child)))))))
|
||||
|
||||
(setq display-buffer-alist
|
||||
'(((or "\\*Flymake diagnostics .*"
|
||||
"\\*Embark Export: .*"
|
||||
@@ -999,7 +1014,8 @@ content to be.
|
||||
"\\*EGLOT connections\\*"
|
||||
"\\*trace-output\\*"
|
||||
"\\*occur\\*"
|
||||
".*eshell\\*")
|
||||
".*eshell\\*"
|
||||
"\\*SQL: .*")
|
||||
(display-buffer-in-side-window)
|
||||
(side . bottom)
|
||||
(slot . 0)
|
||||
@@ -1009,25 +1025,28 @@ content to be.
|
||||
((or "magit: *"
|
||||
"magit-revision: .*"
|
||||
"magit-log*"
|
||||
"\\*eldoc\\*"
|
||||
"\\*Help\\*"
|
||||
"\\*rustfmt\\*"
|
||||
"\\*slack: .*"
|
||||
"\\*forge: .*"
|
||||
"new-pullreq"
|
||||
"\\*claude:.*"
|
||||
"\\*Man .*")
|
||||
"\\*Man .*"
|
||||
"\\*List .*")
|
||||
(display-buffer-reuse-window display-buffer-in-side-window)
|
||||
(side . right)
|
||||
(slot . 0)
|
||||
(window-width . 0.5)
|
||||
(window-width . jf/100-px-window)
|
||||
(window-height . jf/enforce-right-side-heights)
|
||||
(window-parameters (no-delete-other-windows . t)
|
||||
(no-other-window . t)))
|
||||
("\\*Embark Actions\\*"
|
||||
((or "\\*Embark Actions\\*"
|
||||
"\\*eldoc\\*")
|
||||
(display-buffer-in-side-window)
|
||||
(side . right)
|
||||
(slot . -1)
|
||||
(window-width . 0.5)
|
||||
(window-width . jf/100-px-window)
|
||||
(window-height . jf/enforce-right-side-heights)
|
||||
(window-parameters (no-delete-other-windows . t)
|
||||
(no-other-window . t)))))
|
||||
|
||||
@@ -1159,7 +1178,7 @@ Just "silently" wrap when searching at the bottom of a document.
|
||||
jq-mode
|
||||
(lispy.overrideAttrs {
|
||||
packageRequires = [
|
||||
ace-window iedit swiper zoutline
|
||||
ace-window iedit swiper zoutline hydra
|
||||
];
|
||||
ignoreCompilationError = true;
|
||||
})
|
||||
@@ -1361,7 +1380,7 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
|
||||
(push '(typescript-mode . typescript-ts-mode) major-mode-remap-alist)
|
||||
(push '("\\.tsx\\'" . tsx-mode) auto-mode-alist)
|
||||
(push '(tsx-mode . tsx-ts-mode) major-mode-remap-alist)
|
||||
(setopt typescript-ts-mode-indent-offset 4)
|
||||
(setopt typescript-ts-mode-indent-offset 2)
|
||||
(with-eval-after-load 'typescript-ts-mode
|
||||
(defun my-tsx-ts-mode--indent-compatibility-b893426 ()
|
||||
"Indent rules helper, to handle different releases of tree-sitter-tsx.
|
||||
|
||||
Reference in New Issue
Block a user