fix: hyprland monitors

This commit is contained in:
DACHXY 2025-04-12 14:08:03 +08:00
parent 94c073c28a
commit 21dd6582e8
3 changed files with 4 additions and 6 deletions

View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
startupScript = pkgs.pkgs.writeShellScriptBin "start" '' startupScript = pkgs.writeShellScriptBin "start" ''
# Fix nemo open in terminal # Fix nemo open in terminal
dconf write /org/cinnamon/desktop/applications/terminal/exec "''\'${terminal}''\'" & dconf write /org/cinnamon/desktop/applications/terminal/exec "''\'${terminal}''\'" &
dconf write /org/cinnamon/desktop/applications/terminal/exec-arg "''\'''\'" & dconf write /org/cinnamon/desktop/applications/terminal/exec-arg "''\'''\'" &

View file

@ -6,8 +6,9 @@ let
index: index:
let let
currentNum = index - (monitorNum * (index / monitorNum)); currentNum = index - (monitorNum * (index / monitorNum));
default = if index < monitorNum then "true" else "false";
in in
"${builtins.toString (index + 1)}, monitor:${builtins.elemAt monitors currentNum}" "${builtins.toString (index + 1)}, monitor:${builtins.elemAt monitors currentNum}, default:${default}"
) workspaceNum; ) workspaceNum;
in in
if (monitorNum > 0) then workspaceList else [ ] if (monitorNum > 0) then workspaceList else [ ]

View file

@ -12,9 +12,6 @@ let
startScript = import ./hypr/exec.nix { startScript = import ./hypr/exec.nix {
inherit inherit
pkgs pkgs
lib
inputs
system
terminal terminal
; ;
xcursor-size = settings.hyprland.xcursor-size; xcursor-size = settings.hyprland.xcursor-size;
@ -72,7 +69,7 @@ in
binde = import ./hypr/binde.nix { inherit mainMod; }; binde = import ./hypr/binde.nix { inherit mainMod; };
monitor = import ./hypr/monitor.nix; monitor = import ./hypr/monitor.nix;
plugin = plugins; plugin = plugins;
exec-once = ''${startScript}''; exec-once = [ ''${startScript}'' ];
env = [ env = [
''HYPRCURSOR_THEME, ${cursorName}'' ''HYPRCURSOR_THEME, ${cursorName}''
''HYPRCURSOR_SIZE, ${builtins.toString settings.hyprland.cursor-size}'' ''HYPRCURSOR_SIZE, ${builtins.toString settings.hyprland.cursor-size}''