From 2941c39e4bbc2f0434f64da538ac8506097648c6 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Mon, 27 Apr 2026 12:47:16 +0200 Subject: [PATCH] Update everything, fix opencode/nvim stuff --- flake.lock | 54 ++++++++++++++++++------------------- lib/mksystem.nix | 2 ++ modules/cli/default.nix | 6 +++++ modules/cli/home.nix | 2 ++ modules/cli/zsh/init.zsh | 10 +++++++ modules/wm/default.nix | 5 ---- nvim/default.nix | 6 ++++- nvim/lua/jj-snacks.lua | 4 +-- nvim/lua/plugins/snacks.lua | 20 ++++++++++++++ nvim/nix/pack.nix | 6 +++-- overlays/default.nix | 2 ++ 11 files changed, 80 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 69dc7ed..8a6c019 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1776661682, - "narHash": "sha256-X32LTSDqUdVqMy85WYdRgyt0I75wc4Lhi9j+lrCDR8w=", + "lastModified": 1777258755, + "narHash": "sha256-EC07KwADRE2LdIk7vEDyAaD3I0ZUq24T9jQF9L0iEPk=", "owner": "nix-community", "repo": "home-manager", - "rev": "4bfce11ea820df0359f73736fd59c7e8f53641a6", + "rev": "7f8bbc93d63401e41368d6ddc46a4f631610fa90", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1776643520, - "narHash": "sha256-O6lIvHkvuYNG7WovtyOGu+Z1vYkr/DB2YDF6PchsT/A=", + "lastModified": 1777248294, + "narHash": "sha256-QuwT4KoRh6y3CB5I6zxrcLNP7d/tDr7EonA3okTHZIA=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "4a27c9c5416c624fc35ec0607a9f7ddeb59e7c99", + "rev": "429e65b3d2978c6c5ca3a7c51c4ce4e3bafbcc20", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1776639951, - "narHash": "sha256-R/STk7D50lC0W6DTu/L+U3IYbd/IJFgikGdwrHbJXU4=", + "lastModified": 1777244573, + "narHash": "sha256-iZ3pkuWVNGAcHgLTmGFWwa1IP87UErcOVd/0dd/N2Ms=", "owner": "neovim", "repo": "neovim", - "rev": "5f6abd34f5c12534df0d79ee3507d40106ad505d", + "rev": "f69aadd2b4e7e415500188e46f2db175c06f3406", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1776575850, - "narHash": "sha256-28Gqz0GDpGsBv8GtAn2dywEQRr+CtTDsD5J7VD6icBE=", + "lastModified": 1777181277, + "narHash": "sha256-yVJbd07ortDRAttDFmDV5p220aOLTHgVAx//0nW/xW8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "3b9653a107c736222b5ae0d4036dd3b885219065", + "rev": "b8eb7acee0f7604fe1bf6a5b3dcf5254369180fa", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1775490113, - "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", + "lastModified": 1776983936, + "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", + "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61", "type": "github" }, "original": { @@ -217,11 +217,11 @@ ] }, "locked": { - "lastModified": 1776685616, - "narHash": "sha256-zCG5gCOrBvyqcXcxPyQlb3bGIyHC+9rYIH0EsQ0LP6M=", + "lastModified": 1776910211, + "narHash": "sha256-0ku3gW8bZ9TTpEU2fQw86oU6ZLT2vF6pacF+cLaf7VY=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "2f0a24bbe7cefdce7e3cbb4df157052d248facc3", + "rev": "4e6cad241baa0115a7aae8c55b04c166da4997c9", "type": "github" }, "original": { @@ -264,11 +264,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1776329215, - "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=", + "lastModified": 1776949667, + "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b86751bc4085f48661017fa226dee99fab6c651b", + "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "tmux": { "flake": false, "locked": { - "lastModified": 1776266495, - "narHash": "sha256-4PK44+K5IuV8v/cw+HvZHfqzZEEvelG/Bm5HNL/ozNY=", + "lastModified": 1777234756, + "narHash": "sha256-6kOc6Dnlej133lKt8RMdoQbe/km012j1iwoAWCHFuxY=", "owner": "tmux", "repo": "tmux", - "rev": "dd62c2f9467f975388f4a2701022752961bdb086", + "rev": "61a7be0eab8eb63f15a364b605ba4dfbd6025331", "type": "github" }, "original": { @@ -336,11 +336,11 @@ ] }, "locked": { - "lastModified": 1775710180, - "narHash": "sha256-sCokvdNvl8zIzsnjgG0TN5h3RUI7GJyWW9ErfmEj0rM=", + "lastModified": 1777092705, + "narHash": "sha256-qKMvM2+eKusg6H6lG2bwDdFjNi1XfEjdLD5xIt8ZgFs=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "2c138beb648d1cbbfae76695a8230ee04e4db25a", + "rev": "10f5c809db4f8e7badb6d505924ebbaaeefda4e4", "type": "github" }, "original": { diff --git a/lib/mksystem.nix b/lib/mksystem.nix index e169478..4369801 100644 --- a/lib/mksystem.nix +++ b/lib/mksystem.nix @@ -116,6 +116,8 @@ in extraGroups = [ "wheel" "input" + "video" + "render" "docker" "audio" "mlocate" diff --git a/modules/cli/default.nix b/modules/cli/default.nix index a5f1375..274a078 100644 --- a/modules/cli/default.nix +++ b/modules/cli/default.nix @@ -27,6 +27,12 @@ services.avahi = { enable = true; nssmdns4 = true; + openFirewall = true; + publish = { + enable = true; + addresses = true; + workstation = true; + }; }; services.automatic-timezoned.enable = true; diff --git a/modules/cli/home.nix b/modules/cli/home.nix index 47096ec..7bf1b2f 100644 --- a/modules/cli/home.nix +++ b/modules/cli/home.nix @@ -25,6 +25,8 @@ app_exit = "q"; input_submit = "ctrl+s"; input_newline = "return"; + input_undo = "ctrl+y"; + input_redo = "ctrl+shift+y"; }; }; }; diff --git a/modules/cli/zsh/init.zsh b/modules/cli/zsh/init.zsh index c9c63c8..c79666d 100644 --- a/modules/cli/zsh/init.zsh +++ b/modules/cli/zsh/init.zsh @@ -112,6 +112,16 @@ _kgy() { } compdef _kgy kgy +kubectl-top-ephemeral() { + ( + echo "Namespace Pod Ephemeral-used" + for i in $(kubectl get node -o=jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}'); do + kubectl get --raw "/api/v1/nodes/$i/proxy/stats/summary" | jq -r '.pods[]| [ .podRef.namespace, .podRef.name, ."ephemeral-storage".usedBytes ]|@tsv' + done + ) | column -t | (read -r; printf "%s\n" "$REPLY"; sort -rn -k3) | head -21 +} + + alias copyfile="osc copy" copypath() { local file="${1:-.}" diff --git a/modules/wm/default.nix b/modules/wm/default.nix index 5d39f2e..c71c4b2 100644 --- a/modules/wm/default.nix +++ b/modules/wm/default.nix @@ -48,9 +48,4 @@ "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}" "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}" ]; - - services.sunshine = { - enable = true; - capSysAdmin = true; - }; } diff --git a/nvim/default.nix b/nvim/default.nix index d5c2c87..0382008 100644 --- a/nvim/default.nix +++ b/nvim/default.nix @@ -28,7 +28,10 @@ in configure.packages.catppuccin-nvim.start = [pkgs.vimPlugins.catppuccin-nvim]; }; in - pkgs.runCommand "catppuccin-nvim" {} '' + pkgs.runCommand "catppuccin-nvim" { + pname = "catppuccin-nvim"; + version = pkgs.vimPlugins.catppuccin-nvim.version; + } '' mkdir -p $out cp -r --no-preserve=mode,ownership ${pkgs.vimPlugins.catppuccin-nvim}/* $out rm -rf $out/doc $out/colors/* @@ -108,6 +111,7 @@ in virt-column-nvim opencode-nvim + nvim-unception ]; opt = [ ]; }; diff --git a/nvim/lua/jj-snacks.lua b/nvim/lua/jj-snacks.lua index dbe7807..1f7cf40 100644 --- a/nvim/lua/jj-snacks.lua +++ b/nvim/lua/jj-snacks.lua @@ -264,12 +264,12 @@ Snacks.picker.jj_show = function(ref) jj_gsplit = function(picker, item) picker:close() local commit = vim.trim(vim.fn.system({ "jj", "show", ref, "--template", "commit_id", "--no-patch" })) - vim.cmd('Gvsplit ' .. vim.fn.fnameescape(commit .. ':' .. item.file)) + vim.cmd('Gsplit ' .. vim.fn.fnameescape(commit .. ':' .. item.file)) end, jj_gvsplit = function(picker, item) picker:close() local commit = vim.trim(vim.fn.system({ "jj", "show", ref, "--template", "commit_id", "--no-patch" })) - vim.cmd('Gsplit ' .. vim.fn.fnameescape(commit .. ':' .. item.file)) + vim.cmd('Gvsplit ' .. vim.fn.fnameescape(commit .. ':' .. item.file)) end, }, }) diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua index 2c0af0f..132e2fd 100644 --- a/nvim/lua/plugins/snacks.lua +++ b/nvim/lua/plugins/snacks.lua @@ -100,6 +100,7 @@ return { } }, picker = { + main = { current = true }, win = { input = { keys = { @@ -265,6 +266,25 @@ return { require(".jj-snacks") Snacks.picker.git_show = git_show + vim.g.unception_block_while_host_edits = 1 + vim.api.nvim_create_autocmd("User", { + pattern = "UnceptionEditRequestReceived", + callback = function() + for _, terminal in ipairs(Snacks.terminal.list()) do + if terminal.opts.fixbuf ~= false then + terminal.opts.fixbuf = false + vim.api.nvim_create_autocmd("BufEnter", { + buffer = terminal.buf, + once = true, + callback = function() + terminal.opts.fixbuf = true + end, + }) + end + end + end, + }) + vim.keymap.set("n", "zz", function() Snacks.zen() end, { desc = "Toggle zen mode" }) vim.keymap.set("n", "f", function() diff --git a/nvim/nix/pack.nix b/nvim/nix/pack.nix index 718f2f3..cfb69fe 100644 --- a/nvim/nix/pack.nix +++ b/nvim/nix/pack.nix @@ -57,7 +57,7 @@ ps: builtins.concatMap (f: f ps) deps; # Combined plugin - combinedPlugin = pkgs.vimUtils.toVimPlugin ( + combinedPlugin = (pkgs.vimUtils.toVimPlugin ( pkgs.buildEnv { name = "plugin-pack"; paths = overriddenPlugins; @@ -71,7 +71,9 @@ inherit python3Dependencies; }; } - ); + )).overrideAttrs (prev: { + pname = prev.pname or "vimplugin-plugin-pack"; + }); # Combined plugin configs combinedConfig = builtins.concatStringsSep "\n" ( diff --git a/overlays/default.nix b/overlays/default.nix index 7c52b8a..9580154 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -3,6 +3,8 @@ super.symlinkJoin { name = drv.name; paths = [drv]; + meta = drv.meta or {}; + passthru = drv.passthru or {}; buildInputs = [super.makeWrapper]; postBuild = super.lib.concatStrings (map (bin: '' wrapProgram $out/bin/${bin} \