From b762b06f05ac6881614cc52bb6207105228ea81a Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Fri, 12 Dec 2025 14:15:19 -0500 Subject: [PATCH] cleanup? --- home/k9s.nix | 4 ++-- home/krew.nix | 12 +++++++----- modules/common/overlays.nix | 3 +++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/home/k9s.nix b/home/k9s.nix index b4fcac1..9fb883b 100644 --- a/home/k9s.nix +++ b/home/k9s.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { programs.k9s = { enable = true; - package = pkgs.k9sLatest; + package = pkgs.k9s; settings.k9s = { refreshRate = "2s"; liveViewAutoRefresh = false; @@ -13,7 +13,7 @@ skipLatestRevCheck = false; skin = { - catppuccin-mocha = ../defaults/k9s-skins/catppuccin-mocha.yml; + catppuccin-mocha = ../defaults/k9s/catppuccin-mocha.yaml; }; ui = { diff --git a/home/krew.nix b/home/krew.nix index 1cf929e..c237ec8 100644 --- a/home/krew.nix +++ b/home/krew.nix @@ -1,12 +1,14 @@ { pkgs, lib, ... }: with pkgs; let - plugins = writeText "plugins" '' - krew - oidc-login - ''; + plugins = [ + "krew" + "oidc-login" + ]; in { home.activation.krew = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - $DRY_RUN_CMD ${krewfile}/bin/krewfile -command ${krew}/bin/krew -file ${plugins} + ${lib.concatMapStringsSep "\n" (plugin: '' + $DRY_RUN_CMD ${krew}/bin/kubectl-krew install ${plugin} || true + '') plugins} ''; } diff --git a/modules/common/overlays.nix b/modules/common/overlays.nix index c8ff98a..53aa1d5 100644 --- a/modules/common/overlays.nix +++ b/modules/common/overlays.nix @@ -5,6 +5,9 @@ final: prev: let rustc = rust_1_90_0; }; in { + xz = prev.xz.overrideAttrs (old: { + configureFlags = (old.configureFlags or []) ++ [ "--disable-sandbox" ]; + }); lazygitLatest = prev.lazygit.overrideAttrs (_: rec { version = "0.55.1"; src = prev.fetchFromGitHub {