diff --git a/flake.lock b/flake.lock index 78e55ca..e95ba21 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1778427648, - "narHash": "sha256-pt9KaDGsMyYWB9JeHs4XGHs870f1lOZe3vx9LpVIhUE=", + "lastModified": 1789661079, + "narHash": "sha256-geVTQ51PGZ1mLULM5k7wO7qt/6xenOR/YG8X7Q3eCaI=", "owner": "Homebrew", "repo": "brew", - "rev": "6f293daa9f9f5832e13b497976335e90509886d7", + "rev": "edb70f031e4170c780799633a1226ff73e1077f4", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "5.1.11", + "ref": "7.0.4", "repo": "brew", "type": "github" } @@ -22,11 +22,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1790898470, + "narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "024633cd702b10285db5cb19b40ad48d2399ba60", "type": "github" }, "original": { @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1783740085, - "narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=", + "lastModified": 1790996401, + "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=", "owner": "nix-community", "repo": "home-manager", - "rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb", + "rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35", "type": "github" }, "original": { @@ -59,11 +59,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1780406524, - "narHash": "sha256-iK9no4rW7MZMBdfjrrgbU+rzCgl5n2VoHJj/bb1GVho=", + "lastModified": 1791152198, + "narHash": "sha256-w1hcFBb5slQ8KudJUf9YgqSNV6PBUnmto4lqIQZBgB8=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "f881b5768475bc60da14e7ca20c56f3509b80f1b", + "rev": "55c29b6d41d4a2536a768ee9562aa22e4d81f6ca", "type": "github" }, "original": { @@ -75,11 +75,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1780407978, - "narHash": "sha256-hgOsqpzD6qsKlLOAxKyNCbCPxVuYLsmWcfxOxbxTwYA=", + "lastModified": 1791152110, + "narHash": "sha256-W8DgDSno8wpUqflVhsOcB3ZPRmID5I2Qn3aUbdMXsdE=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "132ca82e883600ec9e1f9b9d73f87db040c07605", + "rev": "4a9c94a45d743a3f9b6b4420f538f97113a742a4", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "import-tree": { "locked": { - "lastModified": 1778781969, - "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=", + "lastModified": 1788467110, + "narHash": "sha256-ljEMTXP/rH0tOvDzc9gzwww6KcHRPRnEHzd9lK48V7s=", "owner": "vic", "repo": "import-tree", - "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274", + "rev": "eb1b52eaecc57f7c136d07ae8a93e724dfecac46", "type": "github" }, "original": { @@ -145,11 +145,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1778851564, - "narHash": "sha256-p8wzcnpB2Iys+QzAKM9/Eyw/pUyqCO3sw/NCnDH4dTE=", + "lastModified": 1789928041, + "narHash": "sha256-iV37ieTcE4ZLOYEe0VznW6dWMBe4lEL8AbK1vblyZGM=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "b3a87b4793205cc111f3c61e25e018ffac3b8039", + "rev": "c11cccfdd36dd69b5323d70d354b2853379c2426", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1783703440, - "narHash": "sha256-O3/YajjWo001VUIgD8BwaRdSNLUFe7nZ1qV5TwhRBcw=", + "lastModified": 1791031588, + "narHash": "sha256-/FGDr01siZ8txrVzkOz6CYjiz0XR27JuVJP+aWchi4s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f0500b9660505dc3cb647775fe9a978a74b5283", + "rev": "825e2028c29b702a4a5f085f08095d12099784f2", "type": "github" }, "original": { @@ -176,11 +176,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1777168982, - "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "lastModified": 1790477367, + "narHash": "sha256-oujbxmVKDhci2E4EM3KyAbRUgp5/IsCoiA/LfEF7OOk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "rev": "f7cd230690d9fc982d06129f9189b101fddcfa3b", "type": "github" }, "original": { @@ -191,11 +191,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "lastModified": 1791048980, + "narHash": "sha256-KgItSKML8Xvte0B7/uGnBDsYzSnnKHcOaiUbgWBXLXw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "rev": "a7868a727837f3c09cee2ce0ca671c76b1589fed", "type": "github" }, "original": { diff --git a/hosts/darwin/system/os.nix b/hosts/darwin/system/os.nix index e3e985b..6b93014 100644 --- a/hosts/darwin/system/os.nix +++ b/hosts/darwin/system/os.nix @@ -1,6 +1,12 @@ { ... }: { system.primaryUser = "alistreaza"; + os.homebrew.enable = true; + + system.defaults.dock.persistent-apps = [ + { app = "/System/Applications/Apps.app"; } + { app = "/System/Applications/Mail.app"; } + ]; # Homebrew System apps os.homebrew.keka.enable = true; @@ -15,6 +21,7 @@ os.homebrew.microsoft.powerpoint.enable = true; os.homebrew.microsoft.team.enable = true; os.homebrew.obsidian.enable = true; + os.homebrew.zotero.enable = true; # Homebrew IDE apps os.homebrew.zed.enable = true; diff --git a/hosts/darwin/system/partials/system.nix b/hosts/darwin/system/partials/system.nix index 6d5aba7..904ab00 100644 --- a/hosts/darwin/system/partials/system.nix +++ b/hosts/darwin/system/partials/system.nix @@ -16,10 +16,6 @@ tilesize = 30; autohide = false; orientation = "left"; - persistent-apps = [ - { app = "/System/Applications/Apps.app"; } - { app = "/System/Applications/Mail.app"; } - ]; persistent-others = [ ]; wvous-bl-corner = 1; wvous-br-corner = 3; diff --git a/modules/system/darwin/homebrew.nix b/modules/system/darwin/homebrew.nix index f49fc03..b046dec 100644 --- a/modules/system/darwin/homebrew.nix +++ b/modules/system/darwin/homebrew.nix @@ -20,7 +20,6 @@ in # Install Homebrew under the default prefix enable = true; - autoMigrate = true; # Apple Silicon Only: Also install Homebrew under the default Intel prefix for Rosetta 2 enableRosetta = false;