From 2977c9c8b5ca0397ec619fb7417842e708181d8a Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 25 Dec 2022 12:11:29 +0100
Subject: [PATCH] legacy/desktop-default: cleanup

---
 legacy/modules/desktop-default.nix | 34 ++++++++++++++----------------
 legacy/modules/media.nix           |  1 +
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/legacy/modules/desktop-default.nix b/legacy/modules/desktop-default.nix
index 9dfab3d..be2760b 100644
--- a/legacy/modules/desktop-default.nix
+++ b/legacy/modules/desktop-default.nix
@@ -24,9 +24,8 @@
     arc-kde-theme
     arc-theme
     evince
-    firefox-wayland
-    #geary
-    unstable.ghostwriter
+    firefox
+    ghostwriter
     (gimp-with-plugins.override {
       plugins = with gimpPlugins; [
         resynthesizer
@@ -42,11 +41,19 @@
     gnome.simple-scan
     keepassxc
     keychain
-    konsole
     libnotify
     libreoffice
     lollypop
-    unstable.newsflash
+    (mpv.override {
+      scripts = with mpvScripts; [
+        convert
+        mpris
+        simple-mpv-webui
+        sponsorblock
+        thumbnail
+      ];
+    })
+    newsflash
     numix-cursor-theme
     numix-icon-theme
     numix-icon-theme-circle
@@ -60,31 +67,22 @@
     thunderbird
     virtmanager
     vlc
-    (mpv-with-scripts.override {
-      scripts = with mpvScripts; [
-        convert
-        mpris
-        simple-mpv-webui
-        sponsorblock
-        thumbnail
-      ];
-    })
     wayvnc
     xdg-utils
     zathura
     zeal
 
     # TODO sort them in different files
-    pdfgrep
-    physlock
     #symlinks
   ];
 
   # Enable firmware update daemon
   services.fwupd.enable = true;
 
-  programs.wireshark.enable = true;
-  programs.wireshark.package = pkgs.wireshark;
+  programs.wireshark = {
+    enable = true;
+    package = pkgs.wireshark;
+  };
 
   services.accounts-daemon.enable = true;
 
diff --git a/legacy/modules/media.nix b/legacy/modules/media.nix
index 67788f3..4e4bdb7 100644
--- a/legacy/modules/media.nix
+++ b/legacy/modules/media.nix
@@ -20,6 +20,7 @@ in
     mp3gain
     mp3splt # splitting mp3 files
     mp3val
+    pdfgrep # grep in pdfs
     pdfsam-basic # pdf editing
     picard # music tagging
     projectm # visualization of music