From 50fa154a90deaafcc0cf80972ce9ace3772dbe36 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 23 Nov 2023 11:50:41 +0000
Subject: [PATCH] Remove nyxt, set chromium to be default browser

Split chromium workspace into web (for main browser) and apps (for
PWAs)

Update waybar workspace icons, remove "urgent" icon since I've got an
updating theme anyway
---
 flake.nix                        |  1 -
 home/hyprland/config.nix         | 16 +++++-----------
 home/hyprland/waybar/default.nix |  8 +++-----
 system/chromium.nix              |  4 ++--
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index 63b2825a..4c00c896 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,7 +26,6 @@
           ./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
diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 20b0b8e4..2239d0d5 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -179,23 +179,17 @@ 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:web] nyxt
-
-  bind = SUPER, A, moveworkspacetomonitor, name:spotify current
-  bind = SUPER, A, workspace, name:spotify
-  bind = SUPER SHIFT, A, movetoworkspace, name:spotify
-  bind = SUPER ALT, A, exec, [workspace name:spotify] alacritty -e ncspot
+  windowrule = workspace name:web, (chromium-browser)
 
   bind = SUPER, T, moveworkspacetomonitor, name:top current
   bind = SUPER, T, workspace, name:top
   bind = SUPER SHIFT, T, movetoworkspace, name:top
   bind = SUPER ALT, T, exec, [workspace name:top] alacritty -e btop
 
-  bind = SUPER, C, moveworkspacetomonitor, name:chromium current
-  bind = SUPER, C, workspace, name:chromium
-  bind = SUPER SHIFT, C, movetoworkspace, name:chromium
-  windowrule = workspace name:chromium, (chromium-browser)
-  windowrule = workspace name:chromium, chrome-(.*)-Default
+  bind = SUPER, A, moveworkspacetomonitor, name:apps current
+  bind = SUPER, A, workspace, name:apps
+  bind = SUPER SHIFT, A, movetoworkspace, name:apps
+  windowrule = workspace name:apps, chrome-(.*)-Default
 
   bind = SUPER, D, moveworkspacetomonitor, name:discord current
   bind = SUPER, D, workspace, name:discord
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index bb39dd6f..491bfa64 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -37,16 +37,14 @@
           "5" = "󰫇";
           "6" = "󰫈";
           "emacs" = "";
-          "web" = "󰀹";
-          "spotify" = "󰓇";
+          "web" = "";
           "discord" = "󰙯";
           "steam" = "󰓓";
-          "chromium" = "󰊯";
+          "apps" = "󰜫";
           "top" = "󰒋";
           "remote" = "󰢹";
           default = "󰋙";
-          special = "󱗿";
-          urgent = "󰁡";
+          special = "󰁡";
         };
         show-special = true;
         sort-by = "id";
diff --git a/system/chromium.nix b/system/chromium.nix
index 2f66291c..81dff3cd 100644
--- a/system/chromium.nix
+++ b/system/chromium.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [ chromium ];
@@ -12,7 +12,7 @@
     ];
     extraOpts = {
       "BrowserSignin" = 0;
-      "DefaultBrowserSettingEnabled" = false;
+      "DefaultBrowserSettingEnabled" = true;
       "DeviceAutoUpdateDisabled" = true;
       "SyncDisabled" = true;
       "PasswordManagerEnabled" = false;