Reinstate kanshi with some fixes and work with laptop lid switch

This commit is contained in:
Evie Litherland-Smith 2023-07-20 11:59:08 +01:00
parent 39b38c8d8e
commit c9661d158d
4 changed files with 42 additions and 6 deletions

View file

@ -20,6 +20,7 @@ update:
hyprland: hyprland:
-hyprctl reload -hyprctl reload
-pkill -1 kanshi
waybar: waybar:
-pkill -9 waybar -pkill -9 waybar

View file

@ -75,6 +75,7 @@ XWayland {
# See https://wiki.hyprland.org/Configuring/Keywords/ for more # See https://wiki.hyprland.org/Configuring/Keywords/ for more
bind = SUPER, Return, exec, wezterm bind = SUPER, Return, exec, wezterm
bind = SUPER, W, exec, pgrep firefox > /dev/null || firefox bind = SUPER, W, exec, pgrep firefox > /dev/null || firefox
bind = SUPER, Z, exec, pgrep thunderbird > /dev/null || thunderbird
bind = SUPER, R, exec, pgrep nxplayer > /dev/null || nxplayer bind = SUPER, R, exec, pgrep nxplayer > /dev/null || nxplayer
bind = SUPER, F1, exec, swaylock bind = SUPER, F1, exec, swaylock
@ -138,7 +139,7 @@ bind = SUPER SHIFT, C, movetoworkspace, 5
windowrule = workspace 5,(Signal) windowrule = workspace 5,(Signal)
windowrule = workspace 5,(fractal) windowrule = workspace 5,(fractal)
windowrule = workspace 5,(discord) windowrule = workspace 5,(discord)
windowrule = workspace 5,(teams-for-linux) windowrule = workspace 5,^(Microsoft Teams).*
windowrulev2 = workspace 5,title:^(Zoom|zoom).* windowrulev2 = workspace 5,title:^(Zoom|zoom).*
windowrulev2 = float,title:^(Zoom|zoom).* windowrulev2 = float,title:^(Zoom|zoom).*

View file

@ -5,6 +5,11 @@
}: let }: let
username = "elitherl"; username = "elitherl";
homeDirectory = "/home/${username}"; homeDirectory = "/home/${username}";
monitors = {
eDP-1 = "preferred,auto,1.5";
Iiyama = "preferred,0x185,1";
Dell = "preferred,1920x0,1,transform,1";
};
in { in {
imports = [ imports = [
shellConfig shellConfig
@ -22,7 +27,7 @@ in {
thunderbird thunderbird
openfortivpn openfortivpn
nomachine-client nomachine-client
teams-for-linux teams
zoom-us zoom-us
]; ];
}; };
@ -30,9 +35,39 @@ in {
home-manager.enable = true; home-manager.enable = true;
neovim.package = pkgs.neovim-nightly; neovim.package = pkgs.neovim-nightly;
}; };
services.kanshi = {
enable = true;
systemdTarget = "hyprland-session.target";
profiles = {
undocked.outputs = [
{
criteria = "eDP-1";
status = "enable";
}
];
docked.outputs = [
{
criteria = "eDP-1";
status = "disable";
}
{
criteria = "Iiyama North America PLB2403WS 0574281251316";
status = "enable";
}
{
criteria = "Dell Inc. DELL U2417H 5K9YD872FY1L";
status = "enable";
}
];
};
};
xdg.configFile."hypr/display.conf".text = '' xdg.configFile."hypr/display.conf".text = ''
monitor=eDP-1,preferred,auto,1.5 monitor=eDP-1,${monitors.eDP-1}
monitor=desc:Iiyama North America PLB2403WS 0574281251316,preferred,0x185,1 monitor=desc:Iiyama North America PLB2403WS 0574281251316,${monitors.Iiyama}
monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,preferred,1920x0,1,transform,1 monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,${monitors.Dell}
bindl=,switch:Lid Switch,exec,rfkill unblock wlan
bindl=,switch:Lid Switch,exec,hyprctl reload
bindl=,switch:Lid Switch,exec,pkill -9 kanshi
''; '';
} }

View file

@ -25,7 +25,6 @@ in {
localBinInPath = true; localBinInPath = true;
shellAliases = { shellAliases = {
ll = "ls -laF"; ll = "ls -laF";
gg = "${pkgs.gitui}/bin/gitui";
nosu = "sudo nixos-rebuild switch --flake \"${flakeURL}\""; nosu = "sudo nixos-rebuild switch --flake \"${flakeURL}\"";
hms = "${pkgs.home-manager}/bin/home-manager switch --flake \"${flakeURL}\""; hms = "${pkgs.home-manager}/bin/home-manager switch --flake \"${flakeURL}\"";
}; };