From c44304ca1052349bcd4acbd06b18315c929e2ce7 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Thu, 19 Nov 2020 18:49:12 +0100
Subject: [PATCH] Switch back to Firefox

---
 configurations/mail.nix        |  2 +-
 configurations/mime.nix        | 10 +++----
 configurations/qutebrowser.nix | 50 ----------------------------------
 configurations/sway.nix        |  2 +-
 profiles/graphical.nix         |  1 -
 5 files changed, 7 insertions(+), 58 deletions(-)
 delete mode 100644 configurations/qutebrowser.nix

diff --git a/configurations/mail.nix b/configurations/mail.nix
index f2698577..177f2857 100644
--- a/configurations/mail.nix
+++ b/configurations/mail.nix
@@ -196,7 +196,7 @@ in
     home = {
       packages = [ pkgs.khal pkgs.khard ];
       file.".mailcap".text = ''
-        text/html; ${pkgs.qutebrowser}/bin/qutebrowser %s ; nametemplate=%s.html; needsterminal
+        text/html; ${pkgs.firefox}/bin/firefox %s ; nametemplate=%s.html; needsterminal
         text/html; ${pkgs.w3m}/bin/w3m -dump -o display_link_number=1 -o document_charset=%{charset} %s ; copiousoutput; nametemplate=%s.html
       '';
     };
diff --git a/configurations/mime.nix b/configurations/mime.nix
index 95218b6d..c18ebfdd 100644
--- a/configurations/mime.nix
+++ b/configurations/mime.nix
@@ -12,11 +12,11 @@
         "image/jpeg" = [ "org.kde.okular.desktop" ];
         "application/pdf" = [ "org.kde.okular.desktop" ];
 
-        "text/html" = [ "org.qutebrowser.qutebrowser.desktop" ];
-        "x-scheme-handler/about" = [ "org.qutebrowser.qutebrowser.desktop" ];
-        "x-scheme-handler/http" = [ "org.qutebrowser.qutebrowser.desktop" ];
-        "x-scheme-handler/https" = [ "org.qutebrowser.qutebrowser.desktop" ];
-        "x-scheme-handler/unknown" = [ "org.qutebrowser.qutebrowser.desktop" ];
+        "text/html" = [ "firefox.desktop" ];
+        "x-scheme-handler/about" = [ "firefox.desktop" ];
+        "x-scheme-handler/http" = [ "firefox.desktop" ];
+        "x-scheme-handler/https" = [ "firefox.desktop" ];
+        "x-scheme-handler/unknown" = [ "firefox.desktop" ];
 
         "x-scheme-handler/msteams" = [ "teams.desktop" ];
       };
diff --git a/configurations/qutebrowser.nix b/configurations/qutebrowser.nix
deleted file mode 100644
index 61afaca2..00000000
--- a/configurations/qutebrowser.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = [ pkgs.eid-mw ];
-
-  home-manager.users.charlotte = { ... }: {
-    programs.qutebrowser = {
-      enable = true;
-      keyBindings = {
-        normal = {
-          "x" = "spawn --detach ${pkgs.mpv}/bin/umpv {url}";
-          ";x" = "hint links spawn --detach ${pkgs.mpv}/bin/umpv {hint-url}";
-          "tch" = "config-cycle -p -t -u *://{url:host}/* content.cookies.accept no-3rdparty never ;; reload";
-          "tCh" = "config-cycle -p -u *://{url:host}/* content.cookies.accept no-3rdparty never ;; reload";
-          "tcH" = "config-cycle -p -t -u *://*.{url:host}/* content.cookies.accept no-3rdparty never ;; reload";
-          "tCH" = "config-cycle -p -u *://*.{url:host}/* content.cookies.accept no-3rdparty never ;; reload";
-          "tcu" = "config-cycle -p -t -u {url} content.cookies.accept no-3rdparty never ;; reload";
-          "tCu" = "config-cycle -p -u {url} content.cookies.accept no-3rdparty never ;; reload";
-        };
-      };
-      settings = {
-        auto_save.session = true;
-        content = {
-          autoplay = false;
-          cookies.accept = "never";
-          default_encoding = "utf-8";
-          geolocation = false;
-          javascript.enabled = false;
-          pdfjs = true;
-        };
-        downloads = {
-          location.directory = "~/downloads";
-          open_dispatcher = "rifle";
-          remove_finished = 1000;
-        };
-        editor.command = [ "kitty" "-e" "nvim" "{file}" "-c" "normal {line}G{column0}" ];
-        input.insert_mode.auto_load = true;
-        url.default_page = "about:blank";
-      };
-      extraConfig = ''
-        config.load_autoconfig()
-      '';
-    };
-  };
-
-  chvp.zfs.homeLinks = [
-    { path = ".pki"; type = "cache"; } # Required for eid-mw browser configuration
-    { path = ".cache/qutebrowser"; type = "cache"; }
-    { path = ".local/share/qutebrowser"; type = "data"; }
-    { path = ".config/qutebrowser/autoconfig.yml"; type = "data"; }
-  ];
-}
diff --git a/configurations/sway.nix b/configurations/sway.nix
index ff261822..d9cd0fd2 100644
--- a/configurations/sway.nix
+++ b/configurations/sway.nix
@@ -124,7 +124,7 @@ in
         workspace 9 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
 
         workspace 1
-        exec ${pkgs.qutebrowser}/bin/qutebrowser
+        exec ${pkgs.firefox}/bin/firefox
         workspace 3
         exec ${pkgs.kitty}/bin/kitty -e ${pkgs.tmuxinator}/bin/tmuxinator start mail
         workspace 4
diff --git a/profiles/graphical.nix b/profiles/graphical.nix
index 9bda5b95..40825dbc 100644
--- a/profiles/graphical.nix
+++ b/profiles/graphical.nix
@@ -18,7 +18,6 @@
     ../configurations/mounts.nix
     ../configurations/mumble.nix
     ../configurations/networkmanager.nix
-    ../configurations/qutebrowser.nix
     ../configurations/sound.nix
     ../configurations/sway.nix
     ../configurations/syncthing.nix