From 6a9a49ec90619915fd885c913cca42f74a4a7ed9 Mon Sep 17 00:00:00 2001
From: Joseph Hanson <joe@veri.dev>
Date: Fri, 11 Oct 2024 12:12:09 -0500
Subject: [PATCH] Update talosctl to v1.8.1. Making overlay default.nix a bit
 more readable.

---
 nixos/overlays/default.nix          | 34 ++++++++++-------------------
 nixos/overlays/talosctl/default.nix | 13 +++++------
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/nixos/overlays/default.nix b/nixos/overlays/default.nix
index 9e8b8bb..786aa47 100644
--- a/nixos/overlays/default.nix
+++ b/nixos/overlays/default.nix
@@ -1,34 +1,23 @@
 { inputs, ... }:
 let
   inherit (inputs.nixpkgs) lib;
-
-  vivaldiOverlay = self: super: {
-    vivaldi = super.callPackage ./vivaldi { };
-  };
-
-  termiusOverlay = self: super: {
-    termius = super.callPackage ./termius { };
-  };
-
-  modsOverlay = self: super: {
-    mods = super.callPackage ./charm-mods { };
-  };
-
-  coderOverlay = self: super: {
-    coder = super.callPackage ./coder { };
-  };
-
-  smartmontoolsOverlay = import ./smartmontools { };
+  # smartmontoolsOverlay = import ./smartmontools { };
+  # vivaldiOverlay = self: super: { vivaldi = super.callPackage ./vivaldi { }; };
+  coderOverlay = self: super: { coder = super.callPackage ./coder { }; };
+  modsOverlay = self: super: { mods = super.callPackage ./charm-mods { }; };
+  talosctlOverlay = import ./talosctl { };
+  termiusOverlay = self: super: { termius = super.callPackage ./termius { }; };
 in
 {
+  # smartmontools = smartmontoolsOverlay;
+  # vivaldi = vivaldiOverlay;
   coder = coderOverlay;
   comm-packages = inputs.nix-vscode-extensions.overlays.default;
   mods = modsOverlay;
-  nur = inputs.nur.overlay;
-  # smartmontools = smartmontoolsOverlay;
-  termius = termiusOverlay;
-  # vivaldi = vivaldiOverlay;
   nix-minecraft = inputs.nix-minecraft.overlay;
+  nur = inputs.nur.overlay;
+  talosctl = talosctlOverlay;
+  termius = termiusOverlay;
 
   # The unstable nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.unstable'
@@ -38,5 +27,4 @@ in
       config.allowUnfree = true;
     };
   };
-
 }
diff --git a/nixos/overlays/talosctl/default.nix b/nixos/overlays/talosctl/default.nix
index 8d9a6ee..2f72a0a 100644
--- a/nixos/overlays/talosctl/default.nix
+++ b/nixos/overlays/talosctl/default.nix
@@ -1,19 +1,16 @@
 { ... }:
 let
-  finalVersion = "1.7.5";
+  finalVersion = "1.8.1";
 in
 final: prev: {
-  talosctl = prev.talosctl.overrideAttrs (oldAttrs: { 
+  talosctl = prev.talosctl.overrideAttrs (oldAttrs: {
     version = finalVersion;
     src = prev.fetchFromGitHub {
       owner = "siderolabs";
       repo = "talos";
       rev = "v${finalVersion}";
-      hash = "sha256-lmDLlxiPyVhlSPplYkIaS5Uw19hir6XD8MAk8q+obhY=";
-    };
-    vendorHash = "sha256-8UIey+r1tdVRN1RBK5xxcAzaHb0VFdgenUXSFgoWh1g=";
-    passthru = oldAttrs.passthru // {
-      updateScript = ./update.sh;
+      hash = "sha256-6WHeiVH/vZHiM4bqq3T5lC0ARldJyZtIErPeDgrZgxc=";
     };
+    vendorHash = "sha256-aTtvVpL979BUvSBwBqRqCWSWIBBmmty9vBD97Q5P4+E=";
   });
-}
\ No newline at end of file
+}