diff --git a/flake.lock b/flake.lock index 286f348..70e08fe 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1749511373, - "narHash": "sha256-7u1TdHQaUCzzgf/n8T3bQosuYXyNBEPU/3WQQqozE5o=", + "lastModified": 1751910772, + "narHash": "sha256-jQNdIkq2iRDNWskd5f8kX6q9BO/CBSXhMH41WNRft8E=", "owner": "Homebrew", "repo": "brew", - "rev": "7b4ef99fed96966269ee35994407fa4c06097a4d", + "rev": "700d67a85e0129ab8a893ff69246943479e33df1", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.5.6", + "ref": "4.5.9", "repo": "brew", "type": "github" } @@ -42,11 +42,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1749952250, - "narHash": "sha256-V2ix0knpdJXirQ+4pjbnggjdSALTsFWGIP/NDpaQkdU=", + "lastModified": 1752160973, + "narHash": "sha256-BCC8KB7TEtwv7vZN1WDu870tRbXtzUcmF9xNr6ws5Wc=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "37126f06f4890f019af3d7606ce5d30a457afcd0", + "rev": "69c1aa2f136f3c3326d9b6770e0eb54f12832971", "type": "github" }, "original": { @@ -57,11 +57,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751949589, - "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", + "lastModified": 1752747119, + "narHash": "sha256-2Kp9St3Pbsmu+xMsobLcgzzUxPvZR7alVJWyuk2BAPc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b008d60392981ad674e04016d25619281550a9d", + "rev": "fa0ef8a6bb1651aa26c939aeb51b5f499e86b0ec", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5388a0a..c465f13 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,11 @@ { description = "Louis Darwin system flake"; - inputs = { nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nix-darwin.url = "github:LnL7/nix-darwin"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = inputs@{ self, nix-darwin, nixpkgs, nix-homebrew, ... }: let configuration = { pkgs, ... }: { @@ -42,7 +40,6 @@ pkgs.bitwarden-desktop pkgs.jetbrains-toolbox ]; - # HomeBrew configuration homebrew = { enable = true; @@ -58,12 +55,11 @@ "swish" "termius" "mattermost" - "aldente" + "aldente" "logi-options+" "adobe-creative-cloud" "qbittorrent" "zoom" - "tailscale" "zed" "whisky" "visual-studio-code" @@ -78,6 +74,7 @@ "privileges" "jdownloader" "raspberry-pi-imager" + "tailscale-app" ]; brews = [ "wget" @@ -99,7 +96,7 @@ "wget" "zsh" "yubikey-agent" - "pkg-config" + "pkg-config" "serve" ]; taps = [ @@ -110,10 +107,7 @@ onActivation.cleanup = "uninstall"; onActivation.autoUpdate = true; onActivation.upgrade = true; - - }; - - # System configuration + }; # System configuration security.pam.services.sudo_local.touchIdAuth = true; system.defaults = { dock = { @@ -141,7 +135,6 @@ finder.FXPreferredViewStyle = "Nlsv"; SoftwareUpdate.AutomaticallyInstallMacOSUpdates = true; }; - # Allow broken packages nixpkgs.config.allowBroken = true; # allow unfree packages @@ -149,22 +142,17 @@ # Auto upgrade nix package and the daemon service. # services.nix-daemon.enable = true; # nix.package = pkgs.nix; - # Necessary for using flakes on this system. nix.settings.experimental-features = "nix-command flakes"; - # Create /etc/zshrc that loads the nix-darwin environment. programs.zsh.enable = true; # default shell on catalina # programs.fish.enable = true; - # Set Git commit hash for darwin-version. system.configurationRevision = self.rev or self.dirtyRev or null; - # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog system.stateVersion = 5; system.primaryUser = "louisgallet"; - # The platform the configuration will be used on. nixpkgs.hostPlatform = "aarch64-darwin"; }; @@ -180,20 +168,16 @@ nix-homebrew = { # Install Homebrew under the default prefix enable = true; - # Apple Silicon Only: Also install Homebrew under the default Intel prefix for Rosetta 2 enableRosetta = true; - # User owning the Homebrew prefix user = "louisgallet"; - # Automatically migrate existing Homebrew installations autoMigrate = true; }; } ]; }; - # Expose the package set, including overlays, for convenience. darwinPackages = self.darwinConfigurations."MBP-Louis".pkgs; };