1 files changed, 29 insertions, 16 deletions
diff --git a/roles/remote-server.nix b/roles/remote-server.nix
index 6091bd7..f27721e 100644
--- a/roles/remote-server.nix
+++ b/roles/remote-server.nix
@@ -1,15 +1,42 @@
 {
+  pkgs,
   ...
 }:
+
 {
   imports = [
-    # we inherit from desktop
-    ./desktop.nix
+    ../modules/common.nix
+    ../modules/plasma.nix
+    ../modules/fonts.nix
+    ../modules/flatpak.nix
+    ../modules/hardware-keys.nix
 
     # primary streaming setup
     ../modules/sunshine.nix
   ];
 
+  services = {
+    tailscale = {
+      enable = true;
+      useRoutingFeatures = "both";
+      extraUpFlags = [ "--ssh" ];
+    };
+    openssh = {
+      enable = true;
+      openFirewall = true;
+    };
+  };
+
+  programs = {
+    steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+      dedicatedServer.openFirewall = true;
+      localNetworkGameTransfers.openFirewall = true;
+    };
+    virt-manager.enable = true;
+  };
+
   virtualisation = {
     docker = {
       enable = true;
@@ -20,19 +47,5 @@
     };
   };
 
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true;
-    dedicatedServer.openFirewall = true;
-    localNetworkGameTransfers.openFirewall = true;
-  };
-
-  services.openssh = {
-    enable = true;
-    openFirewall = true;
-  };
-
-  # override desktop configuration, because we do run SSH
-  # on remote-servers.
   age.identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
 }