diff --git a/nixos/flake.nix b/nixos/flake.nix index 74b4f9e..ca8006d 100755 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -25,7 +25,7 @@ # This is a path to the services I've declared. # It just happens to be stored in the same repository (relative), # but could well be a separate repository - # follow nixpkgs on all, otherwise each builds its own version + # follow nixpkgs on all, otherwise each builds its own version ("derivation" maybe, idk) nimh-static = { url = "path:../homelab-services/nimh-static"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/test-vms/.sops.yaml b/virtual-machines/.sops.yaml similarity index 100% rename from test-vms/.sops.yaml rename to virtual-machines/.sops.yaml diff --git a/test-vms/vm-test/flake.lock b/virtual-machines/vm-test/flake.lock similarity index 100% rename from test-vms/vm-test/flake.lock rename to virtual-machines/vm-test/flake.lock diff --git a/test-vms/vm-test/flake.nix b/virtual-machines/vm-test/flake.nix similarity index 100% rename from test-vms/vm-test/flake.nix rename to virtual-machines/vm-test/flake.nix diff --git a/test-vms/vm-test/secrets/psql.yaml b/virtual-machines/vm-test/secrets/psql.yaml similarity index 100% rename from test-vms/vm-test/secrets/psql.yaml rename to virtual-machines/vm-test/secrets/psql.yaml diff --git a/test-vms/vm-test/virtual.nix b/virtual-machines/vm-test/virtual.nix similarity index 90% rename from test-vms/vm-test/virtual.nix rename to virtual-machines/vm-test/virtual.nix index ade764d..b363989 100644 --- a/test-vms/vm-test/virtual.nix +++ b/virtual-machines/vm-test/virtual.nix @@ -4,16 +4,13 @@ meta, ... }: -# Decrypt credentials to use in VM -# This exposes them in the VM. Images should be considered 'confidential' -# Though all secrets here should really only be able to access things inside the VM - { nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nixpkgs.config.allowUnfree = true; # Allow login and remote control of VM