From d10ee2aeac9bf0cc27cf1597ea9b162ecaa0e5e8 Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Mon, 16 Jan 2023 10:47:58 +0100
Subject: [PATCH] Remove obsolete packages

---
 defaults/threema                      |  2 +-
 home/fhauser/applications/default.nix | 21 +--------------------
 home/fhauser/applications/scripts.nix | 14 +-------------
 home/fhauser/applications/webapps.nix | 12 +-----------
 home/fhauser/default.nix              |  2 +-
 home/fhauser/multimedia.nix           |  6 +-----
 6 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/defaults/threema b/defaults/threema
index cc850d8..4263a90 160000
--- a/defaults/threema
+++ b/defaults/threema
@@ -1 +1 @@
-Subproject commit cc850d8ec36f82f8f2e8eaeb42de4a69b16629de
+Subproject commit 4263a9013c5cc43c1d88c5acf92e08a69d82f827
diff --git a/home/fhauser/applications/default.nix b/home/fhauser/applications/default.nix
index 3759487..6bc744f 100644
--- a/home/fhauser/applications/default.nix
+++ b/home/fhauser/applications/default.nix
@@ -37,31 +37,15 @@
     sessionVariables = { NIXOS_OZONE_WL = "1"; };
     packages = with pkgs;
       [ # Networking
-        unison
         transmission # GUI Tools, maybe extract...
       ] ++ [ # Desktop Environment Applications
         google-chrome
         chromium
-        #qutebrowser  # TODO: Currently unused
-        synergy
-        #quicksynergy # Currently unused
         nextcloud-client
         owncloud-client
-      ] ++ [ # office # TODO: Migrate to office.nix
-        # TODO: Build fails!
+      ] ++ [ # office
         libreoffice-fresh # TODO: Dictionaries, nixos/nixpkgs#14430
-        #      pdfgrep
-        #      pdftk
-        #      calibre
         tectonic
-        #      texstudio
-        #      pandoc
-        #      system-config-printer
-        #      cups-pk-helper
-        #      cups-bjnp
-        #      gutenprint
-        #      gutenprintBin
-        #      hplipWithPlugin
         simple-scan
         pkgs.gnome-online-accounts
         gnome.gnome-control-center
@@ -73,9 +57,6 @@
         rdesktop
       ] ++ [ # Development
         vscodium
-        gitlab-runner
-        docker-compose
-        vagrant
         virt-manager
         modemmanager # TODO: makes sense here?
         modem-manager-gui
diff --git a/home/fhauser/applications/scripts.nix b/home/fhauser/applications/scripts.nix
index aad62d1..0110a33 100644
--- a/home/fhauser/applications/scripts.nix
+++ b/home/fhauser/applications/scripts.nix
@@ -25,16 +25,4 @@ let
 
     ${pkgs.pass-wayland}/bin/pass show -c "$password" 2>/dev/null
   '';
-  wsudo = with pkgs.xorg;
-    pkgs.writeScriptBin "wsudo" ''
-      #!/usr/bin/env bash
-      #small script to enable root access to x-windows system
-      ${xhost}/bin/xhost +SI:localuser:root
-      sudo $1
-      #disable root access after application terminates
-      ${xhost}/bin/xhost -SI:localuser:root
-      #print access status to allow verification that root access was remov
-      ed
-      ${xhost}/bin/xhost
-    '';
-in { home.packages = [ passbemenu wsudo ]; }
+in { home.packages = [ passbemenu ]; }
diff --git a/home/fhauser/applications/webapps.nix b/home/fhauser/applications/webapps.nix
index 47c4475..f0574fb 100644
--- a/home/fhauser/applications/webapps.nix
+++ b/home/fhauser/applications/webapps.nix
@@ -11,16 +11,6 @@ let
   threema-work = web-app "threema-work" "https://web-beta.threema.ch/";
   threema-red = web-app "threema-red" "https://web-work-staging.threema.ch/";
   threema-tickets = web-app "threema-tickets" "https://ticket.threema.ch/scp/";
-  netflix = web-app "netflix" "https://netflix.com/";
-  disneyplus = web-app "disneyplus" "https://disneyplus.com/";
 in {
-  home.packages = [
-    whatsapp
-    netflix
-    disneyplus
-    threema
-    threema-work
-    threema-red
-    threema-tickets
-  ];
+  home.packages = [ whatsapp threema threema-work threema-red threema-tickets ];
 }
diff --git a/home/fhauser/default.nix b/home/fhauser/default.nix
index 78ae766..4157e3d 100644
--- a/home/fhauser/default.nix
+++ b/home/fhauser/default.nix
@@ -3,7 +3,7 @@
     ./multimedia.nix
     ./applications
     ./mimetypes.nix
-    ./games.nix
+    # ./games.nix
 
     threemaModules.home
   ];
diff --git a/home/fhauser/multimedia.nix b/home/fhauser/multimedia.nix
index 143a6a9..58cf06b 100644
--- a/home/fhauser/multimedia.nix
+++ b/home/fhauser/multimedia.nix
@@ -2,9 +2,7 @@
 
 {
   home.packages = with pkgs;
-    [ vlc v4l-utils calibre blender openshot-qt playerctl youtube-dl ]
-    ++ [ # Audio
-      audacity
+    [ vlc v4l-utils playerctl yt-dlp ] ++ [ # Audio
       gnome.gnome-sound-recorder
       enblend-enfuse
       ffmpeg
@@ -30,8 +28,6 @@
       # ImageMagick-perl perl-File-Type perl-Term-ProgressBar #TODO: Support libraries for scripts
       inkscape
       ghostscript
-      stellarium
-      #unity3d
     ] ++ [ # Codecs for Audio and Video
       vobcopy
       libdv