From 72fdeeb475a74767c6a5b299e897011d0f036348 Mon Sep 17 00:00:00 2001 From: Qyriad Date: Sun, 5 May 2024 17:19:26 -0600 Subject: [PATCH 1/2] add the full upgrade-nix invocation --- content/install_actual.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/content/install_actual.md b/content/install_actual.md index 6ea7ae6f..1b1ce3ed 100644 --- a/content/install_actual.md +++ b/content/install_actual.md @@ -75,8 +75,7 @@ of the `upgrade-nix` command. Thanks to Nix, we can actually ask Lix to upgrade your system directly. Run the following command: ```sh -sudo nix run --extra-experimental-features "nix-command flakes" \ - "git+https://git.lix.systems/lix-project/lix" -- upgrade-nix +sudo nix run --experimental-features "nix-command flakes" --extra-substituters https://cache.lix.systems --trusted-public-keys "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.0' -- upgrade-nix ``` You should now have upgraded to Lix! You can verify this by asking the `nix` command @@ -84,7 +83,7 @@ to report its version: ```sh $ nix --version -nix (Lix, like Nix) 2.90.0-lix +nix (Lix, like Nix) 2.90.0-beta.0 ``` As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a From 2870e395cfc935dd0fe937351e46585592323365 Mon Sep 17 00:00:00 2001 From: Qyriad Date: Sun, 5 May 2024 17:24:38 -0600 Subject: [PATCH 2/2] add binary cache instructions for NixOS --- content/add-to-config_actual.md | 38 +++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/content/add-to-config_actual.md b/content/add-to-config_actual.md index 6bd89a3d..c0298f3d 100644 --- a/content/add-to-config_actual.md +++ b/content/add-to-config_actual.md @@ -51,7 +51,7 @@ Next, add the `lix-module` as one of the arguments to your output function: } ``` -Finally, add the Lix _NixOS Module_ to your configuration: +Add the Lix _NixOS Module_ to your configuration: ```nix { @@ -64,7 +64,7 @@ Finally, add the Lix _NixOS Module_ to your configuration: # based on your platform (NixOS, nix-darwin) and architecture. nixosConfigurations.your-box = nixpkgs.lib.nixosSystem { system = "x86_64-linux" - + modules = [ # This is the important part -- add this line to your module list! @@ -78,12 +78,27 @@ Finally, add the Lix _NixOS Module_ to your configuration: } ``` +Finally, to add our binary cache (optional), add the following to any NixOS module in your configuration +(e.g. configuration.nix): + +```nix +{ + nix.settings.extra-substituters = [ + "https://cache.lix.systems" + ]; + + nix.settings.trusted-public-keys = [ + "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" + ]; +} +``` + Rebuild and switch into your new system (either using `nixos-rebuild` or `darwin-rebuild`). You should now be using Lix! You can verify this by asking the `nix` command to report its version: ```sh $ nix --version -nix (Lix, like Nix) 2.90.0-lix +nix (Lix, like Nix) 2.90.0-beta.0 ``` As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a @@ -132,12 +147,27 @@ section, and add the line provided in the configuration } ``` +Finally, to add our binary cache (optional), add the following to any NixOS module in your configuration +(e.g. configuration.nix): + +```nix +{ + nix.settings.extra-substituters = [ + "https://cache.lix.systems" + ]; + + nix.settings.trusted-public-keys = [ + "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" + ]; +} +``` + Rebuild and switch into your new system (either using `nixos-rebuild` or `darwin-rebuild`). You should now be using Lix! You can verify this by asking the `nix` command to report its version: ```sh $ nix --version -nix (Lix, like Nix) 2.90.0-lix +nix (Lix, like Nix) 2.90.0-beta.0 ``` As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a