From 7739403910fc4cf1cfbbc634c21861289953c5dc Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Sat, 16 Nov 2024 11:38:15 +0100 Subject: [PATCH 1/4] yggdrasil: update hyprland worspaces and automove twitchchat and obs --- systems/x86_64-linux/yggdrasil/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix index 776dae4..2a5522c 100644 --- a/systems/x86_64-linux/yggdrasil/default.nix +++ b/systems/x86_64-linux/yggdrasil/default.nix @@ -63,6 +63,9 @@ in "2, monitor:DP-2" "3, monitor:DP-2" "4, monitor:DP-2" + "5, monitor:DP-2" + "6, monitor:DP-2" + "7, monitor:HDMI-A-1" "8, monitor:HDMI-A-1" "9, monitor:HDMI-A-1" ]; @@ -70,6 +73,8 @@ in windowrulev2 = [ "workspace 8 silent, class:^(steam)$, title:^(Friends List)" "workspace 8 silent, class:^(discord)$, title:^(Discord)" + "workspace 7 silent, class:^(zen-alpha)$, title:^(da_holIi - Chat - Twitch)" + "workspace 7 silent, class:^(com.obsproject.Studio)$" ]; }; }; From 303f09a1136bea84f94c7e1593290545ea04bcef Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Sun, 17 Nov 2024 01:10:25 +0100 Subject: [PATCH 2/4] hyprlock: use custom script for both types of lock --- modules/nixos/desktop/addons/hypridle/default.nix | 2 +- modules/nixos/desktop/addons/hyprlock/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/desktop/addons/hypridle/default.nix b/modules/nixos/desktop/addons/hypridle/default.nix index 73028fb..d0b4285 100644 --- a/modules/nixos/desktop/addons/hypridle/default.nix +++ b/modules/nixos/desktop/addons/hypridle/default.nix @@ -25,7 +25,7 @@ in general = { after_sleep_cmd = "hyprctl dispatch dpms on"; ignore_dbus_inhibit = false; - lock_cmd = "${pkgs.hyprlock-blur}/bin/hyprlock-blur"; + lock_cmd = "hyprlock-blur"; }; listener = [ diff --git a/modules/nixos/desktop/addons/hyprlock/default.nix b/modules/nixos/desktop/addons/hyprlock/default.nix index deafa68..f896207 100644 --- a/modules/nixos/desktop/addons/hyprlock/default.nix +++ b/modules/nixos/desktop/addons/hyprlock/default.nix @@ -35,7 +35,7 @@ in ${namespace}.desktop.hyprland.settings = { bind = [ - "$mod CTRL, l, exec, ${hyprlock-blur}/bin/hyprlock-blur" + "$mod CTRL, l, exec, hyprlock-blur" ]; }; From e6f2b8143e04297fa4410e43c5ab6c54f7f1f5fc Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Sun, 17 Nov 2024 01:11:02 +0100 Subject: [PATCH 3/4] discord: switch to vesktop --- modules/nixos/apps/discord/default.nix | 2 +- modules/nixos/desktop/hyprland/default.nix | 2 +- overlays/discord/default.nix | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 overlays/discord/default.nix diff --git a/modules/nixos/apps/discord/default.nix b/modules/nixos/apps/discord/default.nix index b85bcdc..0142949 100644 --- a/modules/nixos/apps/discord/default.nix +++ b/modules/nixos/apps/discord/default.nix @@ -18,7 +18,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - discord + vesktop ]; }; } diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix index b792963..92010ac 100644 --- a/modules/nixos/desktop/hyprland/default.nix +++ b/modules/nixos/desktop/hyprland/default.nix @@ -125,7 +125,7 @@ in "systemctl --user start hyprpolkitagent" "[workspace 2 silent] steam --disable-gpu-compositing" # nvidia pls let me have nice things - "[workspace 8 silent] discord --disable-gpu-compositing" + "[workspace 8 silent] vesktop" "[workspace 9 silent] 1password" "[workspace 1 silent] zen" ]; diff --git a/overlays/discord/default.nix b/overlays/discord/default.nix deleted file mode 100644 index 970b716..0000000 --- a/overlays/discord/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -final: prev: { - discord = prev.discord.overrideAttrs (oldAttrs: { - commandLineArgs = '' - --disable-gpu-compositing - ''; - }); -} From 4bacba666f86f83d373555b9c7dbac65cd25b702 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Sun, 17 Nov 2024 01:12:53 +0100 Subject: [PATCH 4/4] hyprland: moving twitchchat popout does not work, might have to set a keybind or a sleep script --- systems/x86_64-linux/yggdrasil/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix index 2a5522c..f68492d 100644 --- a/systems/x86_64-linux/yggdrasil/default.nix +++ b/systems/x86_64-linux/yggdrasil/default.nix @@ -73,7 +73,6 @@ in windowrulev2 = [ "workspace 8 silent, class:^(steam)$, title:^(Friends List)" "workspace 8 silent, class:^(discord)$, title:^(Discord)" - "workspace 7 silent, class:^(zen-alpha)$, title:^(da_holIi - Chat - Twitch)" "workspace 7 silent, class:^(com.obsproject.Studio)$" ]; };