From 2711d6006af86337c62d87e502469892827a0cbf Mon Sep 17 00:00:00 2001 From: James Walker Date: Tue, 6 Sep 2022 22:03:48 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=91=EF=B8=8Ffix=20nix-darwin=20homebre?= =?UTF-8?q?w=20deprecations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 30 +++++++++++++++--------------- hosts/epicurus/homebrew.nix | 9 --------- hosts/heraclitus/homebrew.nix | 9 --------- modules/base/darwin.nix | 14 ++++++++++++++ 4 files changed, 29 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 0df68b3..12d30a3 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1661882940, - "narHash": "sha256-4LaVFnV22WrOA0aolqqk9dXrM8crikcrLQt29G18F7M=", + "lastModified": 1662478528, + "narHash": "sha256-Myjd0HPL5lXri3NXOcJ6gP7IKod2eMweQBKM4uxgEGw=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "80cec5115aae74accc4ccfb9f84306d7863f0632", + "rev": "3b69bf3cc26ae19de847bfe54d6ab22d7381a90a", "type": "github" }, "original": { @@ -110,11 +110,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1661824092, - "narHash": "sha256-nSWLWytlXbeLrx5A+r5Pso7CvVrX5EgmIIXW/EXvPHQ=", + "lastModified": 1662472236, + "narHash": "sha256-epA5KzVUxw9ZV+st2aU4oFfJGyIcYleTpX28wsCQQP4=", "owner": "nix-community", "repo": "home-manager", - "rev": "5bd66dc6cd967033489c69d486402b75d338eeb6", + "rev": "de94878b6b83f7f2cfda9cdff005417a6d7ac82c", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1662092548, - "narHash": "sha256-nmAbyJ5+DBXcNJ2Rcy/Gx84maqtLdr6xEe82+AXCaY8=", + "lastModified": 1662458987, + "narHash": "sha256-hcDwRlsXZMp2Er3vQk1JEUZWhBPLVC9vTT4xHvhpcE0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "786633331724f36967853b98d9100b5cfaa4d798", + "rev": "504b32caf83986b7e6b9c79c1c13008f83290f19", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1661656705, - "narHash": "sha256-1ujNuL1Tx1dt8dC/kuYS329ZZgiXXmD96axwrqsUY7w=", + "lastModified": 1662221733, + "narHash": "sha256-dw1xjYyQ0JidXIpzeQh/gQX+ih1sJO1zBHKs5QSYp8Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "290dbaacc1f0b783fd8e271b585ec2c8c3b03954", + "rev": "013e8d86d9a3f33074c903c8ffcab0d34087b1ed", "type": "github" }, "original": { @@ -224,11 +224,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1661660105, - "narHash": "sha256-3ITdkYwsNDh2DRqi7FZOJ92ui92NmcO6Nhj49u+JjWY=", + "lastModified": 1662390490, + "narHash": "sha256-HnFHRFu0eoB0tLOZRjLgVfHzK+4bQzAmAmHSzOquuyI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d92fba1bfc9f64e4ccb533701ddd8590c0d8c74a", + "rev": "044ccfe24b349859cd9efc943e4465cc993ac84e", "type": "github" }, "original": { diff --git a/hosts/epicurus/homebrew.nix b/hosts/epicurus/homebrew.nix index ed732ca..94dce06 100644 --- a/hosts/epicurus/homebrew.nix +++ b/hosts/epicurus/homebrew.nix @@ -2,15 +2,6 @@ { homebrew = { - enable = true; - brewPrefix = "/opt/homebrew/bin"; - autoUpdate = true; - cleanup = "zap"; - global = { - brewfile = true; - noLock = true; - }; - taps = [ "homebrew/cask" "homebrew/cask-drivers" diff --git a/hosts/heraclitus/homebrew.nix b/hosts/heraclitus/homebrew.nix index 1042e59..dbae902 100644 --- a/hosts/heraclitus/homebrew.nix +++ b/hosts/heraclitus/homebrew.nix @@ -2,15 +2,6 @@ { homebrew = { - enable = true; - brewPrefix = "/opt/homebrew/bin"; - autoUpdate = true; - cleanup = "zap"; - global = { - brewfile = true; - noLock = true; - }; - taps = [ "homebrew/cask" "homebrew/cask-drivers" diff --git a/modules/base/darwin.nix b/modules/base/darwin.nix index 5bf1c56..93e26d3 100644 --- a/modules/base/darwin.nix +++ b/modules/base/darwin.nix @@ -13,6 +13,20 @@ }; }; + homebrew = { + enable = true; + brewPrefix = "/opt/homebrew/bin"; + global = { + brewfile = true; + lockfiles = false; + }; + onActivation = { + autoUpdate = true; + cleanup = "zap"; + upgrade = true; + }; + }; + system.activationScripts.applications.text = pkgs.lib.mkForce ( '' rm -rf /Applications/Nix