1 files changed, 0 insertions, 40 deletions

diff --git a/hel.nix b/hel.nix
index 0c64ef19..743c86aa 100644
--- a/hel.nix
+++ b/hel.nix
@@ -142,17 +142,6 @@
 
     openssh = {
       enable = true;
-      extraConfig = ''
-        Match User media
-          ForceCommand internal-sftp
-          PermitTTY no
-          AllowTcpForwarding no
-          AllowStreamLocalForwarding no
-          X11Forwarding no
-          AllowAgentForwarding no
-          ChrootDirectory /run/%u
-          AuthorizedKeysFile /etc/ssh/authorized_keys.d/%u
-      '';
     };
 
     atd = {
@@ -334,16 +323,6 @@
 
     extraUsers.gkleen.extraGroups = [ "media" "networkmanager" "docker" ];
 
-    extraUsers.media = {
-      group = "media";
-      home = "/var/media";
-      isSystemUser = true;
-      openssh.authorizedKeys.keyFiles = [
-        ./users/keys/gkleen-media-hel.pub
-      ];
-      useDefaultShell = true;
-    };
-
     extraUsers.postfix_ssh = {
       isSystemUser = true;
       home = "/var/db/postfix_ssh";
@@ -351,9 +330,6 @@
 
     extraGroups = {
       network = {};
-      media = {
-        members = [ "uucp" "media" ];
-      };
     };
   };
 
@@ -460,13 +436,6 @@
   };
 
   systemd.automounts = [
-    { 
-      where = "/run/media/var/media";
-      automountConfig = {
-        DirectoryMode = "700";
-      };
-      wantedBy = [ "local-fs.target" ];
-    }
     {
       where = "/media";
       automountConfig = {
@@ -478,15 +447,6 @@
   ];
 
   systemd.mounts = [
-    { enable = true;
-      where = "/run/media/var/media";
-      what = "/var/media";
-      type = "none";
-      options = "bind";
-      mountConfig = {
-        DirectoryMode = "700";
-      };
-    }
     {
       after = [ "network-online.target" ];
       bindsTo = [ "network-online.target" ];