diff --git a/hosts/faunus-ater.nix b/hosts/faunus-ater.nix index 82a8eb3..3e49eb9 100644 --- a/hosts/faunus-ater.nix +++ b/hosts/faunus-ater.nix @@ -336,17 +336,6 @@ in { openFirewall = true; }; - users.users.sftp = { - description = "User used for all sftp stuff"; - isNormalUser = true; - group = "sftp"; - openssh.authorizedKeys.keyFiles = [ - ../secrets/users/malte/sftp-key.pub - ../secrets/users/marie/sftp-key.pub - ]; - }; - users.groups.sftp = {}; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; # === BACKUPS === diff --git a/modules/malte.nix b/modules/malte.nix index 2fa49fb..4fdbdaa 100644 --- a/modules/malte.nix +++ b/modules/malte.nix @@ -83,9 +83,6 @@ in { pw-mail-schulverwalter = { inherit sopsFile owner mode; }; - sftp-key = { - inherit sopsFile owner mode; - }; }; }; } diff --git a/modules/marie.nix b/modules/marie.nix index 4e170ae..2e36afe 100644 --- a/modules/marie.nix +++ b/modules/marie.nix @@ -38,9 +38,6 @@ in { inherit sopsFile owner mode; key = "restic-backup"; }; - sftp-key = { - inherit sopsFile owner mode; - }; }; }; } diff --git a/secrets/users/malte/sftp-key.pub b/secrets/users/malte/sftp-key.pub deleted file mode 100644 index de54814..0000000 --- a/secrets/users/malte/sftp-key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINZDmBkN2YF6kygXwbyeYXlRop/rSD8aGqA8cAm7RKzP malte@helix-texta diff --git a/secrets/users/marie/sftp-key.pub b/secrets/users/marie/sftp-key.pub deleted file mode 100644 index 5512079..0000000 --- a/secrets/users/marie/sftp-key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINejc/nHFr4ZFXuVaSLS3k822SIPSSKq+XWpkcGfPquC malte@helix-texta diff --git a/users/malte/home.nix b/users/malte/home.nix index 37a2ca8..d301add 100644 --- a/users/malte/home.nix +++ b/users/malte/home.nix @@ -189,24 +189,6 @@ in { defaultCalendar = "Malte"; }; - # TODO: Merge with Marie's part - systemd.user.mounts."home-malte-to\\x2dbe\\x2dprinted" = { - Unit = { - Description = "Directory that prints everything"; - }; - Install = { - WantedBy = ["default.target"]; - }; - Mount = { - What = "sftp@faunus-ater:/srv/to-be-printed"; - Where = "/home/malte/to-be-printed"; - Type = "fuse.sshfs"; - Options = "IdentityFile=/run/secrets/sftp-key"; - }; - }; - - services.protonmailBridge.enable = true; - services.darkman = { enable = true; settings = { diff --git a/users/marie/home.nix b/users/marie/home.nix index e864df7..0ecafc9 100644 --- a/users/marie/home.nix +++ b/users/marie/home.nix @@ -73,22 +73,6 @@ in { "org/gnome/desktop/background" = {picture-uri = "file://${bg}";}; }; - # TODO: Merge with Malte's part - systemd.user.mounts."home-marie-to\\x2dbe\\x2dprinted" = { - Unit = { - Description = "Directory that prints everything"; - }; - Install = { - WantedBy = ["default.target"]; - }; - Mount = { - What = "sftp@faunus-ater:/srv/to-be-printed"; - Where = "/home/marie/to-be-printed"; - Type = "fuse.sshfs"; - Options = "IdentityFile=/run/secrets/sftp-key"; - }; - }; - home.stateVersion = "18.09"; }; }