diff --git a/doc/tutorial/part-one/basic-hive.md b/doc/tutorial/part-one/basic-hive.md index 3da2f5b..6d978ee 100644 --- a/doc/tutorial/part-one/basic-hive.md +++ b/doc/tutorial/part-one/basic-hive.md @@ -33,11 +33,11 @@ Lets check out what wire sees with `wire show`. ```sh [nix-shell]$ wire show - WARN wire: use --json to output something scripting suitable -Hive { - nodes: {}, - schema: 0, -} + INFO eval_hive: evaluating hive HiveNix("/home/marsh/scratch/wire-tutorial/hive.nix") + WARN use --json to output something scripting suitable +Summary: 0 total node(s), totalling 0 keys (0 distinct). +Note: Listed connections are tried from Left to Right + ``` The line `nodes: {}` means theres no "nodes" in our hive. @@ -56,7 +56,7 @@ in wire.makeHive { meta.nixpkgs = import sources.nixpkgs { }; - virtual-machine = { # [!code ++] + virtual-machine = { pkgs, ... }: { # [!code ++] deployment.target = { # [!code ++] port = 2222; # [!code ++] hosts = [ "localhost" ]; # [!code ++] @@ -132,7 +132,7 @@ in wire.makeHive { meta.nixpkgs = import sources.nixpkgs { }; - virtual-machine = { + virtual-machine = { pkgs, ... }: { deployment.target = { port = 2222; hosts = [ "localhost" ]; diff --git a/doc/tutorial/part-one/repo-setup.md b/doc/tutorial/part-one/repo-setup.md index 995443e..c9e1824 100644 --- a/doc/tutorial/part-one/repo-setup.md +++ b/doc/tutorial/part-one/repo-setup.md @@ -27,14 +27,22 @@ Great! Now lets use Git & `npins` to create a new Git repo and initialise it. [nix-shell]$ git init wire-tutorial Initialized empty Git repository in /home/.../wire-tutorial/.git/ [nix-shell]$ cd wire-tutorial/ -[nix-shell]$ npins init +[nix-shell]$ npins init --bare [INFO ] Welcome to npins! [INFO ] Creating `npins` directory [INFO ] Writing default.nix -[INFO ] Writing initial lock file with nixpkgs entry (need to fetch latest commit first) +[INFO ] Writing initial lock file (empty) [INFO ] Successfully written initial files to 'npins/sources.json'. +[nix-shell]$ npins add github pkpbynum nixpkgs --branch pb/disk-size-bootloader ``` +::: details + +This tutorial is using a [PR](https://github.com/NixOS/nixpkgs/pull/449945) that +fixes virutal machine bootloader disk sizes. + +::: + This has created a pinned version of `nixpkgs` for us to use in our Wire hive. ## Adding wire as a dependency @@ -58,10 +66,13 @@ project: ```sh [nix-shell]$ npins show -nixpkgs: (Nix channel) - name: nixpkgs-unstable - url: https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre861972.88cef159e47c/nixexprs.tar.xz - hash: 0zscvr0qa3capyzhmp798hgncz2qy8ggm843y10wk35jk7p0174f +nixpkgs: (git repository) + repository: https://github.com/pkpbynum/nixpkgs.git + branch: pb/disk-size-bootloader + submodules: false + revision: da2060bdc1c9bc35acc4eafa265ba6b6c64f9926 + url: https://github.com/pkpbynum/nixpkgs/archive/da2060bdc1c9bc35acc4eafa265ba6b6c64f9926.tar.gz + hash: 0j07gvnm7c5mzw1313asa8limzbmsbnsd02dcw22ing8fg3vbb7g frozen: false wire: (git release tag) diff --git a/doc/tutorial/part-one/vm-setup.md b/doc/tutorial/part-one/vm-setup.md index 9b0587d..8ebd975 100644 --- a/doc/tutorial/part-one/vm-setup.md +++ b/doc/tutorial/part-one/vm-setup.md @@ -41,10 +41,14 @@ in getty.autologinUser = "root"; }; + boot.growPartition = true; + virtualisation = { graphics = false; useBootLoader = true; + diskSize = 5 * 1024; + # forward `openssh` port 22 to localhost:2222. forwardPorts = [ {