From b80ec99cd2d63a4be718c8469a71b5b17e6a166c Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 21 Nov 2023 17:19:45 +0000
Subject: [PATCH] Teams-For-Linux broken in current update, remove

Add Chromium back, force not to be default browser. Add rule to put
PWAs installed from chromium in same workspace
---
 home/hyprland/config.nix         | 12 ++++++------
 home/hyprland/default.nix        |  3 +--
 home/hyprland/waybar/default.nix |  6 ++++--
 system/chromium.nix              |  4 ++--
 system/desktop.nix               |  2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 497975ad..695bce27 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -178,7 +178,6 @@ in ''
   bind = SUPER, W, workspace, name:web
   bind = SUPER SHIFT, W, movetoworkspace, name:web
   bind = SUPER ALT, W, exec, [workspace name:web] nyxt
-  windowrule = workspace name:web, (chromium-browser)
 
   bind = SUPER, A, moveworkspacetomonitor, name:spotify current
   bind = SUPER, A, workspace, name:spotify
@@ -190,6 +189,12 @@ in ''
   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, D, moveworkspacetomonitor, name:discord current
   bind = SUPER, D, workspace, name:discord
   bind = SUPER SHIFT, D, movetoworkspace, name:discord
@@ -205,11 +210,6 @@ in ''
   bind = SUPER SHIFT, R, movetoworkspace, name:remote
   windowrule = workspace name:remote, (Nxplayer.bin)
 
-  bind = SUPER, O, moveworkspacetomonitor, name:teams current
-  bind = SUPER, O, workspace, name:teams
-  bind = SUPER SHIFT, O, movetoworkspace, name:teams
-  windowrule = workspace name:teams, (teams-for-linux)
-
   # Special workspaces
   bind = SUPER, comma, workspace, m-1
   bind = SUPER SHIFT, comma, movetoworkspace, r-1
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index e1688286..95ee95a8 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  home.packages = with pkgs; [ discord teams-for-linux ];
+  home.packages = with pkgs; [ discord ];
   imports = [ ./waybar/default.nix ./rofi/default.nix ./gtk.nix ./mako.nix ];
   services = {
     avizo.enable = true;
@@ -38,7 +38,6 @@
         "image/png" = [ "swayimg.desktop" ];
         "video/mp4" = [ "mpv.desktop" ];
         "text/csv" = [ "calc.desktop" ];
-        "x-scheme-handler/msteams" = [ "teams-for-linux.desktop" ];
       };
       associations.added = defaultApplications;
     };
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index acdbd927..69f5ca3c 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -41,7 +41,7 @@
           "spotify" = "󰓇";
           "discord" = "󰙯";
           "steam" = "󰓓";
-          "teams" = "󰊻";
+          "chromium" = "󰊯";
           "top" = "󰒋";
           "remote" = "󰢹";
           default = "󰋙";
@@ -56,9 +56,11 @@
           "(.*) - GNU Emacs(.*)" = " $1";
           "btop" = " System Status";
           "ncspot" = "󰓇 Spotify TUI";
-          "(.*) - Chromium" = " $1";
           "Nyxt - (.*)" = "󰀹 $1";
           "(.*) - Discord" = "󰙯 $1";
+          "(.*) - Chromium" = " $1";
+          "Microsoft Teams - (.*)" = "󰊻 $1";
+          "Microsoft Teams classic" = "󰊻";
           "NoMachine - (.*)" = "󰢹 $1";
         };
         separate-outputs = true;
diff --git a/system/chromium.nix b/system/chromium.nix
index 197dea01..cb77de83 100644
--- a/system/chromium.nix
+++ b/system/chromium.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [ chromium ];
@@ -11,10 +11,10 @@
     extensions = [
       "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
       "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere
-      "fnaicdffflnofjppbagibeoednhnbjhg" # floccus bookmark sync
     ];
     extraOpts = {
       "BrowserSignin" = 0;
+      "DefaultBrowserSettingEnabled" = false;
       "DeviceAutoUpdateDisabled" = true;
       "SyncDisabled" = true;
       "PasswordManagerEnabled" = false;
diff --git a/system/desktop.nix b/system/desktop.nix
index 98192c4a..425b2901 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -1,7 +1,7 @@
 { config, pkgs, user, ... }:
 
 {
-  imports = [ ./default.nix ];
+  imports = [ ./default.nix ./chromium.nix ];
   environment.systemPackages = with pkgs; [
     dex
     mesa