From fba4db8435e5123c6464087eeedef5bb7d8b4efb Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 1 Dec 2023 06:52:47 +0000
Subject: [PATCH] Back to using nyxt as main browser with chromium as backup
 (and for PWAs)

---
 flake.nix                        |  2 +-
 home/hyprland/default.nix        | 21 ++++++++++----------
 home/hyprland/waybar/default.nix | 10 ++++------
 home/nyxt/config.lisp            | 33 +++++++++++++++++---------------
 system/desktop.nix               |  2 +-
 5 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/flake.nix b/flake.nix
index eec1b3d2..34af2ae8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,10 +26,10 @@
           ./home/accounts/default.nix
           ./home/emacs/default.nix
           ./home/hyprland/default.nix
+          ./home/nyxt/default.nix
           ./home/alacritty.nix
           ./home/btop.nix
           ./home/default.nix
-          ./home/firefox.nix
           ./home/media.nix
           ./home/pass.nix
         ];
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 3f1fb714..cda717f2 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -38,16 +38,17 @@
         "image/png" = [ "swayimg.desktop" ];
         "video/mp4" = [ "mpv.desktop" ];
         "text/csv" = [ "calc.desktop" ];
-        "x-scheme-handler/http" = [ "firefox.desktop" ];
-        "x-scheme-handler/https" = [ "firefox.desktop" ];
-        "x-scheme-handler/chrome" = [ "firefox.desktop" ];
-        "text/html" = [ "firefox.desktop" ];
-        "application/x-extension-htm" = [ "firefox.desktop" ];
-        "application/x-extension-html" = [ "firefox.desktop" ];
-        "application/x-extension-shtml" = [ "firefox.desktop" ];
-        "application/xhtml+xml" = [ "firefox.desktop" ];
-        "application/x-extension-xhtml" = [ "firefox.desktop" ];
-        "application/x-extension-xht" = [ "firefox.desktop" ];
+        # "text/html" = [ "chromium-browser.desktop" ];
+        # "x-scheme-handler/http" = [ "chromium-browser.desktop" ];
+        # "x-scheme-handler/https" = [ "chromium-browser.desktop" ];
+        # "x-scheme-handler/about" = [ "chromium-browser.desktop" ];
+        # "x-scheme-handler/chrome" = [ "chromium-browser.desktop" ];
+        # "application/x-extension-htm" = [ "firefox.desktop" ];
+        # "application/x-extension-html" = [ "firefox.desktop" ];
+        # "application/x-extension-shtml" = [ "firefox.desktop" ];
+        # "application/xhtml+xml" = [ "firefox.desktop" ];
+        # "application/x-extension-xhtml" = [ "firefox.desktop" ];
+        # "application/x-extension-xht" = [ "firefox.desktop" ];
       };
       associations.added = defaultApplications;
     };
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index cb8f9fc7..fd8adb04 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -37,11 +37,11 @@
           "5" = "󰫇";
           "6" = "󰫈";
           "emacs" = "";
-          "web" = "󰈹";
+          "web" = "󰀹";
           "discord" = "󰙯";
           "steam" = "󰓓";
           "apps" = "󰜫";
-          "top" = "󰒋";
+          "top" = "";
           "remote" = "󰢹";
           default = "󰋙";
           special = "󰁡";
@@ -52,12 +52,10 @@
       "hyprland/window" = {
         rewrite = {
           "(.*) - GNU Emacs(.*)" = " $1";
-          "btop" = " System Status";
-          "ncspot" = "󰓇 Spotify TUI";
-          "Nyxt - (.*)" = "󰀹 $1";
-          "(.*) — Mozilla Firefox" = "󰈹 $1";
           "(.*) - Discord" = "󰙯 $1";
+          "(.*) — Mozilla Firefox" = "󰈹 $1";
           "(.*) - Chromium" = " $1";
+          "Nyxt - (.*)" = "󰀹 $1";
           "Microsoft Teams - (.*)" = "󰊻 $1";
           "Microsoft Teams classic" = "󰊻";
           "Microsoft 365 - (.*)" = "󰏆 $1";
diff --git a/home/nyxt/config.lisp b/home/nyxt/config.lisp
index 7f27659f..43b2fe39 100644
--- a/home/nyxt/config.lisp
+++ b/home/nyxt/config.lisp
@@ -8,21 +8,24 @@
     ((default-modes (pushnew 'nyxt/mode/blocker:blocker-mode %slot-value%))))
 (define-configuration context-buffer
     ((search-engines (list
-		      (make-instance 'search-engine
-				     :name "Wikipedia"
-				     :shortcut "wiki"
-				     :search-url "https://en.wikipedia.org/w/index.php?search=~a"
-				     :fallback-url (quri.uri:uri "https://en.wikipedia.org/"))
-		      (make-instance 'search-engine
-				     :name "MyNixOS"
-				     :shortcut "nix"
-				     :search-url "https://mynixos.com/search?q=~a"
-				     :fallback-url (quri.uri:uri "https://mynixos.com/"))
-		      (make-instance 'search-engine
-				     :name "DuckDuckGo"
-				     :shortcut "ddg"
-				     :search-url "https://duckduckgo.com/?q=~a"
-				     :fallback-url (quri.uri:uri "https://duckduckgo.com/"))))))
+		      (make-instance
+		       'search-engine
+		       :name "Wikipedia"
+		       :shortcut "wiki"
+		       :search-url "https://en.wikipedia.org/w/index.php?search=~a"
+		       :fallback-url (quri.uri:uri "https://en.wikipedia.org/"))
+		      (make-instance
+		       'search-engine
+		       :name "MyNixOS"
+		       :shortcut "mn"
+		       :search-url "https://mynixos.com/search?q=~a"
+		       :fallback-url (quri.uri:uri "https://mynixos.com/"))
+		      (make-instance
+		       'search-engine
+		       :name "DuckDuckGo"
+		       :shortcut "ddg"
+		       :search-url "https://duckduckgo.com/?q=~a"
+		       :fallback-url (quri.uri:uri "https://duckduckgo.com/"))))))
 (define-configuration browser
     ((theme (make-instance
 	     'theme:theme
diff --git a/system/desktop.nix b/system/desktop.nix
index cf3b2844..425b2901 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -1,7 +1,7 @@
 { config, pkgs, user, ... }:
 
 {
-  imports = [ ./default.nix ./firefox.nix ./chromium.nix ];
+  imports = [ ./default.nix ./chromium.nix ];
   environment.systemPackages = with pkgs; [
     dex
     mesa