diff --git a/modules/nixos/apps/discord/default.nix b/modules/nixos/apps/discord/default.nix index 0142949..b85bcdc 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; [ - vesktop + discord ]; }; } diff --git a/modules/nixos/desktop/addons/hypridle/default.nix b/modules/nixos/desktop/addons/hypridle/default.nix index d0b4285..73028fb 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 = "hyprlock-blur"; + lock_cmd = "${pkgs.hyprlock-blur}/bin/hyprlock-blur"; }; listener = [ diff --git a/modules/nixos/desktop/addons/hyprlock/default.nix b/modules/nixos/desktop/addons/hyprlock/default.nix index f896207..deafa68 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" + "$mod CTRL, l, exec, ${hyprlock-blur}/bin/hyprlock-blur" ]; }; diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix index 92010ac..b792963 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] vesktop" + "[workspace 8 silent] discord --disable-gpu-compositing" "[workspace 9 silent] 1password" "[workspace 1 silent] zen" ]; diff --git a/overlays/discord/default.nix b/overlays/discord/default.nix new file mode 100644 index 0000000..970b716 --- /dev/null +++ b/overlays/discord/default.nix @@ -0,0 +1,9 @@ +{ ... }: + +final: prev: { + discord = prev.discord.overrideAttrs (oldAttrs: { + commandLineArgs = '' + --disable-gpu-compositing + ''; + }); +} diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix index f68492d..776dae4 100644 --- a/systems/x86_64-linux/yggdrasil/default.nix +++ b/systems/x86_64-linux/yggdrasil/default.nix @@ -63,9 +63,6 @@ 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" ]; @@ -73,7 +70,6 @@ in windowrulev2 = [ "workspace 8 silent, class:^(steam)$, title:^(Friends List)" "workspace 8 silent, class:^(discord)$, title:^(Discord)" - "workspace 7 silent, class:^(com.obsproject.Studio)$" ]; }; };