Removed and added various packages (-librewolf, -onionshare-cli, +tabbed, et al)

nixos/cli.nix

@@ -103,6 +103,7 @@
     pdfgrep
     profanity
     recutils
+    surfraw
     ssss
     tut
     unrar

nixos/gui.nix

@@ -4,7 +4,7 @@
   environment = {
     variables = {
       VISUAL = "$EDITOR";
-      BROWSER = "librewolf";
+      BROWSER = "mullvad-browser";
       SXHKD_SHELL = "/bin/sh";
       TERMINAL = "st";
     };
@@ -55,8 +55,6 @@
   ];
   programs = {
     dconf.enable = true;
-  };
-  programs = {
     slock.enable = true;
   };
   users.users.${user.name}.packages = with pkgs; [
@@ -75,16 +73,19 @@
     lagrange
     libreoffice
     mangal
+    mpv
     mullvad-browser
     mupdf
-    onionshare
+    #onionshare-gui
     scrot
     signal-desktop
+    surf
     sxiv
+    tabbed
     tor-browser-bundle-bin
+    urlview
   ];
   environment.systemPackages = with pkgs; [
-    butt
     clipmenu
     dunst
     hsetroot