nixos: invert common dependency

nixos/common/default.nix

@@ -1,7 +1,8 @@
-{ pkgs, ... }:
+{ config, inputs, pkgs, ... }:
 
 {
   imports = [
+    inputs.vault-secrets.nixosModules.vault-secrets
     # User account definitions
     ./users
     ./services
@@ -38,4 +39,13 @@
     SystemMaxUse=100M
     MaxFileSec=7day
   '';
+
+  # Enable SSH daemon support.
+  services.openssh.enable = true;
+
+  vault-secrets = {
+        vaultPrefix = "nixos/${config.networking.hostName}";
+        vaultAddress = "http://10.42.42.6:8200/";
+        approlePrefix = "olympus-${config.networking.hostName}";
+    };
 }

nixos/common/generic-lxc.nix

@@ -3,7 +3,4 @@
 
   # Supress systemd services that don't work (correctly) on LXC
   systemd.suppressedSystemUnits = [ "dev-mqueue.mount" "sys-kernel-debug.mount" "sys-fs-fuse-connections.mount" ];
-
-  # Enable SSH daemon support.
-  services.openssh.enable = true;
 }

nixos/common/generic-vm.nix

@@ -5,10 +5,6 @@
   networking.useDHCP = false;
   networking.interfaces.ens18.useDHCP = lib.mkDefault true;
 
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-  services.openssh.permitRootLogin = lib.mkDefault "yes";
-
   # Enable qemu guest agent
   services.qemuGuest.enable = true;
 }