more and fixes

This commit is contained in:
soraefir
2026-06-17 19:18:50 +02:00
parent ab9fea20da
commit 9936f538e1
8 changed files with 242 additions and 29 deletions

View File

@@ -1,5 +1,13 @@
{ config, lib, pkgs, ... }:
let
{ config, lib, pkgs, ... }:
let
# Close the bar if it's already open (wrong screen), then open on the target screen.
moveOrOpenBar = screen: "${pkgs.writeShellScript "kanshi-eww-bar-${toString screen}" ''
if ${pkgs.eww}/bin/eww active-windows 2>/dev/null | grep -qx "bar"; then
${pkgs.eww}/bin/eww close bar
fi
${pkgs.eww}/bin/eww open bar --screen ${toString screen}
''}";
baseOutput = {
position = "0,0";
scale = 1.0;
@@ -7,6 +15,9 @@ let
status = "enable";
transform = "normal";
};
aocT = "AOC 24E1W1 GNSKCHA086899";
aocB = "AOC 24E1W1 GNSKBHA080346";
lgM = "LG Electronics LG ULTRAGEAR+ 511NTDVGC194";
in {
@@ -50,37 +61,38 @@ in {
name = "tower_00";
outputs = [
{
criteria = "AOC 24E1W1 GNSKCHA086899";
criteria = aocT;
position = "0,0";
}
{
criteria = "AOC 24E1W1 GNSKBHA080346";
criteria = aocB;
position = "0,1080";
}
{
criteria = "LG Electronics LG ULTRAGEAR+ 511NTDVGC194";
criteria = lgM;
position = "1920,720";
}
];
exec = [
"${pkgs.eww}/bin/eww open bar --screen 0"
exec = [
(moveOrOpenBar 0)
"${pkgs.writeShellScript "kanshi-hyprland-init" ''
#!/usr/bin/env bash
${pkgs.hyprland}/bin/hyprctl eval '
hl.workspace_rule({ workspace = "1", monitor = "DP-1", default = true })
hl.workspace_rule({ workspace = "2", monitor = "DP-2", default = true })
hl.workspace_rule({ workspace = "3", monitor = "DP-1", default = true })
hl.workspace_rule({ workspace = "4", monitor = "DP-1", default = true })
hl.workspace_rule({ workspace = "5", monitor = "DP-1", default = true })
hl.workspace_rule({ workspace = "6", monitor = "DP-1", default = true })
hl.workspace_rule({ workspace = "7", monitor = "DP-1", default = true })
hl.workspace_rule({ workspace = "8", monitor = "DP-2", default = true })
hl.workspace_rule({ workspace = "9", monitor = "DP-1", default = true })
hl.workspace_rule({ workspace = "name:X", monitor = "DP-3", default = true })
hl.workspace_rule({ workspace = "1", monitor = "desc:${aocB}", default = true })
hl.workspace_rule({ workspace = "2", monitor = "desc:${aocT}", default = true })
hl.workspace_rule({ workspace = "3", monitor = "desc:${aocB}", default = true })
hl.workspace_rule({ workspace = "4", monitor = "desc:${aocB}", default = true })
hl.workspace_rule({ workspace = "5", monitor = "desc:${aocB}", default = true })
hl.workspace_rule({ workspace = "6", monitor = "desc:${aocB}", default = true })
hl.workspace_rule({ workspace = "7", monitor = "desc:${aocB}", default = true })
hl.workspace_rule({ workspace = "8", monitor = "desc:${aocT}", default = true })
hl.workspace_rule({ workspace = "9", monitor = "desc:${aocB}", default = true })
hl.workspace_rule({ workspace = "name:X", monitor = "desc:${lgM}", default = true })
'
${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "DP-2" })); hl.dispatch(hl.dsp.focus({ workspace = "2" }));'
${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "DP-3" })); hl.dispatch(hl.dsp.focus({ workspace = "name:X" }));'
#${pkgs.hyprland}/bin/hyprctl eval 'hl.monitor({ output = "DP-3", cm = "hdr" });'
${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "desc:${aocT}" })); hl.dispatch(hl.dsp.focus({ workspace = "2" }));'
${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "desc:${lgM}" })); hl.dispatch(hl.dsp.focus({ workspace = "name:X" }));'
#${pkgs.hyprland}/bin/hyprctl eval 'hl.monitor({ output = "desc:${lgM}", cm = "hdr" });'
${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "desc:${aocB}" }));'
''}"
"${pkgs.awww}/bin/awww restore"
@@ -118,7 +130,7 @@ in {
''}"
"${pkgs.awww}/bin/awww restore"
"${pkgs.eww}/bin/eww open bar --screen 0"
(moveOrOpenBar 0)
];
};}
{profile = {