From 06148eb1a671135879d4440485b718a1fdab1581 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 15 Dec 2023 13:13:01 +0000
Subject: [PATCH] Swap firefox back for nyxt

---
 flake.nix                        |  2 +-
 home/hyprland/config.nix         |  1 +
 home/hyprland/default.nix        | 23 +++++++++++------------
 home/hyprland/waybar/default.nix |  2 +-
 system/desktop.nix               |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index 5fe973b1..cc58cef8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,11 +25,11 @@
         homeModules = [
           ./home/accounts/default.nix
           ./home/hyprland/default.nix
+          ./home/nyxt/default.nix
           ./home/alacritty.nix
           ./home/btop.nix
           ./home/default.nix
           ./home/emacs.nix
-          ./home/firefox.nix
           ./home/media.nix
           ./home/pass.nix
         ];
diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 51bf49f8..f7db6dc2 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -190,6 +190,7 @@ in ''
   bind = SUPER, W, moveworkspacetomonitor, name:web current
   bind = SUPER, W, workspace, name:web
   bind = SUPER SHIFT, W, movetoworkspace, name:web
+  bind = SUPER ALT, W, exec, [workspace name:nyxt] nyxt
   windowrule = workspace name:web, (firefox|chromium-browser)
 
   bind = SUPER, T, moveworkspacetomonitor, name:top current
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 70f14b32..484be07f 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -32,18 +32,17 @@
         "image/png" = [ "swayimg.desktop" ];
         "video/mp4" = [ "mpv.desktop" ];
         "text/csv" = [ "calc.desktop" ];
-        "text/html" = [ "firefox.desktop" ];
-        "x-scheme-handler/http" = [ "firefox.desktop" ];
-        "x-scheme-handler/https" = [ "firefox.desktop" ];
-        "x-scheme-handler/about" = [ "firefox.desktop" ];
-        "x-scheme-handler/chrome" = [ "firefox.desktop" ];
-        "x-scheme-handler/msteams" = [ "teams-for-linux.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" = [ "nyxt.desktop" ];
+        "x-scheme-handler/http" = [ "nyxt.desktop" ];
+        "x-scheme-handler/https" = [ "nyxt.desktop" ];
+        "x-scheme-handler/about" = [ "nyxt.desktop" ];
+        "x-scheme-handler/chrome" = [ "nyxt.desktop" ];
+        "application/x-extension-htm" = [ "nyxt.desktop" ];
+        "application/x-extension-html" = [ "nyxt.desktop" ];
+        "application/x-extension-shtml" = [ "nyxt.desktop" ];
+        "application/xhtml+xml" = [ "nyxt.desktop" ];
+        "application/x-extension-xhtml" = [ "nyxt.desktop" ];
+        "application/x-extension-xht" = [ "nyxt.desktop" ];
       };
       associations.added = defaultApplications;
     };
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index 78da0ecd..ea668bb5 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -66,7 +66,7 @@
           "Microsoft 365 - (.*)" = "󰏆 $1";
           "WhatsApp Web" = "󰖣";
           "Signal" = "󰒢";
-          "(.*)WebCord - (.*)" = "$1󰙯 - $2";
+          "(.*)WebCord - (.*)" = "$1󰙯 $2";
           "NoMachine - (.*)" = "󰢹 $1";
         };
         separate-outputs = true;
diff --git a/system/desktop.nix b/system/desktop.nix
index d043d780..92f3fe1f 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