diff --git a/configurations/mail.nix b/configurations/mail.nix index 5ab996b2..04181ac5 100644 --- a/configurations/mail.nix +++ b/configurations/mail.nix @@ -172,8 +172,8 @@ in home = { packages = [ pkgs.khal pkgs.khard ]; file.".mailcap".text = '' - text/html; ${pkgs.firefox}/bin/firefox %s ; nametemplate=%s.html; needsterminal - text/html; ${pkgs.w3m}/bin/w3m -I %{charset} -T text/html ; copiousoutput; nametemplate=%s.html + text/html; ${pkgs.qutebrowser}/bin/qutebrowser %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 ''; }; xdg.configFile = { diff --git a/configurations/mime.nix b/configurations/mime.nix index 95fa8bcc..95218b6d 100644 --- a/configurations/mime.nix +++ b/configurations/mime.nix @@ -12,13 +12,11 @@ "image/jpeg" = [ "org.kde.okular.desktop" ]; "application/pdf" = [ "org.kde.okular.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/mailto" = [ "thunderbird.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" ]; "x-scheme-handler/msteams" = [ "teams.desktop" ]; }; diff --git a/configurations/qutebrowser.nix b/configurations/qutebrowser.nix new file mode 100644 index 00000000..48ffbfb7 --- /dev/null +++ b/configurations/qutebrowser.nix @@ -0,0 +1,19 @@ +{ pkgs, ... }: { + environment.systemPackages = [ pkgs.eid-mw ]; + + home-manager.users.charlotte = { ... }: { + programs.qutebrowser = { + enable = true; + extraConfig = '' + config.load_autoconfig() + ''; + }; + }; + + custom.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 d39a28a0..950af720 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.firefox}/bin/firefox + exec ${pkgs.qutebrowser}/bin/qutebrowser 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 83c75c3f..cc1c8b1b 100644 --- a/profiles/graphical.nix +++ b/profiles/graphical.nix @@ -18,6 +18,7 @@ ../configurations/mounts.nix ../configurations/mumble.nix ../configurations/networkmanager.nix + ../configurations/qutebrowser.nix ../configurations/sound.nix ../configurations/sway.nix ../configurations/syncthing.nix