Brb/push qwxuvvokqzms #203

Open
nemith wants to merge 2 commits from brb/push-qwxuvvokqzms into main
nemith commented 2026-05-07 16:12:13 +00:00 (Migrated from github.com)
No description provided.
github-actions[bot] commented 2026-05-07 16:36:28 +00:00 (Migrated from github.com)

🔍 Package Changes - Home Manager (bbennett@bbennett-1)

Build target: .#homeConfigurations.bbennett@bbennett-1.activationPackage

Package differences
<<< old-result
>>> new-result
Version changes:
[U*]  #01  ansible-core                          2.20.4-fish-completions -> 2.20.5-fish-completions
[U*]  #02  btop                                  1.4.6, 1.4.6-fish-completions -> 1.4.7, 1.4.7-fish-completions
[U*]  #03  buf                                   1.68.2, 1.68.2-fish-completions -> 1.68.4, 1.68.4-fish-completions
[U.]  #04  catppuccin-delta                      0 -> 0-unstable-2025-10-14
[U.]  #05  catppuccin-k9s                        0 -> 0-unstable-2024-07-20
[U.]  #06  catppuccin-lazygit                    0 -> 0-unstable-2026-04-01
[U*]  #07  claude-code                           2.1.112, 2.1.112-fish-completions -> 2.1.123, 2.1.123-fish-completions
[U.]  #08  curl-impersonate                      1.5.2 -> 1.5.5
[U.]  #09  deno                                  2.7.12 -> 2.7.14
[U*]  #10  doppler                               3.75.3, 3.75.3-fish-completions -> 3.76.0, 3.76.0-fish-completions
[U*]  #11  fastfetch                             2.62.0, 2.62.0-fish-completions, 2.62.0-man -> 2.62.1, 2.62.1-fish-completions, 2.62.1-man
[U*]  #12  fzf                                   0.71.0, 0.71.0-fish-completions, 0.71.0-man -> 0.72.0, 0.72.0-fish-completions, 0.72.0-man
[U*]  #13  gh                                    2.90.0, 2.90.0-fish-completions -> 2.92.0, 2.92.0-fish-completions
[U*]  #14  glances                               4.5.3.2, 4.5.3.2-fish-completions -> 4.5.4, 4.5.4-fish-completions
[U*]  #15  gleam                                 1.15.4, 1.15.4-fish-completions -> 1.16.0, 1.16.0-fish-completions
[U*]  #16  golangci-lint                         2.11.4, 2.11.4-fish-completions -> 2.12.1, 2.12.1-fish-completions
[U*]  #17  htop                                  3.5.0, 3.5.0-fish-completions, 3.5.0-man -> 3.5.1, 3.5.1-fish-completions, 3.5.1-man
[U.]  #18  intel-media-driver                    26.1.2 -> 26.1.6
[U*]  #19  kubectl                               1.35.4, 1.35.4-fish-completions, 1.35.4-man -> 1.36.0, 1.36.0-fish-completions, 1.36.0-man
[U.]  #20  libblake3                             1.8.4 -> 1.8.5
[U.]  #21  mesa                                  26.0.5 -> 26.0.6
[U*]  #22  neovim                                0.12.1-bbennettNeovim, 0.12.1-bbennettNeovim-fish-completions -> 0.12.2-bbennettNeovim, 0.12.2-bbennettNeovim-fish-completions
[U.]  #23  neovim-unwrapped                      0.12.1 -> 0.12.2
[U*]  #24  nh                                    4.3.1, 4.3.1-fish-completions -> 4.3.2, 4.3.2-fish-completions
[U.]  #25  nh-unwrapped                          4.3.1 -> 4.3.2
[U.]  #26  nix                                   2.34.6 x2 -> 2.34.7 x2
[C.]  #27  nix-cmd                               2.30.4+1, 2.34.6 -> 2.30.5+1, 2.34.7
[C.]  #28  nix-expr                              2.30.4+1, 2.34.6 -> 2.30.5+1, 2.34.7
[C.]  #29  nix-fetchers                          2.30.4+1, 2.34.6 -> 2.30.5+1, 2.34.7
[C.]  #30  nix-flake                             2.30.4+1, 2.34.6 -> 2.30.5+1, 2.34.7
[U*]  #31  nix-index                             0.1.9-unstable-2026-02-05 x2, 0.1.9-unstable-2026-02-05-fish-completions -> 0.1.10 x2, 0.1.10-fish-completions
[C.]  #32  nix-main                              2.30.4+1, 2.34.6 -> 2.30.5+1, 2.34.7
[U.]  #33  nix-nswrapper                         2.34.6 -> 2.34.7
[C.]  #34  nix-store                             2.30.4+1, 2.34.6 -> 2.30.5+1, 2.34.7
[C.]  #35  nix-util                              2.30.4+1, 2.34.6 -> 2.30.5+1, 2.34.7
[U*]  #36  opencode                              1.14.19, 1.14.19-fish-completions -> 1.14.31, 1.14.31-fish-completions
[U.]  #37  python3.13-ansible-core               2.20.4 -> 2.20.5
[U.]  #38  python3.13-dulwich                    1.1.0 -> 1.2.0
[U.]  #39  python3.13-identify                   2.6.18 -> 2.6.19
[U.]  #40  python3.13-rapidfuzz                  3.14.3 -> 3.14.5
[U.]  #41  python3.13-yangson                    1.7.3 -> 1.7.5
[U*]  #42  ruff                                  0.15.11, 0.15.11-fish-completions -> 0.15.12, 0.15.12-fish-completions
[U*]  #43  sd-switch                             0.6.2 -> 0.6.3
[U*]  #44  starship                              1.24.2, 1.24.2-fish-completions -> 1.25.1, 1.25.1-fish-completions
[U*]  #45  stern                                 1.33.1, 1.33.1-fish-completions -> 1.34.0, 1.34.0-fish-completions
[U*]  #46  tree                                  2.3.1, 2.3.1-fish-completions, 2.3.1-man -> 2.3.2, 2.3.2-fish-completions, 2.3.2-man
[U.]  #47  tree-sitter-c-neovim                  0.12.1 -> 0.12.2
[U.]  #48  tree-sitter-lua-neovim                0.12.1 -> 0.12.2
[U.]  #49  tree-sitter-markdown-neovim           0.12.1 -> 0.12.2
[U.]  #50  tree-sitter-markdown_inline-neovim    0.12.1 -> 0.12.2
[U.]  #51  tree-sitter-query-neovim              0.12.1 -> 0.12.2
[U.]  #52  tree-sitter-vim-neovim                0.12.1 -> 0.12.2
[U.]  #53  tree-sitter-vimdoc-neovim             0.12.1 -> 0.12.2
[U*]  #54  uv                                    0.11.7, 0.11.7-fish-completions -> 0.11.8, 0.11.8-fish-completions
[D.]  #55  vimplugin-catppuccin-nvim             426dbeb -> 0-unstable-2026-04-06
[U.]  #56  vimplugin-conform.nvim                9.1.0-unstable-2026-03-10 -> 9.1.0-unstable-2026-04-23
[U.]  #57  vimplugin-luajit2.1-lualine.nvim-scm  3-unstable-scm-3 -> 4-unstable-scm-4
[U.]  #58  vimplugin-mini.nvim                   0.17.0-unstable-2026-04-17 -> 0.17.0-unstable-2026-05-01
Closure size: 1603 -> 1603 (311 paths added, 311 paths removed, delta +0, disk usage +185.8MiB).
## 🔍 Package Changes - Home Manager (bbennett@bbennett-1) **Build target:** `.#homeConfigurations.bbennett@bbennett-1.activationPackage` <details><summary>Package differences</summary> ``` <<< old-result >>> new-result Version changes: [U*] #01 ansible-core 2.20.4-fish-completions -> 2.20.5-fish-completions [U*] #02 btop 1.4.6, 1.4.6-fish-completions -> 1.4.7, 1.4.7-fish-completions [U*] #03 buf 1.68.2, 1.68.2-fish-completions -> 1.68.4, 1.68.4-fish-completions [U.] #04 catppuccin-delta 0 -> 0-unstable-2025-10-14 [U.] #05 catppuccin-k9s 0 -> 0-unstable-2024-07-20 [U.] #06 catppuccin-lazygit 0 -> 0-unstable-2026-04-01 [U*] #07 claude-code 2.1.112, 2.1.112-fish-completions -> 2.1.123, 2.1.123-fish-completions [U.] #08 curl-impersonate 1.5.2 -> 1.5.5 [U.] #09 deno 2.7.12 -> 2.7.14 [U*] #10 doppler 3.75.3, 3.75.3-fish-completions -> 3.76.0, 3.76.0-fish-completions [U*] #11 fastfetch 2.62.0, 2.62.0-fish-completions, 2.62.0-man -> 2.62.1, 2.62.1-fish-completions, 2.62.1-man [U*] #12 fzf 0.71.0, 0.71.0-fish-completions, 0.71.0-man -> 0.72.0, 0.72.0-fish-completions, 0.72.0-man [U*] #13 gh 2.90.0, 2.90.0-fish-completions -> 2.92.0, 2.92.0-fish-completions [U*] #14 glances 4.5.3.2, 4.5.3.2-fish-completions -> 4.5.4, 4.5.4-fish-completions [U*] #15 gleam 1.15.4, 1.15.4-fish-completions -> 1.16.0, 1.16.0-fish-completions [U*] #16 golangci-lint 2.11.4, 2.11.4-fish-completions -> 2.12.1, 2.12.1-fish-completions [U*] #17 htop 3.5.0, 3.5.0-fish-completions, 3.5.0-man -> 3.5.1, 3.5.1-fish-completions, 3.5.1-man [U.] #18 intel-media-driver 26.1.2 -> 26.1.6 [U*] #19 kubectl 1.35.4, 1.35.4-fish-completions, 1.35.4-man -> 1.36.0, 1.36.0-fish-completions, 1.36.0-man [U.] #20 libblake3 1.8.4 -> 1.8.5 [U.] #21 mesa 26.0.5 -> 26.0.6 [U*] #22 neovim 0.12.1-bbennettNeovim, 0.12.1-bbennettNeovim-fish-completions -> 0.12.2-bbennettNeovim, 0.12.2-bbennettNeovim-fish-completions [U.] #23 neovim-unwrapped 0.12.1 -> 0.12.2 [U*] #24 nh 4.3.1, 4.3.1-fish-completions -> 4.3.2, 4.3.2-fish-completions [U.] #25 nh-unwrapped 4.3.1 -> 4.3.2 [U.] #26 nix 2.34.6 x2 -> 2.34.7 x2 [C.] #27 nix-cmd 2.30.4+1, 2.34.6 -> 2.30.5+1, 2.34.7 [C.] #28 nix-expr 2.30.4+1, 2.34.6 -> 2.30.5+1, 2.34.7 [C.] #29 nix-fetchers 2.30.4+1, 2.34.6 -> 2.30.5+1, 2.34.7 [C.] #30 nix-flake 2.30.4+1, 2.34.6 -> 2.30.5+1, 2.34.7 [U*] #31 nix-index 0.1.9-unstable-2026-02-05 x2, 0.1.9-unstable-2026-02-05-fish-completions -> 0.1.10 x2, 0.1.10-fish-completions [C.] #32 nix-main 2.30.4+1, 2.34.6 -> 2.30.5+1, 2.34.7 [U.] #33 nix-nswrapper 2.34.6 -> 2.34.7 [C.] #34 nix-store 2.30.4+1, 2.34.6 -> 2.30.5+1, 2.34.7 [C.] #35 nix-util 2.30.4+1, 2.34.6 -> 2.30.5+1, 2.34.7 [U*] #36 opencode 1.14.19, 1.14.19-fish-completions -> 1.14.31, 1.14.31-fish-completions [U.] #37 python3.13-ansible-core 2.20.4 -> 2.20.5 [U.] #38 python3.13-dulwich 1.1.0 -> 1.2.0 [U.] #39 python3.13-identify 2.6.18 -> 2.6.19 [U.] #40 python3.13-rapidfuzz 3.14.3 -> 3.14.5 [U.] #41 python3.13-yangson 1.7.3 -> 1.7.5 [U*] #42 ruff 0.15.11, 0.15.11-fish-completions -> 0.15.12, 0.15.12-fish-completions [U*] #43 sd-switch 0.6.2 -> 0.6.3 [U*] #44 starship 1.24.2, 1.24.2-fish-completions -> 1.25.1, 1.25.1-fish-completions [U*] #45 stern 1.33.1, 1.33.1-fish-completions -> 1.34.0, 1.34.0-fish-completions [U*] #46 tree 2.3.1, 2.3.1-fish-completions, 2.3.1-man -> 2.3.2, 2.3.2-fish-completions, 2.3.2-man [U.] #47 tree-sitter-c-neovim 0.12.1 -> 0.12.2 [U.] #48 tree-sitter-lua-neovim 0.12.1 -> 0.12.2 [U.] #49 tree-sitter-markdown-neovim 0.12.1 -> 0.12.2 [U.] #50 tree-sitter-markdown_inline-neovim 0.12.1 -> 0.12.2 [U.] #51 tree-sitter-query-neovim 0.12.1 -> 0.12.2 [U.] #52 tree-sitter-vim-neovim 0.12.1 -> 0.12.2 [U.] #53 tree-sitter-vimdoc-neovim 0.12.1 -> 0.12.2 [U*] #54 uv 0.11.7, 0.11.7-fish-completions -> 0.11.8, 0.11.8-fish-completions [D.] #55 vimplugin-catppuccin-nvim 426dbeb -> 0-unstable-2026-04-06 [U.] #56 vimplugin-conform.nvim 9.1.0-unstable-2026-03-10 -> 9.1.0-unstable-2026-04-23 [U.] #57 vimplugin-luajit2.1-lualine.nvim-scm 3-unstable-scm-3 -> 4-unstable-scm-4 [U.] #58 vimplugin-mini.nvim 0.17.0-unstable-2026-04-17 -> 0.17.0-unstable-2026-05-01 Closure size: 1603 -> 1603 (311 paths added, 311 paths removed, delta +0, disk usage +185.8MiB). ``` </details>
This pull request has changes conflicting with the target branch.
  • flake.lock
  • home/programs/default.nix
  • home/roles/devel-gui.nix
  • lib/overlays.nix
  • modules/zed.nix
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin brb/push-qwxuvvokqzms:brb/push-qwxuvvokqzms
git switch brb/push-qwxuvvokqzms

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff brb/push-qwxuvvokqzms
git switch brb/push-qwxuvvokqzms
git rebase main
git switch main
git merge --ff-only brb/push-qwxuvvokqzms
git switch brb/push-qwxuvvokqzms
git rebase main
git switch main
git merge --no-ff brb/push-qwxuvvokqzms
git switch main
git merge --squash brb/push-qwxuvvokqzms
git switch main
git merge --ff-only brb/push-qwxuvvokqzms
git switch main
git merge brb/push-qwxuvvokqzms
git push origin main
Sign in to join this conversation.
No description provided.