Minor changes

- Redid the flake module to be based on extendModules instead
- Added wrappers
- Refactored code
- Updated dependencies

hosts/hijiri-vm/default.nix

@@ -10,19 +10,24 @@
     username,
     ...
   }: {
+    _file = ./default.nix;
+
     imports = [
       "${modulesPath}/profiles/qemu-guest.nix"
-      (import ./disks.nix {})
+      ./disks.nix
     ];
     boot = {
       supportedFilesystems = ["btrfs"];
       loader.systemd-boot.enable = true;
+      loader.systemd-boot.configurationLimit = 1;
       loader.efi.canTouchEfiVariables = true;
     };
 
     nixpkgs.system = "aarch64-linux";
 
-    users.users.${username}.openssh.authorizedKeys.keys = lib.attrValues config.assets.sshKeys.user;
+    users.users.${username} = {
+      openssh.authorizedKeys.keys = lib.attrValues config.assets.sshKeys.user;
+    };
 
     networking.domain = "hijiri";
     networking.hostName = "vm";

hosts/hijiri-vm/disks.nix

@@ -1,4 +1,6 @@
-{bootDevice ? "/dev/vda", ...}: {
+args: let
+  bootDevice = args.bootDevice or "/dev/vda";
+in {
   disko.devices.disk.bootDisk = {
     type = "disk";
     device = bootDevice;
@@ -32,7 +34,10 @@
                 inherit mountOptions;
                 mountpoint = "/";
               };
-              "/nix" = {inherit mountOptions;};
+              "/nix" = {
+                inherit mountOptions;
+                mountpoint = "/nix";
+              };
             };
           };
         }