Add firefox back as default browser

Add firefox and chromium to web workspace, keep nyxt installed as
quick popup browser to use elsewhere

Remove discord workspace, move to apps workspace

Add files workspace for thunar and libreoffice

Add more waybar rewrites - libreoffice programs, thunar, PWAs like
whatsapp web, etc...
This commit is contained in:
Evie Litherland-Smith 2023-12-05 12:47:30 +00:00
parent 3be5139c66
commit 740325f707
5 changed files with 38 additions and 24 deletions

View file

@ -30,6 +30,7 @@
./home/alacritty.nix ./home/alacritty.nix
./home/btop.nix ./home/btop.nix
./home/default.nix ./home/default.nix
./home/firefox.nix
./home/media.nix ./home/media.nix
./home/pass.nix ./home/pass.nix
]; ];

View file

@ -134,17 +134,17 @@ in ''
windowrule = pin,(org.kde.polkit-kde-authentication-agent-1|Pinentry) windowrule = pin,(org.kde.polkit-kde-authentication-agent-1|Pinentry)
windowrule = dimaround,(org.kde.polkit-kde-authentication-agent-1|Pinentry) windowrule = dimaround,(org.kde.polkit-kde-authentication-agent-1|Pinentry)
windowrule = stayfocused,(org.kde.polkit-kde-authentication-agent-1|Pinentry) windowrule = stayfocused,(org.kde.polkit-kde-authentication-agent-1|Pinentry)
windowrule = float,(pavucontrol|.blueman-manager-wrapped|nm-connection-editor) windowrule = float,(pavucontrol|.blueman-manager-wrapped|nm-connection-editor|thunar)
windowrule = size 800 600,(pavucontrol|.blueman-manager-wrapped|nm-connection-editor) windowrule = size 800 600,(pavucontrol|.blueman-manager-wrapped|nm-connection-editor|thunar)
windowrule = move onscreen 100%-820 60,(pavucontrol|.blueman-manager-wrapped|nm-connection-editor) windowrule = move onscreen 100%-820 60,(pavucontrol|.blueman-manager-wrapped|nm-connection-editor)
windowrule = nomaximizerequest, ^(libreoffice).* windowrule = nomaximizerequest,(libreoffice|soffice)(.*)
windowrule = nofullscreenrequest, ^(libreoffice).* windowrule = nofullscreenrequest, (libreoffice|soffice)(.*)
windowrule = nofullscreenrequest,(org.remmina.Remmina|Nxplayer.bin) windowrule = nofullscreenrequest,(org.remmina.Remmina|Nxplayer.bin)
windowrule = nomaximizerequest,(org.remmina.Remmina|Nxplayer.bin) windowrule = nomaximizerequest,(org.remmina.Remmina|Nxplayer.bin)
windowrule = float,(org.remmina.Remmina|Nxplayer.bin) windowrule = float,(org.remmina.Remmina|Nxplayer.bin)
windowrule = minsize 1280 720,(org.remmina.Remmina|Nxplayer.bin) windowrule = minsize 1280 720,(org.remmina.Remmina|Nxplayer.bin)
windowrule = maxsize 1920 1080,(org.remmina.Remmina|Nxplayer.bin) windowrule = maxsize 1920 1080,(org.remmina.Remmina|Nxplayer.bin)
windowrulev2 = float,title:(Open),class:(soffice) windowrulev2 = float,title:(Open),class:(libreoffice|soffice)(.*))
windowrulev2 = float,title:(Friends List),class:(steam) windowrulev2 = float,title:(Friends List),class:(steam)
windowrulev2 = float,title:(Steam Settings),class:(steam) windowrulev2 = float,title:(Steam Settings),class:(steam)
@ -183,6 +183,7 @@ 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, (firefox|chromium-browser)
bind = SUPER, T, moveworkspacetomonitor, name:top current bind = SUPER, T, moveworkspacetomonitor, name:top current
bind = SUPER, T, workspace, name:top bind = SUPER, T, workspace, name:top
@ -192,12 +193,15 @@ in ''
bind = SUPER, A, moveworkspacetomonitor, name:apps current bind = SUPER, A, moveworkspacetomonitor, name:apps current
bind = SUPER, A, workspace, name:apps bind = SUPER, A, workspace, name:apps
bind = SUPER SHIFT, A, movetoworkspace, name:apps bind = SUPER SHIFT, A, movetoworkspace, name:apps
windowrule = workspace name:apps, (discord)
windowrule = workspace name:apps, (Signal)
windowrule = workspace name:apps, chrome-(.*)-Default windowrule = workspace name:apps, chrome-(.*)-Default
bind = SUPER, D, moveworkspacetomonitor, name:discord current bind = SUPER, F, moveworkspacetomonitor, name:files current
bind = SUPER, D, workspace, name:discord bind = SUPER, F, workspace, name:files
bind = SUPER SHIFT, D, movetoworkspace, name:discord bind = SUPER SHIFT, F, movetoworkspace, name:files
windowrule = workspace name:discord, (discord) windowrule = workspace name:files, (thunar)
windowrule = workspace name:files, (libreoffice|soffice)(.*)
bind = SUPER, S, moveworkspacetomonitor, name:steam current bind = SUPER, S, moveworkspacetomonitor, name:steam current
bind = SUPER, S, workspace, name:steam bind = SUPER, S, workspace, name:steam

