From 0e7abe56cf19c814f82420a4ba16982100e38f0d Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Wed, 17 Apr 2024 16:12:09 +0200
Subject: [PATCH] ssh & packages: cleanup

---
 users/rouven/modules/packages.nix    |  7 +------
 users/rouven/modules/ssh/default.nix | 30 +++++++++++-----------------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index 19307c7..ae98767 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -17,7 +17,6 @@
     (zathura.override { plugins = [ zathuraPkgs.zathura_pdf_mupdf ]; })
     gimp
     ffmpeg
-    imv
 
     # bluetooth
     blueman
@@ -39,12 +38,10 @@
     bitwarden-cli
 
     # misc
-    neofetch # obligatory
     xournalpp
     libreoffice
     mosh
     typst
-    typst-preview
     hut
 
     # programming languages
@@ -73,8 +70,6 @@
 
   ];
 
-
-  programs.obs-studio.enable = true;
   programs.firefox.enable = true;
   programs = {
     thunderbird = {
@@ -98,7 +93,7 @@
     enable = true;
     defaultApplications =
       let
-        image-viewers = [ "imv.desktop" "gimp.desktop" "swappy.desktop" "org.qutebrowser.qutebrowser.desktop" "google-chrome.desktop" ];
+        image-viewers = [ "google-chrome.desktop" "gimp.desktop" "swappy.desktop" "org.qutebrowser.qutebrowser.desktop" ];
         browsers = [ "google-chrome.desktop" "firefox.desktop" "org.qutebrowser.qutebrowser.desktop" ];
       in
       {
diff --git a/users/rouven/modules/ssh/default.nix b/users/rouven/modules/ssh/default.nix
index 94c8371..7c5e6e3 100644
--- a/users/rouven/modules/ssh/default.nix
+++ b/users/rouven/modules/ssh/default.nix
@@ -16,7 +16,7 @@ in
       VisualHostKey = yes
     '';
     matchBlocks = {
-      # personal use
+      # Personal
       "git@github.com" = {
         match = "Host github.com User git";
         identityFile = git;
@@ -25,6 +25,16 @@ in
         match = "Host git.sr.ht User git";
         identityFile = git;
       };
+      "*.vpn.rfive.de" = {
+        user = "root";
+      };
+
+      # TU Dresden
+      "tud" = {
+        hostname = "login.zih.tu-dresden.de";
+        user = "rose159e";
+      };
+
       # iFSR
       "fsr" = {
         hostname = "ifsr.de";
@@ -33,27 +43,14 @@ in
       "quitte" = {
         hostname = "quitte.ifsr.de";
         user = "root";
-        extraOptions = {
-          RequestTTY = "yes";
-          RemoteCommand = "zsh -i";
-        };
-      };
-      "quitte-notty" = {
-        hostname = "quitte.ifsr.de";
-        user = "root";
       };
       "tomate" = {
         hostname = "tomate.ifsr.de";
         user = "root";
         extraOptions = {
-          RequestTTY = "yes";
-          RemoteCommand = "zsh -i";
+          ProxyJump = "tud";
         };
       };
-      "tomate-notty" = {
-        hostname = "tomate.ifsr.de";
-        user = "root";
-      };
       "git@ifsr.de" = {
         match = "Host ifsr.de User git";
         identityFile = git;
@@ -74,9 +71,6 @@ in
           VerifyHostKeyDNS = "yes";
         };
       };
-      "*.vpn.rfive.de" = {
-        user = "root";
-      };
       "git@git.agdsn.de" = {
         match = "Host git.agdsn.de User git";
         identityFile = git;