about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--users/aspen/system/system/machines/roswell.nix4
-rw-r--r--users/aspen/system/system/modules/common.nix8
2 files changed, 7 insertions, 5 deletions
diff --git a/users/aspen/system/system/machines/roswell.nix b/users/aspen/system/system/machines/roswell.nix
index e7529542a80d..da62eec93ec6 100644
--- a/users/aspen/system/system/machines/roswell.nix
+++ b/users/aspen/system/system/machines/roswell.nix
@@ -12,10 +12,6 @@
 
   networking.hostName = "roswell";
 
-  users.users.grfn.openssh.authorizedKeys.keys = [
-    depot.users.aspen.keys.main
-  ];
-
   boot.loader.systemd-boot.enable = lib.mkForce false;
   boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
 
diff --git a/users/aspen/system/system/modules/common.nix b/users/aspen/system/system/modules/common.nix
index 4ed1f8d7b196..17140317f5b3 100644
--- a/users/aspen/system/system/modules/common.nix
+++ b/users/aspen/system/system/modules/common.nix
@@ -44,7 +44,13 @@ with lib;
   documentation.dev.enable = true;
   documentation.man.generateCaches = true;
 
-  services.openssh.enable = true;
+  services.openssh = {
+    enable = true;
+    settings = { X11Forwarding = true; };
+  };
+
+  users.users.grfn.openssh.authorizedKeys.keys =
+    [ depot.users.aspen.keys.main ];
 
   programs.ssh.startAgent = true;