From 38032841694506d1bb2f8603fdf0e0f95836c0c6 Mon Sep 17 00:00:00 2001 From: swaphb Date: Wed, 9 Apr 2025 20:24:17 -0400 Subject: [PATCH] update flake.lock and flake.nix to include homebrew-siderolabs and enable auto-update for homebrew apps --- flake.lock | 73 ++++++++++++++++++----------- flake.nix | 6 +++ modules/darwin/apps/homebrew.nix | 3 ++ modules/darwin/apps/nixpackages.nix | 4 +- 4 files changed, 55 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 7924dc4..bd8420c 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1740943974, - "narHash": "sha256-2lRLfb6qwoUAsX/XtYmt/ETxtGid6/VaBeFiRsoVMtU=", + "lastModified": 1742457334, + "narHash": "sha256-Gn7ruyb3NDFr+SsHBfA2NsJI8YkkWdECqLRj/xcjt+E=", "owner": "Homebrew", "repo": "brew", - "rev": "64efed206deeb9c2304d9e5b5910dcbf0a509c15", + "rev": "f3bd91d3afe086824d24708230e1f0c7f943135a", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.4.23", + "ref": "4.4.25", "repo": "brew", "type": "github" } @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1741217763, - "narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=", + "lastModified": 1744223888, + "narHash": "sha256-reYpe0J1J+wH34JFs7KKp0G5nP7+XSQ5z0ZLFJcfJr8=", "owner": "nix-community", "repo": "home-manager", - "rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da", + "rev": "79461936709b12e17adb9c91dd02d1c66d577f09", "type": "github" }, "original": { @@ -40,11 +40,11 @@ "homebrew-argoproj": { "flake": false, "locked": { - "lastModified": 1727199309, - "narHash": "sha256-UQbNtVYRj7m1tGeZOBgEAHcO4xDWgk0GidwF38FM/h8=", + "lastModified": 1742497132, + "narHash": "sha256-If6Bc/UyY1suAxC6B6C5UMIIBGurDCu4uicv8A09poc=", "owner": "argoproj", "repo": "homebrew-tap", - "rev": "a10c19d3a860ada425733e89758216ba0ccb4c28", + "rev": "c2558ee338377f8f95c21495d8437c6c560d91aa", "type": "github" }, "original": { @@ -56,11 +56,11 @@ "homebrew-bundle": { "flake": false, "locked": { - "lastModified": 1741269991, - "narHash": "sha256-eyHpMTues9/ulREwI46nIhokUzUv8TZgojnomMePsFg=", + "lastModified": 1742475687, + "narHash": "sha256-GoaP8X0livBYzfb8kRCyf3z61+sXSh6tE5gMZtxjLQA=", "owner": "homebrew", "repo": "homebrew-bundle", - "rev": "87fa1e63eacf38167aec56d1732d95109ec47d00", + "rev": "dc4311afc4c34833b288cd4978421803ec2c9ff8", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1741272426, - "narHash": "sha256-Q9Hl0ISJ8jnZaaq9gChAyK+rDIldcpVS92XGq/MN3xw=", + "lastModified": 1744236362, + "narHash": "sha256-eYe52jMTHwcSIzzq2BP2MEYot8sUkxFL1c66iFNAPlI=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "ad2cf2e0abe31180b9998ba12f53c87653588e63", + "rev": "d9c1a4b97936816ad63b34cc46642e9fbc69d13c", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1741272988, - "narHash": "sha256-tQB7HSTic31wUsktBr4jqGVAnF1nytFQBTjdb5qTrFY=", + "lastModified": 1744243351, + "narHash": "sha256-dXBnP9Ei/3AyMHxercLSck4bR2xtOQ4dv874fEtXzmI=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "e7fba177e9e2b83d900aa600cb43231341865298", + "rev": "021b921b879a2676364115ab2b4a82be5b6954b0", "type": "github" }, "original": { @@ -101,6 +101,22 @@ "type": "github" } }, + "homebrew-siderolabs": { + "flake": false, + "locked": { + "lastModified": 1744120639, + "narHash": "sha256-+8s+yaOtkpuUl89EIIJ4nuPJuL9q3qBIC21TOWDSOBI=", + "owner": "siderolabs", + "repo": "homebrew-tap", + "rev": "52c8208478314a9ff57935c710ec249187d4f096", + "type": "github" + }, + "original": { + "owner": "siderolabs", + "repo": "homebrew-tap", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -108,11 +124,11 @@ ] }, "locked": { - "lastModified": 1741229100, - "narHash": "sha256-0HwrTDXp9buEwal/1ymK9uQmzUD5ozIA7CJGqnT/gLs=", + "lastModified": 1744224272, + "narHash": "sha256-cqePj5nuC7flJWNncaVAFq1YZncU0PSyO0DEqGn+vYc=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "adf5c88ba1fe21af5c083b4d655004431f20c5ab", + "rev": "113883e37d985d26ecb65282766e5719f2539103", "type": "github" }, "original": { @@ -146,11 +162,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1741032878, - "narHash": "sha256-s9YOBz8vAxPlI4wORma3D7km8wZOEe/7Hg/u3brmwUQ=", + "lastModified": 1742619394, + "narHash": "sha256-8uwIBjbKxeJ7u0VACSNs634HwtgRLxP6/+cIkUXmuyI=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "a82c55b07f670a01da5a72b7a07fe41c256a4380", + "rev": "04b0536479d2d2e8d71dc8c8ee97c2b61f0c9987", "type": "github" }, "original": { @@ -190,11 +206,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "lastModified": 1744096231, + "narHash": "sha256-kUfx3FKU1Etnua3EaKvpeuXs7zoFiAcli1gBwkPvGSs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b", "type": "github" }, "original": { @@ -211,6 +227,7 @@ "homebrew-bundle": "homebrew-bundle", "homebrew-cask": "homebrew-cask", "homebrew-core": "homebrew-core", + "homebrew-siderolabs": "homebrew-siderolabs", "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", "nixpkgs": "nixpkgs_3" diff --git a/flake.nix b/flake.nix index dea42e9..541f653 100644 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,10 @@ url = "github:argoproj/homebrew-tap"; flake = false; }; + homebrew-siderolabs = { + url = "github:siderolabs/homebrew-tap"; + flake = false; + }; }; outputs = inputs@{ self, nix-darwin, home-manager, ... }: @@ -114,6 +118,8 @@ "homebrew/homebrew-cask" = inputs.homebrew-cask; "homebrew/homebrew-bundle" = inputs.homebrew-bundle; "argoproj/homebrew-tap" = inputs.homebrew-argoproj; + "siderolabs/homebrew-tap" = inputs.homebrew-siderolabs; + # "hashicorp/homebrew-tap" = inputs.homebrew-hashicorp; }; autoMigrate = true; mutableTaps = true; diff --git a/modules/darwin/apps/homebrew.nix b/modules/darwin/apps/homebrew.nix index 92f21aa..80f8f96 100644 --- a/modules/darwin/apps/homebrew.nix +++ b/modules/darwin/apps/homebrew.nix @@ -5,6 +5,8 @@ homebrew = { enable = true; onActivation.cleanup = "uninstall"; + onActivation.autoUpdate = true; + onActivation.upgrade = true; brews = [ "argoproj/homebrew-tap/kubectl-argo-rollouts" @@ -12,6 +14,7 @@ "git" "helm" "k9s" + "siderolabs/homebrew-tap/talosctl" "ansible" ]; casks = [ diff --git a/modules/darwin/apps/nixpackages.nix b/modules/darwin/apps/nixpackages.nix index 7e0b7a3..d85b4d2 100644 --- a/modules/darwin/apps/nixpackages.nix +++ b/modules/darwin/apps/nixpackages.nix @@ -1,7 +1,5 @@ { config, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - - ]; + environment.systemPackages = with pkgs; [ ]; }