From 6cf8fc5ef588f09e6adc107b4d7dc4df7d358990 Mon Sep 17 00:00:00 2001
From: cupcakearmy <hi@nicco.io>
Date: Fri, 8 Aug 2025 19:59:01 +0200
Subject: [PATCH] add nvs overlay

---
 cask.nix      |  1 +
 flake.nix     | 27 +--------------------------
 home/home.nix |  4 ++++
 home/pkgs.nix |  3 +++
 overlay.nix   | 27 +++++++++++++++++++++++++++
 5 files changed, 36 insertions(+), 26 deletions(-)
 create mode 100644 overlay.nix

diff --git a/cask.nix b/cask.nix
index 206b52a..9424ca7 100644
--- a/cask.nix
+++ b/cask.nix
@@ -31,6 +31,7 @@
   "zen"
   "bitwarden"
   "spotify"
+  "tidal"
   "slack"
   "yubico-authenticator"
   "mediahuman-audio-converter"
diff --git a/flake.nix b/flake.nix
index 079d0ed..12c0206 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,31 +21,6 @@
     let
       hosts = import ./hosts;
       inherit (builtins) listToAttrs;
-      overlay = final: prev: {
-        nvs = prev.buildGoModule rec {
-          pname = "nvs";
-          version = "1.10.5";
-
-          src = prev.fetchFromGitHub {
-            owner = "y3owk1n";
-            repo = pname;
-            tag = "v${version}";
-            sha256 = "sha256-Qp5c2F383Z0MxTtDt3wmLgxiAwfIJWupVDCePrBxNQI=";
-          };
-
-          # # Add completion generation
-          nativeBuildInputs = [ prev.installShellFiles ];
-          postInstall = ''
-            export HOME=$TMPDIR
-            installShellCompletion --cmd nvs \
-              --bash <($out/bin/nvs completion bash) \
-              --fish <($out/bin/nvs completion fish) \
-              --zsh <($out/bin/nvs completion zsh)
-          '';
-
-          vendorHash = "sha256-l2FdnXA+vKVRekcIKt1R+MxppraTsmo0b/B7RNqnxjA=";
-        };
-      };
     in
     {
       darwinConfigurations = listToAttrs (
@@ -58,7 +33,7 @@
             };
             modules = [
               {
-                nixpkgs.overlays = [ overlay ];
+                nixpkgs.overlays = [ (import ./overlay.nix) ];
               }
               (import ./darwin.nix)
               home-manager.darwinModules.home-manager
diff --git a/home/home.nix b/home/home.nix
index ecb8614..657a528 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -54,6 +54,7 @@
       px = "pnpm -s dlx";
       n = "fnm use --install-if-missing";
       c = "pwd | pbcopy";
+      k = "kubectl";
 
       vai = "sudo darwin-rebuild switch --flake ~/.config/nix-macos#${host.hostName}";
     };
@@ -72,6 +73,9 @@
         if type -q fnm
           fnm env --use-on-cd | source
         end
+        if type -q nvs
+          nvs env --source | source
+        end
       '';
     };
     bash = {
diff --git a/home/pkgs.nix b/home/pkgs.nix
index dfd9ce7..b0aa461 100644
--- a/home/pkgs.nix
+++ b/home/pkgs.nix
@@ -42,6 +42,9 @@ with pkgs;
   lazydocker
   exercism
   posting
+  terraform
+  k9s
+  kubectl
 
   # Editor
   nvs
diff --git a/overlay.nix b/overlay.nix
new file mode 100644
index 0000000..4888f02
--- /dev/null
+++ b/overlay.nix
@@ -0,0 +1,27 @@
+final: prev: {
+  nvs = prev.buildGoModule rec {
+    pname = "nvs";
+    version = "1.10.5";
+
+    src = prev.fetchFromGitHub {
+      owner = "cupcakearmy";
+      repo = pname;
+      # tag = "v${version}";
+      rev = "1700f2751e969b77b7f7ab3cc16a4e0f3955ce14";
+      sha256 = "sha256-RScXYxkrfLJp1nAgN2YgSRC4mLGK4yXsYjGBrDR00b8=";
+    };
+
+    vendorHash = "sha256-l2FdnXA+vKVRekcIKt1R+MxppraTsmo0b/B7RNqnxjA=";
+
+    # Completions
+    nativeBuildInputs = [ prev.installShellFiles ];
+    postInstall = ''
+      export HOME=$TMPDIR
+      installShellCompletion --cmd nvs \
+        --bash <($out/bin/nvs completion bash) \
+        --fish <($out/bin/nvs completion fish) \
+        --zsh <($out/bin/nvs completion zsh)
+    '';
+
+  };
+}