From 8d469a5d8b73a84443e23db0e3e9d7fafb5d6684 Mon Sep 17 00:00:00 2001 From: Beatrix Klebe Date: Tue, 4 Jun 2024 12:09:53 -0400 Subject: [PATCH] chore: update nix-darwin --- .config/nix-darwin/flake.lock | 14 +++---- .config/nix-darwin/flake.nix | 76 ++++++++++++++++++----------------- 2 files changed, 47 insertions(+), 43 deletions(-) diff --git a/.config/nix-darwin/flake.lock b/.config/nix-darwin/flake.lock index 59247a3..7c2b7a1 100644 --- a/.config/nix-darwin/flake.lock +++ b/.config/nix-darwin/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1698429334, - "narHash": "sha256-Gq3+QabboczSu7RMpcy79RSLMSqnySO3wsnHQk4DfbE=", + "lastModified": 1718662658, + "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "afe83cbc2e673b1f08d32dd0f70df599678ff1e7", + "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", "type": "github" }, "original": { @@ -22,16 +22,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698607745, - "narHash": "sha256-J5QPuWxE17nO/UZJKEbupEM6Zx1wXIo/C+iP+44Hvl0=", + "lastModified": 1718543737, + "narHash": "sha256-e8S/ODM1vkKHIexSVn9nIvne7vRO5M+35VAq/6JOYto=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5896110a4e861bf2e675a3c3d8a171793fce2599", + "rev": "683aa7c4e385509ca651d49eeb35e58c7a1baad6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-23.05-darwin", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/.config/nix-darwin/flake.nix b/.config/nix-darwin/flake.nix index 69e29da..46651bb 100644 --- a/.config/nix-darwin/flake.nix +++ b/.config/nix-darwin/flake.nix @@ -2,46 +2,50 @@ description = "Example Darwin system flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin"; + 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 }: - let - configuration = { pkgs, ... }: { - # List packages installed in system profile. To search by name, run: - # $ nix-env -qaP | grep wget - environment.systemPackages = [ ]; - - # 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 = 4; - - # The platform the configuration will be used on. - nixpkgs.hostPlatform = "aarch64-darwin"; - }; - in { - # Build darwin flake using: - # $ darwin-rebuild build --flake .#CTD25988BKLEBE - darwinConfigurations."CTD25988BKLEBE" = - nix-darwin.lib.darwinSystem { modules = [ configuration ]; }; - - # Expose the package set, including overlays, for convenience. - darwinPackages = self.darwinConfigurations."CTD25988BKLEBE".pkgs; + let + configuration = { pkgs, ... }: { + # List packages installed in system profile. To search by name, run: + # $ nix-env -qaP | grep wget + environment.systemPackages = + [ + ]; + + # 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 = 4; + + # The platform the configuration will be used on. + nixpkgs.hostPlatform = "aarch64-darwin"; }; + in + { + # Build darwin flake using: + # $ darwin-rebuild build --flake .#CTD25988BKLEBE + darwinConfigurations."CTD25988BKLEBE" = nix-darwin.lib.darwinSystem { + modules = [ configuration ]; + }; + + # Expose the package set, including overlays, for convenience. + darwinPackages = self.darwinConfigurations."CTD25988BKLEBE".pkgs; + }; }