From be14a2add172621f1d02b0457e50a6a96fd9b73b Mon Sep 17 00:00:00 2001 From: 347Online | Katie Janzen Date: Sat, 8 Jun 2024 10:10:29 -0500 Subject: Add inline prediction option mirroring the capitalization option --- modules/examples/lnl.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/examples') diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix index 2edf6cb..96954d2 100644 --- a/modules/examples/lnl.nix +++ b/modules/examples/lnl.nix @@ -10,6 +10,7 @@ system.defaults.NSGlobalDomain.InitialKeyRepeat = 10; system.defaults.NSGlobalDomain.KeyRepeat = 1; system.defaults.NSGlobalDomain.NSAutomaticCapitalizationEnabled = false; + system.defaults.NSGlobalDomain.NSAutomaticInlinePredictionEnabled = false; system.defaults.NSGlobalDomain.NSAutomaticDashSubstitutionEnabled = false; system.defaults.NSGlobalDomain.NSAutomaticPeriodSubstitutionEnabled = false; system.defaults.NSGlobalDomain.NSAutomaticQuoteSubstitutionEnabled = false; -- cgit v1.2.3 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 +- modules/examples/ofborg.nix | 2 +- modules/examples/simple.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/examples') 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"; diff --git a/modules/examples/ofborg.nix b/modules/examples/ofborg.nix index 1054c57..6cef6e7 100644 --- a/modules/examples/ofborg.nix +++ b/modules/examples/ofborg.nix @@ -25,5 +25,5 @@ with lib; # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog - system.stateVersion = 4; + system.stateVersion = 5; } diff --git a/modules/examples/simple.nix b/modules/examples/simple.nix index d146fde..1133da8 100644 --- a/modules/examples/simple.nix +++ b/modules/examples/simple.nix @@ -21,5 +21,5 @@ # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog - system.stateVersion = 4; + system.stateVersion = 5; } -- cgit v1.2.3 From c9fd4820d5e33422d2a9311898e098ba492dbd34 Mon Sep 17 00:00:00 2001 From: isabel Date: Mon, 30 Sep 2024 16:30:50 +0100 Subject: programs/bash: move to completion.* a port of https://github.com/NixOS/nixpkgs/pull/291552 for darwin --- modules/examples/hydra.nix | 2 +- modules/examples/lnl.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/examples') diff --git a/modules/examples/hydra.nix b/modules/examples/hydra.nix index 15808d9..3160498 100644 --- a/modules/examples/hydra.nix +++ b/modules/examples/hydra.nix @@ -12,7 +12,7 @@ in { # Create /etc/bashrc that loads the nix-darwin environment. programs.bash.enable = true; - programs.bash.enableCompletion = false; + programs.bash.completion.enable = false; # Recreate /run/current-system symlink after boot. services.activate-system.enable = true; diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix index 96954d2..010dff5 100644 --- a/modules/examples/lnl.nix +++ b/modules/examples/lnl.nix @@ -199,7 +199,7 @@ # Dotfiles. # programs.vim.package = mkForce pkgs.lnl.vim; - programs.bash.enableCompletion = true; + programs.bash.completion.enable = true; programs.zsh.enable = true; programs.zsh.enableBashCompletion = true; -- 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 +-- modules/examples/simple.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'modules/examples') 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. diff --git a/modules/examples/simple.nix b/modules/examples/simple.nix index 1133da8..5baf009 100644 --- a/modules/examples/simple.nix +++ b/modules/examples/simple.nix @@ -15,8 +15,7 @@ # services.nix-daemon.enable = true; # nix.package = pkgs.nix; - # 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; # Used for backwards compatibility, please read the changelog before changing. -- cgit v1.2.3 From 63f4d40e551e7b29fbe586967c03eea1e6a70ce4 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Thu, 31 Oct 2024 15:59:09 +1100 Subject: tmux: remove `programs.tmux.defaultCommand` --- modules/examples/lnl.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'modules/examples') diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix index 010dff5..d944158 100644 --- a/modules/examples/lnl.nix +++ b/modules/examples/lnl.nix @@ -277,7 +277,6 @@ zle -N up-line-or-beginning-search ''; - environment.loginShell = "${pkgs.zsh}/bin/zsh -l"; environment.variables.SHELL = "${pkgs.zsh}/bin/zsh"; environment.variables.LANG = "en_US.UTF-8"; -- cgit v1.2.3 From dd48cbd7766baba246f0b2e2bd42baf67e0005d6 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Mon, 4 Nov 2024 13:40:00 +1100 Subject: examples: fix evaluation --- modules/examples/hydra.nix | 2 ++ modules/examples/lnl.nix | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'modules/examples') diff --git a/modules/examples/hydra.nix b/modules/examples/hydra.nix index 3160498..edbb029 100644 --- a/modules/examples/hydra.nix +++ b/modules/examples/hydra.nix @@ -53,4 +53,6 @@ in chown hydra:hydra ~hydra ~hydra/.ssh ~hydra/.ssh/authorized_keys echo "ok" ''; + + system.stateVersion = 5; } diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix index d944158..f264e1a 100644 --- a/modules/examples/lnl.nix +++ b/modules/examples/lnl.nix @@ -50,13 +50,11 @@ pkgs.gnupg pkgs.htop pkgs.jq - pkgs.mosh pkgs.ripgrep pkgs.shellcheck pkgs.vault pkgs.qes - pkgs.darwin-zsh-completions ]; services.yabai.enable = true; @@ -331,4 +329,6 @@ nix.configureBuildUsers = true; nix.nrBuildUsers = 32; + + system.stateVersion = 5; } -- cgit v1.2.3 From 569153467be5f438e4f932a09bfba79adcecf856 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Mon, 4 Nov 2024 14:00:05 +1100 Subject: ofborg: automatically add `ofborg` to `known{Users,Groups}` --- modules/examples/ofborg.nix | 5 ----- 1 file changed, 5 deletions(-) (limited to 'modules/examples') diff --git a/modules/examples/ofborg.nix b/modules/examples/ofborg.nix index 6cef6e7..ed928b7 100644 --- a/modules/examples/ofborg.nix +++ b/modules/examples/ofborg.nix @@ -18,11 +18,6 @@ with lib; nix.gc.automatic = true; nix.gc.options = "--max-freed $((25 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | awk '{ print $4 }')))"; - # Manage user for ofborg, this enables creating/deleting users - # depending on what modules are enabled. - users.knownGroups = [ "ofborg" ]; - users.knownUsers = [ "ofborg" ]; - # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog system.stateVersion = 5; -- cgit v1.2.3 From c13549d7a632fc107bc8802463806fc2002c9c54 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Mon, 4 Nov 2024 13:40:00 +1100 Subject: examples: drop `ofborg` example We decided to drop this example as the package is not available in Nixpkgs and we won't be able to import it easily and keep this example evaluating as a useful smoke test. The code in this example is already documented under `services.ofborg.*` so any interested users can still find out how to set up `ofborg`. --- modules/examples/ofborg.nix | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 modules/examples/ofborg.nix (limited to 'modules/examples') diff --git a/modules/examples/ofborg.nix b/modules/examples/ofborg.nix deleted file mode 100644 index ed928b7..0000000 --- a/modules/examples/ofborg.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ - # Logs are enabled by default. - # $ tail -f /var/log/ofborg.log - services.ofborg.enable = true; - # services.ofborg.configFile = "/var/lib/ofborg/config.json"; - - # $ nix-channel --add https://github.com/NixOS/ofborg/archive/released.tar.gz ofborg - # $ nix-channel --update - services.ofborg.package = (import {}).ofborg.rs; - - # Keep nix-daemon updated. - services.nix-daemon.enable = true; - - nix.gc.automatic = true; - nix.gc.options = "--max-freed $((25 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | awk '{ print $4 }')))"; - - # Used for backwards compatibility, please read the changelog before changing. - # $ darwin-rebuild changelog - system.stateVersion = 5; -} -- cgit v1.2.3 From 2af06b086283be3ab3824a86f35f6301c95b372b Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Mon, 4 Nov 2024 22:02:31 +1100 Subject: examples: clean up --- modules/examples/hydra.nix | 15 +++------------ modules/examples/lnl.nix | 9 +-------- 2 files changed, 4 insertions(+), 20 deletions(-) (limited to 'modules/examples') diff --git a/modules/examples/hydra.nix b/modules/examples/hydra.nix index edbb029..eb1c5d9 100644 --- a/modules/examples/hydra.nix +++ b/modules/examples/hydra.nix @@ -1,25 +1,16 @@ { config, lib, pkgs, ... }: -with lib; - let - environment = concatStringsSep " " + environment = lib.concatStringsSep " " [ "NIX_REMOTE=daemon" "NIX_SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ]; in { - # Create /etc/bashrc that loads the nix-darwin environment. - programs.bash.enable = true; - programs.bash.completion.enable = false; - - # Recreate /run/current-system symlink after boot. - services.activate-system.enable = true; - services.nix-daemon.enable = true; - nix.settings.substituters = [ http://cache1 ]; + nix.settings.substituters = [ "http://cache1" ]; nix.settings.trusted-public-keys = [ "cache.daiderd.com-1:R8KOWZ8lDaLojqD+v9dzXAqGn29gEzPTTbr/GIpCTrI=" ]; nix.settings.trusted-users = [ "@admin" "@hydra" ]; @@ -31,7 +22,7 @@ in nix.gc.automatic = true; nix.gc.options = "--max-freed $((25 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | awk '{ print $4 }')))"; - environment.etc."per-user/hydra/ssh/authorized_keys".text = concatStringsSep "\n" + environment.etc."per-user/hydra/ssh/authorized_keys".text = lib.concatStringsSep "\n" [ "command=\"${environment} ${config.nix.package}/bin/nix-store --serve --write\" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCVsc0pHGsskoayziMhA2e59bHPWe0bbKgusmqhuJFBGQ1BAk9UmPzKCWE3nCiV6CLD1+SygVkBjb06DYtc+94BnzviCa9qZtL0G4+2vhp6x8OvXh8xlf/eWw3k5MWlvu+kjJFpbW8wHWTiUqzH+uEeHklAosT0lFNjiIYd/Vs3JAezhUR62a6c7ZjWOd5F7ALGEKzOiwC4i37kSgGsIWNCbe0Ku7gyr718zhMGeyxax6saHhnkSpIB+7d6oHhKeiJSFMWctNmz1/qxXUPbxNaJvqgdKlVHhN+B7x/TIbkVr5pTC59Okx9LTcpflFIv79VT+Gf1K7VypZpSvJjG0xFRt8iDs1+ssWFBfvpo94vUbZ+ZwMDcBGR5iJeO41Gj5fYn5aaDl32RXfJ9Fkwael1L6pcXtkIc66jk+KQQpgoeNj8Y3Emntpqva/2AM41wDDvr5tKp5KhEKFLM95CoiWq+g88pZLcpqLK7wooDVqNkVUEbMaj9lBN0AzU9mcsIRGvTa6CmWAdBvwqS2fRZD97Oarqct9AWgb0X6mOUq9BJNi4i4xvjgnVkylLwtLUnibR/PeXMtkb9bv6BEZXNf5ACqxSjKXJyaIHI65I5TILCr5eEgaujgvmkREn6U3T1NZAUIeVe9aVYLqehYh79OHUBzggoHqidRrXBB/6zdg9UgQ==" "command=\"${environment} ${config.nix.package}/bin/nix-store --serve --write\" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCnubA1pRqlpoAXkZ1q5nwhqi1RY2z840wFLFDj7vAMSups9E2U8PNIVtuVYApZpkBWIpzD4GGbQTF5Itnu5uBpJswc2Yat9yGWO/guuVyXIaRoBIM0Pg1WBWcWsz+k4rNludu9UQ74FHqEiqZIuIuOcgV+RIZn8xQlGt2kUqN9TWboHhZz8Zhx7EtGSJH6MJRLn3mA/pPjOF6k1jiiFG1pVDuqBTZPANkelWYCWAJ46jCyhxXltWE/jkBYGc/XbB8yT7DFE1XC6TVsSEp68R9PhVG3yqxqY06sniEyduSoGt/TDr6ycERd93bvLElXFATes85YiFszeaUgayYSKwQPe0q7YeHMhIXL0UYJYaKVVgT9saFDiHDzde7kKe+NA+J4+TbIk7Y/Ywn0jepsYV13M7TyEqgqbu9fvVGF3JI9+4g0m1gAzHTa7n6iiAedtz+Pi79uCEpRD2hWSSoLWroyPlep8j1p2tygtFsrieePEukesoToCTwqg1Ejnjh+yKdtUbc6xpyRvl3hKeO8QbCpfaaVd27e4vE4lP2JMW6nOo8b0wlVXQIFe5K2zh52q1MSwhLAq6Kg8oPmgj0lru4IivmPc+/NVwd3Qj3E9ZB8LRfTesfbcxHrC8lF5dL/QpLMeLwebrwCxL19gI0kxmDIaUQuHSyP3B2z+EmBKcN/Xw==" ]; diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix index f264e1a..dccae07 100644 --- a/modules/examples/lnl.nix +++ b/modules/examples/lnl.nix @@ -1,10 +1,6 @@ { config, lib, inputs, pkgs, ... }: { - # imports = [ ~/.config/nixpkgs/darwin/local-configuration.nix ]; - - # system.patches = [ ./pam.patch ]; - system.defaults.NSGlobalDomain.AppleKeyboardUIMode = 3; system.defaults.NSGlobalDomain.ApplePressAndHoldEnabled = false; system.defaults.NSGlobalDomain.InitialKeyRepeat = 10; @@ -52,7 +48,6 @@ pkgs.jq pkgs.ripgrep pkgs.shellcheck - pkgs.vault pkgs.qes ]; @@ -94,7 +89,7 @@ ''; nix.settings.trusted-public-keys = [ "cache.daiderd.com-1:R8KOWZ8lDaLojqD+v9dzXAqGn29gEzPTTbr/GIpCTrI=" ]; - nix.settings.trusted-substituters = [ https://d3i7ezr9vxxsfy.cloudfront.net ]; + nix.settings.trusted-substituters = [ "https://d3i7ezr9vxxsfy.cloudfront.net" ]; nix.settings.sandbox = true; nix.settings.extra-sandbox-paths = [ "/private/tmp" "/private/var/tmp" "/usr/bin/env" ]; @@ -300,8 +295,6 @@ fi ''; - # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix"; - nixpkgs.config.allowUnfree = true; nixpkgs.overlays = [ -- 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') 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 - modules/examples/hydra.nix | 2 -- modules/examples/lnl.nix | 1 - modules/examples/simple.nix | 1 - 4 files changed, 5 deletions(-) (limited to 'modules/examples') 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. diff --git a/modules/examples/hydra.nix b/modules/examples/hydra.nix index eb1c5d9..f87ed5d 100644 --- a/modules/examples/hydra.nix +++ b/modules/examples/hydra.nix @@ -8,8 +8,6 @@ let in { - services.nix-daemon.enable = true; - nix.settings.substituters = [ "http://cache1" ]; nix.settings.trusted-public-keys = [ "cache.daiderd.com-1:R8KOWZ8lDaLojqD+v9dzXAqGn29gEzPTTbr/GIpCTrI=" ]; diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix index dccae07..2204c2f 100644 --- a/modules/examples/lnl.nix +++ b/modules/examples/lnl.nix @@ -77,7 +77,6 @@ # serviceConfig.ProcessType = "Background"; # }; - services.nix-daemon.enable = true; # services.nix-daemon.enableSocketListener = true; nix.extraOptions = '' diff --git a/modules/examples/simple.nix b/modules/examples/simple.nix index 5baf009..c76ecda 100644 --- a/modules/examples/simple.nix +++ b/modules/examples/simple.nix @@ -12,7 +12,6 @@ # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix"; # Auto upgrade nix package and the daemon service. - # services.nix-daemon.enable = true; # nix.package = pkgs.nix; # Enable alternative shell support in nix-darwin. -- 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 --- modules/examples/simple.nix | 3 --- 2 files changed, 6 deletions(-) (limited to 'modules/examples') 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"; diff --git a/modules/examples/simple.nix b/modules/examples/simple.nix index c76ecda..8d769a2 100644 --- a/modules/examples/simple.nix +++ b/modules/examples/simple.nix @@ -11,9 +11,6 @@ # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix"; - # Auto upgrade nix package and the daemon service. - # nix.package = pkgs.nix; - # Enable alternative shell support in nix-darwin. # programs.fish.enable = true; -- cgit v1.2.3 From 9a1bea70d5728a19ee0a090dc0bcdeb73f09b7a4 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sun, 17 Nov 2024 02:33:37 +1100 Subject: installer: move creating default configuration to README --- modules/examples/simple.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'modules/examples') diff --git a/modules/examples/simple.nix b/modules/examples/simple.nix index 8d769a2..5771ec6 100644 --- a/modules/examples/simple.nix +++ b/modules/examples/simple.nix @@ -7,9 +7,8 @@ [ pkgs.vim ]; - # Use a custom configuration.nix location. - # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix - # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix"; + # Use custom location for configuration.nix. + environment.darwinConfig = "$HOME/.config/nix-darwin/configuration.nix"; # Enable alternative shell support in nix-darwin. # programs.fish.enable = true; -- 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') 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') 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