From 2ca13785e003e160aa62f4595c1507575c9d99b3 Mon Sep 17 00:00:00 2001 From: Dennis Date: Mon, 4 Aug 2025 21:47:30 +0200 Subject: [PATCH 1/3] updates packages --- flake.lock | 18 +++++++++--------- hosts/dnsc-air/default.nix | 3 --- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index f4579c7..6db1ce6 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1750173260, - "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "lastModified": 1754323089, + "narHash": "sha256-qpmyMBMyksBbyXkc9kSIkY2zIuPRixQZDorec216FfM=", "owner": "ryantm", "repo": "agenix", - "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "rev": "6d194f7522b9ed8aadb0856f1316f6d660ceb42a", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1754174776, - "narHash": "sha256-Sp3FRM6xNwNtGzYH/HByjzJYHSQvwsW+lDMMZNF43PQ=", + "lastModified": 1754263839, + "narHash": "sha256-ck7lILfCNuunsLvExPI4Pw9OOCJksxXwozum24W8b+8=", "owner": "nix-community", "repo": "home-manager", - "rev": "e6e2f43a62b7dbc8aa8b1adb7101b0d8b9395445", + "rev": "1d7abbd5454db97e0af51416f4960b3fb64a4773", "type": "github" }, "original": { @@ -153,11 +153,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754151594, - "narHash": "sha256-S30TWshtDmNlU30u842RidFUraKj1f2dd4nrKRHm3gE=", + "lastModified": 1754278406, + "narHash": "sha256-jvIQTMN5EzoOP5RaGztpVese8a3wqy0M/h6tNzycW28=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7b6929d8b900de3142638310f8bc40cff4f2c507", + "rev": "6a489c9482ca676ce23c0bcd7f2e1795383325fa", "type": "github" }, "original": { diff --git a/hosts/dnsc-air/default.nix b/hosts/dnsc-air/default.nix index 8796f2a..d0687d2 100644 --- a/hosts/dnsc-air/default.nix +++ b/hosts/dnsc-air/default.nix @@ -80,7 +80,6 @@ masApps = { Bitwarden = 1352778147; - "Kagi for Safari" = 1622835804; "Wipr 2" = 1662217862; "Yesterday For Old Reddit" = 1603279883; }; @@ -123,8 +122,6 @@ defaults = { smb.NetBIOSName = "dnsc-air"; - NSGlobalDomain."com.apple.swipescrolldirection" = false; - dock = { autohide = true; autohide-delay = 0.01; From 226b8bd10dd806ea67d012544cc014fee04c08d4 Mon Sep 17 00:00:00 2001 From: Dennis Date: Mon, 4 Aug 2025 21:50:57 +0200 Subject: [PATCH 2/3] adds nix-homebrew --- flake.lock | 36 ++++++++++++++++++++++++++++++++++++ flake.nix | 7 ++++++- hosts/dnsc-air/default.nix | 7 +++++++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 6db1ce6..dec9c92 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,23 @@ "type": "github" } }, + "brew-src": { + "flake": false, + "locked": { + "lastModified": 1753461463, + "narHash": "sha256-kGc7pRH0diLzKmOHsEFA8sZ9NJpgT+tqxAMsuqNd5Po=", + "owner": "Homebrew", + "repo": "brew", + "rev": "4d14be89e99a45181c18e96a5f19a5b43343cc0f", + "type": "github" + }, + "original": { + "owner": "Homebrew", + "ref": "4.5.13", + "repo": "brew", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -123,6 +140,24 @@ "type": "github" } }, + "nix-homebrew": { + "inputs": { + "brew-src": "brew-src" + }, + "locked": { + "lastModified": 1754250993, + "narHash": "sha256-MEin+qoQKtFC1b0f4tnQ+Z82BQWSCgh6Ef7rpmH9gig=", + "owner": "zhaofengli", + "repo": "nix-homebrew", + "rev": "314d057294e79bc2596972126b84c6f9f144499a", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "repo": "nix-homebrew", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1745391562, @@ -173,6 +208,7 @@ "home-manager": "home-manager_2", "ip-whitelist": "ip-whitelist", "nix-darwin": "nix-darwin", + "nix-homebrew": "nix-homebrew", "nixpkgs": "nixpkgs_3" } }, diff --git a/flake.nix b/flake.nix index c09dc80..50d2eb8 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,7 @@ nix-darwin.url = "github:LnL7/nix-darwin/master"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; ip-whitelist.url = "github:Oak-Digital/nixos-ip-whitelist-firewall"; + nix-homebrew.url = "github:zhaofengli/nix-homebrew"; }; outputs = @@ -19,6 +20,7 @@ nixpkgs, home-manager, nix-darwin, + nix-homebrew, agenix, ... }@inputs: @@ -47,7 +49,10 @@ darwinConfigurations.dnsc-air = nix-darwin.lib.darwinSystem { system = "aarch64-darwin"; specialArgs = { inherit inputs outputs; }; - modules = [ ./hosts/dnsc-air ]; + modules = [ + nix-homebrew.darwinModules.nix-homebrew + ./hosts/dnsc-air + ]; }; darwinConfigurations.dnsc-work = nix-darwin.lib.darwinSystem { diff --git a/hosts/dnsc-air/default.nix b/hosts/dnsc-air/default.nix index d0687d2..0e1831f 100644 --- a/hosts/dnsc-air/default.nix +++ b/hosts/dnsc-air/default.nix @@ -64,6 +64,13 @@ ]; # Homebrew + nix-homebrew = { + enable = true; + # enableRosetta = true; + user = "dennis"; + autoMigrate = true; + }; + homebrew = { user = "dennis"; enable = true; From 02719dff6024520cb04377f744afb53b10241743 Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 12 Aug 2025 21:48:55 +0200 Subject: [PATCH 3/3] updates packages --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index dec9c92..82d2c20 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754323089, - "narHash": "sha256-qpmyMBMyksBbyXkc9kSIkY2zIuPRixQZDorec216FfM=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "6d194f7522b9ed8aadb0856f1316f6d660ceb42a", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1754263839, - "narHash": "sha256-ck7lILfCNuunsLvExPI4Pw9OOCJksxXwozum24W8b+8=", + "lastModified": 1754974548, + "narHash": "sha256-XMjUjKD/QRPcqUnmSDczSYdw46SilnG0+wkho654DFM=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d7abbd5454db97e0af51416f4960b3fb64a4773", + "rev": "27a26be51ff0162a8f67660239f9407dba68d7c5", "type": "github" }, "original": { @@ -160,16 +160,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -188,11 +188,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754278406, - "narHash": "sha256-jvIQTMN5EzoOP5RaGztpVese8a3wqy0M/h6tNzycW28=", + "lastModified": 1754990257, + "narHash": "sha256-eEq2wlYNF2t89PsNyEv5Sz4lSxdukZCj4SdhZBVAGpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a489c9482ca676ce23c0bcd7f2e1795383325fa", + "rev": "372d9eeeafa5b15913201e2b92e8e539ac7c64d1", "type": "github" }, "original": {