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
This commit is contained in:
Evie Litherland-Smith 2023-11-21 17:19:45 +00:00
parent 9c535a4a7e
commit b80ec99cd2
5 changed files with 14 additions and 13 deletions

View file

@ -178,7 +178,6 @@ in ''
bind = SUPER, W, workspace, name:web bind = SUPER, W, workspace, name:web
bind = SUPER SHIFT, W, movetoworkspace, name:web bind = SUPER SHIFT, W, movetoworkspace, name:web
bind = SUPER ALT, W, exec, [workspace name:web] nyxt 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, moveworkspacetomonitor, name:spotify current
bind = SUPER, A, workspace, name:spotify bind = SUPER, A, workspace, name:spotify
@ -190,6 +189,12 @@ in ''
bind = SUPER SHIFT, T, movetoworkspace, name:top bind = SUPER SHIFT, T, movetoworkspace, name:top
bind = SUPER ALT, T, exec, [workspace name:top] alacritty -e btop 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, moveworkspacetomonitor, name:discord current
bind = SUPER, D, workspace, name:discord bind = SUPER, D, workspace, name:discord
bind = SUPER SHIFT, D, movetoworkspace, name:discord bind = SUPER SHIFT, D, movetoworkspace, name:discord
@ -205,11 +210,6 @@ in ''
bind = SUPER SHIFT, R, movetoworkspace, name:remote bind = SUPER SHIFT, R, movetoworkspace, name:remote
windowrule = workspace name:remote, (Nxplayer.bin) 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 # Special workspaces
bind = SUPER, comma, workspace, m-1 bind = SUPER, comma, workspace, m-1
bind = SUPER SHIFT, comma, movetoworkspace, r-1 bind = SUPER SHIFT, comma, movetoworkspace, r-1

View file

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }: { 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 ]; imports = [ ./waybar/default.nix ./rofi/default.nix ./gtk.nix ./mako.nix ];
services = { services = {
avizo.enable = true; avizo.enable = true;
@ -38,7 +38,6 @@
"image/png" = [ "swayimg.desktop" ]; "image/png" = [ "swayimg.desktop" ];
"video/mp4" = [ "mpv.desktop" ]; "video/mp4" = [ "mpv.desktop" ];
"text/csv" = [ "calc.desktop" ]; "text/csv" = [ "calc.desktop" ];
"x-scheme-handler/msteams" = [ "teams-for-linux.desktop" ];
}; };
associations.added = defaultApplications; associations.added = defaultApplications;
}; };

View file

@ -41,7 +41,7 @@
"spotify" = "󰓇"; "spotify" = "󰓇";
"discord" = "󰙯"; "discord" = "󰙯";
"steam" = "󰓓"; "steam" = "󰓓";
"teams" = "󰊻"; "chromium" = "󰊯";
"top" = "󰒋"; "top" = "󰒋";
"remote" = "󰢹"; "remote" = "󰢹";
default = "󰋙"; default = "󰋙";
@ -56,9 +56,11 @@
"(.*) - GNU Emacs(.*)" = " $1"; "(.*) - GNU Emacs(.*)" = " $1";
"btop" = " System Status"; "btop" = " System Status";
"ncspot" = "󰓇 Spotify TUI"; "ncspot" = "󰓇 Spotify TUI";
"(.*) - Chromium" = " $1";
"Nyxt - (.*)" = "󰀹 $1"; "Nyxt - (.*)" = "󰀹 $1";
"(.*) - Discord" = "󰙯 $1"; "(.*) - Discord" = "󰙯 $1";
"(.*) - Chromium" = " $1";
"Microsoft Teams - (.*)" = "󰊻 $1";
"Microsoft Teams classic" = "󰊻";
"NoMachine - (.*)" = "󰢹 $1"; "NoMachine - (.*)" = "󰢹 $1";
}; };
separate-outputs = true; separate-outputs = true;

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ chromium ]; environment.systemPackages = with pkgs; [ chromium ];
@ -11,10 +11,10 @@
extensions = [ extensions = [
"cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
"gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere
"fnaicdffflnofjppbagibeoednhnbjhg" # floccus bookmark sync
]; ];
extraOpts = { extraOpts = {
"BrowserSignin" = 0; "BrowserSignin" = 0;
"DefaultBrowserSettingEnabled" = false;
"DeviceAutoUpdateDisabled" = true; "DeviceAutoUpdateDisabled" = true;
"SyncDisabled" = true; "SyncDisabled" = true;
"PasswordManagerEnabled" = false; "PasswordManagerEnabled" = false;

View file

@ -1,7 +1,7 @@
{ config, pkgs, user, ... }: { config, pkgs, user, ... }:
{ {
imports = [ ./default.nix ]; imports = [ ./default.nix ./chromium.nix ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
dex dex
mesa mesa