From 88b97aa49c451070d2978b291a6280f2e1c5c2b6 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 10 Sep 2024 16:17:57 +0100 Subject: {ids,checks}: update for new builder UID/GID values --- modules/examples/flake/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/examples/flake/flake.nix') diff --git a/modules/examples/flake/flake.nix b/modules/examples/flake/flake.nix index 8650562..94c600e 100644 --- a/modules/examples/flake/flake.nix +++ b/modules/examples/flake/flake.nix @@ -32,7 +32,7 @@ # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog - system.stateVersion = 4; + system.stateVersion = 5; # The platform the configuration will be used on. nixpkgs.hostPlatform = "x86_64-darwin"; -- cgit v1.2.3 From 470f87c1827b51169ed4f91cdbdfd48417bfff3d Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Thu, 31 Oct 2024 15:02:36 +1100 Subject: zsh: enable by default as zsh is the default shell on macOS Historically this was a footgun because users would not always have this enabled leading to `darwin-rebuild` and other programs not being found. --- modules/examples/flake/flake.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'modules/examples/flake/flake.nix') diff --git a/modules/examples/flake/flake.nix b/modules/examples/flake/flake.nix index 94c600e..e6eaefc 100644 --- a/modules/examples/flake/flake.nix +++ b/modules/examples/flake/flake.nix @@ -23,8 +23,7 @@ # 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 + # Enable alternative shell support in nix-darwin. # programs.fish.enable = true; # Set Git commit hash for darwin-version. -- cgit v1.2.3 From 534ca06930039a616934b6d9dd8316e8df799622 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sat, 9 Nov 2024 20:51:18 +1100 Subject: docs: use `nix-darwin` instead of `Darwin` --- modules/examples/flake/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/examples/flake/flake.nix') diff --git a/modules/examples/flake/flake.nix b/modules/examples/flake/flake.nix index e6eaefc..bd733bd 100644 --- a/modules/examples/flake/flake.nix +++ b/modules/examples/flake/flake.nix @@ -1,5 +1,5 @@ { - description = "Example Darwin system flake"; + description = "Example nix-darwin system flake"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; -- cgit v1.2.3 From 5d1b7ac696c2c9cf4206d7fbd3ebe3daa3b9bbd2 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Mon, 11 Nov 2024 22:48:25 +1100 Subject: treewide: remove mentions of `services.nix-daemon.enable = true;` --- modules/examples/flake/flake.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'modules/examples/flake/flake.nix') diff --git a/modules/examples/flake/flake.nix b/modules/examples/flake/flake.nix index bd733bd..d3967ef 100644 --- a/modules/examples/flake/flake.nix +++ b/modules/examples/flake/flake.nix @@ -17,7 +17,6 @@ ]; # Auto upgrade nix package and the daemon service. - services.nix-daemon.enable = true; # nix.package = pkgs.nix; # Necessary for using flakes on this system. -- cgit v1.2.3 From 7918e24e5b999e36c923573e9d6ac183b0c00f38 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Mon, 11 Nov 2024 22:30:42 +1100 Subject: treewide: remove `nix.package` example --- modules/examples/flake/flake.nix | 3 --- 1 file changed, 3 deletions(-) (limited to 'modules/examples/flake/flake.nix') diff --git a/modules/examples/flake/flake.nix b/modules/examples/flake/flake.nix index d3967ef..dbcc420 100644 --- a/modules/examples/flake/flake.nix +++ b/modules/examples/flake/flake.nix @@ -16,9 +16,6 @@ [ pkgs.vim ]; - # Auto upgrade nix package and the daemon service. - # nix.package = pkgs.nix; - # Necessary for using flakes on this system. nix.settings.experimental-features = "nix-command flakes"; -- cgit v1.2.3 From a4d4d12e3885f9fea3100c73d024664ea9572f94 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sun, 17 Nov 2024 13:11:30 +1100 Subject: examples: change default architecture to `aarch64-darwin` --- modules/examples/flake/flake.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'modules/examples/flake/flake.nix') diff --git a/modules/examples/flake/flake.nix b/modules/examples/flake/flake.nix index dbcc420..4520b8f 100644 --- a/modules/examples/flake/flake.nix +++ b/modules/examples/flake/flake.nix @@ -30,7 +30,7 @@ system.stateVersion = 5; # The platform the configuration will be used on. - nixpkgs.hostPlatform = "x86_64-darwin"; + nixpkgs.hostPlatform = "aarch64-darwin"; }; in { @@ -39,8 +39,5 @@ darwinConfigurations."simple" = nix-darwin.lib.darwinSystem { modules = [ configuration ]; }; - - # Expose the package set, including overlays, for convenience. - darwinPackages = self.darwinConfigurations."simple".pkgs; }; } -- cgit v1.2.3 From e33d37c41f8040631f0cc16b032a1cf214aeeb4e Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 8 Jan 2025 19:10:22 +0000 Subject: {readme,examples/flake}: update for release branches --- modules/examples/flake/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/examples/flake/flake.nix') diff --git a/modules/examples/flake/flake.nix b/modules/examples/flake/flake.nix index 4520b8f..138c047 100644 --- a/modules/examples/flake/flake.nix +++ b/modules/examples/flake/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - nix-darwin.url = "github:LnL7/nix-darwin"; + nix-darwin.url = "github:LnL7/nix-darwin/master"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; }; -- cgit v1.2.3