nixos/home/jahanson/workstation.nix

@@ -33,7 +33,7 @@ with config;
         termius
         obsidian
         jetbrains.datagrip
-        talosctl
+        # talosctl
 
         # cli
         brightnessctl

nixos/overlays/default.nix

@@ -4,20 +4,15 @@ let
     inherit (inputs.nixpkgs) lib;
   };
   termiusOverlay = import ./termius { };
-  # Partial overlay
-  # talosctlOverlay = import ./talosctl { };
-  # Full overlay
-  talosctlOverlay = self: super: {
-    talosctl = super.callPackage ./talosctl/talosctl-custom.nix { };
-  };
+  talosctlOverlay = import ./talosctl { };
   goOverlay = import ./go { };
 in
 {
   nur = inputs.nur.overlay;
   warp-terminal = warpTerminalOverlay;
   termius = termiusOverlay;
-  talosctl = talosctlOverlay;
-  go = goOverlay;
+  # talosctl = talosctlOverlay;
+  # go = goOverlay;
 
   # The unstable nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.unstable'

nixos/overlays/go/default.nix

@@ -3,7 +3,7 @@ let
   finalVersion = "1.22.4";
 in
 (final: prev: {
-  go_1_22 = prev.go_1_22.overrideAttrs (oldAttrs: { 
+  go = prev.go.overrideAttrs (oldAttrs: { 
     version = finalVersion;
     src = prev.fetchurl {
       url = "https://go.dev/dl/go${finalVersion}.src.tar.gz";

nixos/overlays/talosctl/default.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ ...}:
 let
   finalVersion = "1.7.5";
 in
@@ -11,7 +11,6 @@ in
       rev = "v${finalVersion}";
       hash = "sha256-lmDLlxiPyVhlSPplYkIaS5Uw19hir6XD8MAk8q+obhY=";
     };
-    vendorHash = "sha256-8UIey+r1tdVRN1RBK5xxcAzaHb0VFdgenUXSFgoWh1g=";
     passthru = oldAttrs.passthru // {
       updateScript = ./update.sh;
     };

nixos/overlays/talosctl/talosctl-custom.nix

@@ -1,43 +0,0 @@
-{ lib, buildGo122Module, fetchFromGitHub, installShellFiles }:
-
-buildGo122Module rec {
-  pname = "talosctl";
-  version = "1.7.5";
-  src = fetchFromGitHub {
-    owner = "siderolabs";
-    repo = "talos";
-    rev = "v${version}";
-    hash = "sha256-lmDLlxiPyVhlSPplYkIaS5Uw19hir6XD8MAk8q+obhY=";
-  };
-
-  passthru = {
-    updateScript = ./update.sh;
-  };
-
-  vendorHash = "sha256-8UIey+r1tdVRN1RBK5xxcAzaHb0VFdgenUXSFgoWh1g=";
-
-  ldflags = [ "-s" "-w" ];
-
-  env.GOWORK = "off";
-
-  subPackages = [ "cmd/talosctl" ];
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  postInstall = ''
-    installShellCompletion --cmd talosctl \
-      --bash <($out/bin/talosctl completion bash) \
-      --fish <($out/bin/talosctl completion fish) \
-      --zsh <($out/bin/talosctl completion zsh)
-  '';
-
-  doCheck = false; # no tests
-
-  meta = with lib; {
-    description = "CLI for out-of-band management of Kubernetes nodes created by Talos";
-    mainProgram = "talosctl";
-    homepage = "https://www.talos.dev/";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ flokli ];
-  };
-}

nixos/profiles/role-dev.nix

@@ -18,7 +18,6 @@ with config;
     nixpkgs-fmt
     statix
     gh
-    go
 
     # bind # for dns utils like named-checkconf
     inputs.nix-inspect.packages.${pkgs.system}.default

shell.nix

@@ -17,6 +17,7 @@ pkgs.mkShell {
   NIX_CONFIG = "experimental-features = nix-command flakes";
 
   nativeBuildInputs = with pkgs; [
+    buildPackages.go_1_22
     nix
     home-manager
     git