diff --git a/hosts/default.nix b/hosts/default.nix index ef23c87..f8b8bcc 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -111,8 +111,7 @@ in server = lib.nixosSystem { # Desktop profile inherit system; - specialArgs = { inherit inputs userserver location nixos-hardware nur agenix; }; - user = userserver; + specialArgs = { inherit inputs user location nixos-hardware nur agenix; }; modules = [ agenix.nixosModules.default nur.nixosModules.nur diff --git a/hosts/dmz/default.nix b/hosts/dmz/default.nix index 686f09a..5b55652 100644 --- a/hosts/dmz/default.nix +++ b/hosts/dmz/default.nix @@ -17,7 +17,7 @@ # └─ default.nix # -{ config, pkgs, user, ... }: +{ config, pkgs, user, agenix, ... }: { imports = # For now, if applying to other system, swap files diff --git a/modules/services/dmz/microvm.nix b/modules/services/dmz/microvm.nix index ef9d872..e5eacca 100644 --- a/modules/services/dmz/microvm.nix +++ b/modules/services/dmz/microvm.nix @@ -1,15 +1,16 @@ -{ microvm, nixpkgs, user, ... }: +{ microvm, nixpkgs, user, agenix, ... }: let - name = "gitea"; + name = "gitea-runner"; in { microvm = { -# autostart = [ -# "gitea-runnervm" -# ]; + autostart = [ + "gitea-runnervm" + ]; vms = { ${name} = { + pkgs = import nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; @@ -18,7 +19,7 @@ in config = { imports = [( ./gitea_runner.nix )]; networking = { - hostName = "${name}-runner"; + hostName = "${name}"; firewall = { enable = true;