Update flakes (#555)

Author: Enzime

docs/book.toml

@@ -1,6 +1,5 @@
 [book]
 authors = [ ]
 language = "en"
-multilingual = false
 src = "."
 title = "nixos-anywhere - install NixOS everywhere"

flake.lock

@@ -12,7 +12,7 @@
     nixos-images.inputs.nixos-unstable.follows = "nixpkgs";
     nixos-images.inputs.nixos-stable.follows = "nixos-stable";
     # https://github.com/numtide/nix-vm-test/pull/105
-    nix-vm-test = { url = "github:Mic92/nix-vm-test"; inputs.nixpkgs.follows = "nixpkgs"; };
+    nix-vm-test = { url = "github:Enzime/nix-vm-test/pr-105-latest"; inputs.nixpkgs.follows = "nixpkgs"; };
 
     # used for development
     treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; };

flake.nix

@@ -4,12 +4,7 @@
     name = "from-nixos-build-on-remote";
     nodes = {
       installer = ./modules/installer.nix;
-      installed = {
-        services.openssh.enable = true;
-        virtualisation.memorySize = 1500;
-
-        users.users.root.openssh.authorizedKeys.keyFiles = [ ./modules/ssh-keys/ssh.pub ];
-      };
+      installed = ./modules/target-base.nix;
     };
     testScript = ''
       def create_test_machine(

tests/from-nixos-build-on-remote.nix

@@ -7,12 +7,7 @@
       ];
       environment.systemPackages = [ pkgs.jq ];
     };
-    installed = {
-      services.openssh.enable = true;
-      virtualisation.memorySize = 1500;
-
-      users.users.root.openssh.authorizedKeys.keyFiles = [ ./modules/ssh-keys/ssh.pub ];
-    };
+    installed = ./modules/target-base.nix;
   };
   testScript = ''
     start_all()

tests/from-nixos-generate-config.nix

@@ -3,14 +3,14 @@
   nodes = {
     installer = ./modules/installer.nix;
     installed = {
-      services.openssh.enable = true;
-      virtualisation.memorySize = 1500;
+      imports = [ ./modules/target-base.nix ];
 
       users.users.nixos = {
         isNormalUser = true;
         openssh.authorizedKeys.keyFiles = [ ./modules/ssh-keys/ssh.pub ];
         extraGroups = [ "wheel" ];
       };
+
       security.sudo.enable = true;
       security.sudo.wheelNeedsPassword = false;
     };

tests/from-nixos-separated-phases.nix

@@ -3,15 +3,15 @@
   nodes = {
     installer = ./modules/installer.nix;
     installed = {
-      services.openssh.enable = true;
-      virtualisation.memorySize = 1500;
+      imports = [ ./modules/target-base.nix ];
 
       users.users.nixos = {
         isNormalUser = true;
         password = "somespecialpassword";
         openssh.authorizedKeys.keyFiles = [ ./modules/ssh-keys/ssh.pub ];
         extraGroups = [ "wheel" ];
       };
+
       security.sudo.enable = true;
       security.sudo.wheelNeedsPassword = true;
     };

tests/from-nixos-with-sudo.nix

@@ -4,12 +4,7 @@
     name = "from-nixos";
     nodes = {
       installer = ./modules/installer.nix;
-      installed = {
-        services.openssh.enable = true;
-        virtualisation.memorySize = 1500;
-
-        users.users.root.openssh.authorizedKeys.keyFiles = [ ./modules/ssh-keys/ssh.pub ];
-      };
+      installed = ./modules/target-base.nix;
     };
     testScript = ''
       def create_test_machine(

tests/from-nixos.nix

@@ -0,0 +1,7 @@
+{
+  services.openssh.enable = true;
+  virtualisation.memorySize = 1500;
+  virtualisation.diskSize = 1536;
+
+  users.users.root.openssh.authorizedKeys.keyFiles = [ ./ssh-keys/ssh.pub ];
+}