View file

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
home.packages = with pkgs; [ grim slurp discord ]; home.packages = with pkgs; [ grim slurp discord signal-desktop ];
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;
@ -36,17 +36,17 @@
"image/png" = [ "swayimg.desktop" ]; "image/png" = [ "swayimg.desktop" ];
"video/mp4" = [ "mpv.desktop" ]; "video/mp4" = [ "mpv.desktop" ];
"text/csv" = [ "calc.desktop" ]; "text/csv" = [ "calc.desktop" ];
# "text/html" = [ "chromium-browser.desktop" ]; "text/html" = [ "firefox.desktop" ];
# "x-scheme-handler/http" = [ "chromium-browser.desktop" ]; "x-scheme-handler/http" = [ "firefox.desktop" ];
# "x-scheme-handler/https" = [ "chromium-browser.desktop" ]; "x-scheme-handler/https" = [ "firefox.desktop" ];
# "x-scheme-handler/about" = [ "chromium-browser.desktop" ]; "x-scheme-handler/about" = [ "firefox.desktop" ];
# "x-scheme-handler/chrome" = [ "chromium-browser.desktop" ]; "x-scheme-handler/chrome" = [ "firefox.desktop" ];
# "application/x-extension-htm" = [ "firefox.desktop" ]; "application/x-extension-htm" = [ "firefox.desktop" ];
# "application/x-extension-html" = [ "firefox.desktop" ]; "application/x-extension-html" = [ "firefox.desktop" ];
# "application/x-extension-shtml" = [ "firefox.desktop" ]; "application/x-extension-shtml" = [ "firefox.desktop" ];
# "application/xhtml+xml" = [ "firefox.desktop" ]; "application/xhtml+xml" = [ "firefox.desktop" ];
# "application/x-extension-xhtml" = [ "firefox.desktop" ]; "application/x-extension-xhtml" = [ "firefox.desktop" ];
# "application/x-extension-xht" = [ "firefox.desktop" ]; "application/x-extension-xht" = [ "firefox.desktop" ];
}; };
associations.added = defaultApplications; associations.added = defaultApplications;
}; };

View file

@ -38,7 +38,7 @@
"6" = "󰫈"; "6" = "󰫈";
"emacs" = ""; "emacs" = "";
"web" = "󰀹"; "web" = "󰀹";
"discord" = "󰙯"; "files" = "󰝰";
"steam" = "󰓓"; "steam" = "󰓓";
"apps" = "󰜫"; "apps" = "󰜫";
"top" = ""; "top" = "";
@ -52,13 +52,22 @@
"hyprland/window" = { "hyprland/window" = {
rewrite = { rewrite = {
"(.*) - GNU Emacs(.*)" = " $1"; "(.*) - GNU Emacs(.*)" = " $1";
"(.*) - Discord" = "󰙯 $1";
"(.*) Mozilla Firefox" = "󰈹 $1"; "(.*) Mozilla Firefox" = "󰈹 $1";
"(.*) - Chromium" = " $1"; "(.*) - Chromium" = " $1";
"Nyxt - (.*)" = "󰀹 $1"; "Nyxt - (.*)" = "󰀹 $1";
"(.*) - Discord" = "󰙯 $1";
"(.*) - Thunar" = "󰝰 $1";
"(.*) - LibreOffice Writer" = "󰈙 $1";
"(.*) - LibreOffice Calc" = "󰡱 $1";
"(.*) - LibreOffice Impress" = "󰐨 $1";
"(.*) - LibreOffice Base" = "󰆼 $1";
"(.*) - LibreOffice Draw" = "󰽉 $1";
"(.*) - LibreOffice Math" = "󰪚 $1";
"Microsoft Teams - (.*)" = "󰊻 $1"; "Microsoft Teams - (.*)" = "󰊻 $1";
"Microsoft Teams classic" = "󰊻"; "Microsoft Teams classic" = "󰊻";
"Microsoft 365 - (.*)" = "󰏆 $1"; "Microsoft 365 - (.*)" = "󰏆 $1";
"WhatsApp Web" = "󰖣";
"Signal" = "󰒢";
"NoMachine - (.*)" = "󰢹 $1"; "NoMachine - (.*)" = "󰢹 $1";
}; };
separate-outputs = true; separate-outputs = true;

View file

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