Merge branch 'main' of ssh://codeberg.org/dnscio/nix-config

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1754337839,
+        "lastModified": 1754433428,
-        "narHash": "sha256-fEc2/4YsJwtnLU7HCFMRckb0u9UNnDZmwGhXT5U5NTw=",
+        "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "856df6f6922845abd4fd958ce21febc07ca2fa45",
+        "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
         "type": "github"
       },
       "original": {
@@ -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": [
@@ -71,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754365350,
+        "lastModified": 1754974548,
-        "narHash": "sha256-NLWIkn1qM0wxtZu/2NXRaujWJ4Y1PSZlc7h0y6pOzOQ=",
+        "narHash": "sha256-XMjUjKD/QRPcqUnmSDczSYdw46SilnG0+wkho654DFM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c5d7e957397ecb7d48b99c928611c6e780db1b56",
+        "rev": "27a26be51ff0162a8f67660239f9407dba68d7c5",
         "type": "github"
       },
       "original": {
@@ -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": 1754028485,
@@ -153,11 +188,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1754278406,
+        "lastModified": 1754990257,
-        "narHash": "sha256-jvIQTMN5EzoOP5RaGztpVese8a3wqy0M/h6tNzycW28=",
+        "narHash": "sha256-eEq2wlYNF2t89PsNyEv5Sz4lSxdukZCj4SdhZBVAGpI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6a489c9482ca676ce23c0bcd7f2e1795383325fa",
+        "rev": "372d9eeeafa5b15913201e2b92e8e539ac7c64d1",
         "type": "github"
       },
       "original": {
@@ -173,6 +208,7 @@
         "home-manager": "home-manager_2",
         "ip-whitelist": "ip-whitelist",
         "nix-darwin": "nix-darwin",
+        "nix-homebrew": "nix-homebrew",
         "nixpkgs": "nixpkgs_3"
       }
     },

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 {

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;
@@ -80,7 +87,6 @@
 
     masApps = {
       Bitwarden = 1352778147;
-      "Kagi for Safari" = 1622835804;
       "Wipr 2" = 1662217862;
       "Yesterday For Old Reddit" = 1603279883;
     };
@@ -123,8 +129,6 @@
     defaults = {
       smb.NetBIOSName = "dnsc-air";
 
-      NSGlobalDomain."com.apple.swipescrolldirection" = false;
-
       dock = {
         autohide = true;
         autohide-delay = 0.01;