diff --git a/home/tiling/default.nix b/home/tiling/default.nix index 161fc43..91ec144 100644 --- a/home/tiling/default.nix +++ b/home/tiling/default.nix @@ -49,46 +49,46 @@ programs.swaylock = with config.scheme; { enable = true; - package = pkgs.swaylock; + package = pkgs.swaylock-effects; settings = { # this would sometimes load the previous day's wallpaper # when it is run before the bing retrieval script finishes - # image = "~/.local/share/wallpaper/daily-colored.jpg"; - # effect-blur = "7x5"; - color = "000000"; # black + image = "~/.local/share/wallpaper/daily-colored.jpg"; + effect-blur = "7x5"; + # color = "000000"; # black font-size = 24; indicator-idle-visible = true; indicator-radius = 100; show-failed-attempts = true; - bs-hl-color = base09; # peach - caps-lock-bs-hl-color = base09; # peach - caps-lock-key-hl-color = base0E; # mauve - inside-color = base00; # base - inside-clear-color = base00; # base - inside-caps-lock-color = base00; # base - inside-ver-color = base00; # base - inside-wrong-color = base00; # base - key-hl-color = base0D; # blue - layout-bg-color = base00; # base - layout-border-color = base00; # base - layout-text-color = base05; # text - line-color = base00; # base - line-clear-color = base00; # base - line-caps-lock-color = base00; # base - line-ver-color = base00; # base - line-wrong-color = base00; # base - ring-color = base00; # base - ring-clear-color = base09; # peach - ring-caps-lock-color = base00; # base - ring-ver-color = base0B; # green - ring-wrong-color = base00; # base + bs-hl-color = base09 + "E6"; # peach + caps-lock-bs-hl-color = base09 + "E6"; # peach + caps-lock-key-hl-color = base0E + "E6"; # mauve + inside-color = base00 + "E6"; # base + inside-clear-color = base00 + "E6"; # base + inside-caps-lock-color = base00 + "E6"; # base + inside-ver-color = base00 + "E6"; # base + inside-wrong-color = base00 + "E6"; # base + key-hl-color = base0D + "E6"; # blue + layout-bg-color = base00 + "E6"; # base + layout-border-color = base00 + "E6"; # base + layout-text-color = base05 + "E6"; # text + line-color = base00 + "E6"; # base + line-clear-color = base00 + "E6"; # base + line-caps-lock-color = base00 + "E6"; # base + line-ver-color = base00 + "E6"; # base + line-wrong-color = base00 + "E6"; # base + ring-color = base00 + "E6"; # base + ring-clear-color = base09 + "E6"; # peach + ring-caps-lock-color = base00 + "E6"; # base + ring-ver-color = base0B + "E6"; # green + ring-wrong-color = base00 + "E6"; # base separator-color = "00000000"; # transparent - text-color = base05; # text - text-clear-color = base09; # peach - text-caps-lock-color = base0E; # mauve - text-ver-color = base05; # text - text-wrong-color = base08; # red + text-color = base05 + "E6"; # text + text-clear-color = base09 + "E6"; # peach + text-caps-lock-color = base0E + "E6"; # mauve + text-ver-color = base05 + "E6"; # text + text-wrong-color = base08 + "E6"; # red }; }; @@ -101,7 +101,7 @@ }; Service = { - ExecStart = "${pkgs.swaylock}/bin/swaylock"; + ExecStart = "${config.programs.swaylock.package}/bin/swaylock"; Restart = "on-failure"; }; diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index d4e87e0..c3a898a 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -409,6 +409,7 @@ "XF86Sleep".action.power-off-monitors = { }; "XF86Search".action.spawn = [ "fuzzel" ]; + "Mod+Shift+L".action.spawn = [ "swaylock" ]; "XF86LaunchA" = { action.toggle-overview = { }; @@ -429,10 +430,6 @@ "Mod+Down".action.focus-window-down = { }; "Mod+Up".action.focus-window-up = { }; "Mod+Right".action.focus-column-right = { }; - "Mod+H".action.focus-column-left = { }; - "Mod+J".action.focus-window-down = { }; - "Mod+K".action.focus-window-up = { }; - "Mod+L".action.focus-column-right = { }; "Mod+Ctrl+Left".action.move-column-left = { }; "Mod+Ctrl+Down".action.move-window-down = { }; @@ -452,10 +449,6 @@ "Mod+Shift+Down".action.focus-monitor-down = { }; "Mod+Shift+Up".action.focus-monitor-up = { }; "Mod+Shift+Right".action.focus-monitor-right = { }; - "Mod+Shift+H".action.focus-monitor-left = { }; - "Mod+Shift+J".action.focus-monitor-down = { }; - "Mod+Shift+K".action.focus-monitor-up = { }; - "Mod+Shift+L".action.focus-monitor-right = { }; "Mod+Shift+Ctrl+Left".action.move-column-to-monitor-left = { }; "Mod+Shift+Ctrl+Down".action.move-column-to-monitor-down = { };