From 1d9c73515ec2af43b381dc2960d058ca1f18e1d3 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Fri, 15 Dec 2023 12:53:17 +0000 Subject: [PATCH 1/4] Remove whatsapp-for-linux and teams-for-linux Add workspace rule and waybar rewrite for WebCord --- home/hyprland/config.nix | 1 + home/hyprland/default.nix | 9 +-------- home/hyprland/waybar/default.nix | 1 + 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix index 9742fc15..51bf49f8 100644 --- a/home/hyprland/config.nix +++ b/home/hyprland/config.nix @@ -201,6 +201,7 @@ in '' bind = SUPER, A, workspace, name:apps bind = SUPER SHIFT, A, movetoworkspace, name:apps windowrule = workspace name:apps, (Signal) + windowrule = workspace name:apps, (WebCord) windowrule = workspace name:apps, chrome-(.*)-Default bind = SUPER, F, moveworkspacetomonitor, name:files current diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index e189cd13..70f14b32 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -1,12 +1,5 @@ { config, lib, pkgs, ... }: { - home.packages = with pkgs; [ - grim - slurp - signal-desktop - webcord - whatsapp-for-linux - teams-for-linux - ]; + home.packages = with pkgs; [ grim slurp signal-desktop webcord ]; imports = [ ./waybar/default.nix ./rofi/default.nix ./gtk.nix ./mako.nix ]; services = { avizo.enable = true; diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix index a17f05bb..78da0ecd 100644 --- a/home/hyprland/waybar/default.nix +++ b/home/hyprland/waybar/default.nix @@ -66,6 +66,7 @@ "Microsoft 365 - (.*)" = "󰏆 $1"; "WhatsApp Web" = "󰖣"; "Signal" = "󰒢"; + "(.*)WebCord - (.*)" = "$1󰙯 - $2"; "NoMachine - (.*)" = "󰢹 $1"; }; separate-outputs = true; From 06148eb1a671135879d4440485b718a1fdab1581 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Fri, 15 Dec 2023 13:13:01 +0000 Subject: [PATCH 2/4] 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 From 74ba6959ea3fa81ce660c964b70b235f7dfd6534 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sat, 16 Dec 2023 08:46:42 +0000 Subject: [PATCH 3/4] Fix workspace setting for nyxt keybind --- home/hyprland/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix index f7db6dc2..a6e4ae55 100644 --- a/home/hyprland/config.nix +++ b/home/hyprland/config.nix @@ -190,7 +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 + bind = SUPER ALT, W, exec, [workspace name:web] nyxt windowrule = workspace name:web, (firefox|chromium-browser) bind = SUPER, T, moveworkspacetomonitor, name:top current From e0ef310d964ad759fd4d6f988f64ff8cd78d1cd2 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sat, 16 Dec 2023 09:12:34 +0000 Subject: [PATCH 4/4] Remove ncspot --- home/hyprland/waybar/default.nix | 1 - home/media.nix | 29 ++++++++++++----------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix index ea668bb5..307fdd47 100644 --- a/home/hyprland/waybar/default.nix +++ b/home/hyprland/waybar/default.nix @@ -77,7 +77,6 @@ "interval" = 1; "player-icons" = { "default" = "󰲸"; - "ncspot" = "󰓇"; "emms" = ""; }; "status-icons" = { diff --git a/home/media.nix b/home/media.nix index 13321a4d..bd3884fb 100644 --- a/home/media.nix +++ b/home/media.nix @@ -1,19 +1,14 @@ -{ config, lib, pkgs, ... }: - -{ - programs = { - mpv = { - enable = true; - scripts = with pkgs.mpvScripts; [ - mpris - autoload - thumbfast - thumbnail - sponsorblock - quality-menu - webtorrent-mpv-hook - ]; - }; - ncspot.enable = true; +{ pkgs, ... }: { + programs.mpv = { + enable = true; + scripts = with pkgs.mpvScripts; [ + mpris + autoload + thumbfast + thumbnail + sponsorblock + quality-menu + webtorrent-mpv-hook + ]; }; }