diff --git a/modules/home/dev/helix.hjem.nix b/modules/home/dev/helix.hjem.nix index 0cfd8b9..65e144b 100644 --- a/modules/home/dev/helix.hjem.nix +++ b/modules/home/dev/helix.hjem.nix @@ -364,6 +364,11 @@ let completion-timeout = 5; clipboard-provider = "wayland"; + # Shell to use when running external commands. + shell = [ + (getExe pkgs.nushell) + "-c" + ]; completion-trigger-len = 1; completion-replace = true; mouse = true; diff --git a/modules/wms/niri/config.nix b/modules/wms/niri/config.nix index 04a3183..d799b74 100644 --- a/modules/wms/niri/config.nix +++ b/modules/wms/niri/config.nix @@ -7,7 +7,7 @@ flag, }: let - inherit (lib.meta) getExe getExe'; + inherit (lib.meta) getExe; inherit (builtins) readFile; in [ @@ -127,22 +127,11 @@ in ]) (plain "animations" [ - (flag "off") (plain "window-close" [ (leaf "duration-ms" 250) (leaf "curve" "linear") (leaf "custom-shader" <| readFile ./window-close.glsl) ]) - (plain "window-open" [ - (leaf "duration-ms" 350) - (leaf "curve" "ease-out-quad") - (leaf "custom-shader" <| readFile ./window-open.glsl) - ]) - # (plain "window-resize" [ - # (leaf "duration-ms" 200) - # (leaf "curve" "ease-out-quad") - # (leaf "custom-shader" <| readFile ./window-resize.glsl) - # ]) ]) (plain "window-rule" [ @@ -163,58 +152,58 @@ in (plain "binds" [ (plain "XF86AudioRaiseVolume" [ (leaf "spawn" [ - (getExe' pkgs.avizo "volumectl") + "volumectl" "-u" "up" ]) ]) (plain "XF86AudioLowerVolume" [ (leaf "spawn" [ - (getExe' pkgs.avizo "volumectl") + "volumectl" "-u" "down" ]) ]) (plain "XF86AudioMute" [ (leaf "spawn" [ - (getExe' pkgs.avizo "volumectl") + "volumectl" "toggle-mute" ]) ]) (plain "XF86AudioMicMute" [ (leaf "spawn" [ - (getExe' pkgs.avizo "volumectl") + "volumectl" "-m" "toggle-mute" ]) ]) (plain "XF86AudioPlay" [ (leaf "spawn" [ - (getExe' pkgs.avizo "playerctl") + "playerctl" "play-pause" ]) ]) (plain "XF86AudioNext" [ (leaf "spawn" [ - (getExe' pkgs.avizo "playerctl") + "playerctl" "next" ]) ]) (plain "XF86AudioPrev" [ (leaf "spawn" [ - (getExe' pkgs.avizo "playerctl") + "playerctl" "previous" ]) ]) (plain "XF86MonBrightnessUp" [ (leaf "spawn" [ - (getExe' pkgs.avizo "lightctl") + "lightctl" "up" ]) ]) (plain "XF86MonBrightnessDown" [ (leaf "spawn" [ - (getExe' pkgs.avizo "lightctl") + "lightctl" "down" ]) ]) diff --git a/modules/wms/niri/window-close.glsl b/modules/wms/niri/window-close.glsl deleted file mode 100644 index e74e02f..0000000 --- a/modules/wms/niri/window-close.glsl +++ /dev/null @@ -1,24 +0,0 @@ -vec4 fall_and_rotate(vec3 coords_geo, vec3 size_geo) { - float progress = niri_clamped_progress * niri_clamped_progress; - vec2 coords = (coords_geo.xy - vec2(0.5, 1.0)) * size_geo.xy; - - coords.y -= progress * 1440.0; - float random = (niri_random_seed - 0.5) / 2.0; - random = sign(random) - random; - - float max_angle = 0.5 * random; - float angle = progress * max_angle; - mat2 rotate = mat2(cos(angle), -sin(angle), sin(angle), cos(angle)); - - coords = rotate * coords; - coords_geo = vec3(coords / size_geo.xy + vec2(0.5, 1.0), 1.0); - - vec3 coords_tex = niri_geo_to_tex * coords_geo; - vec4 color = texture2D(niri_tex, coords_tex.st); - - return color; -} - -vec4 close_color(vec3 coords_geo, vec3 size_geo) { - return fall_and_rotate(coords_geo, size_geo); -} diff --git a/modules/wms/niri/window-open.glsl b/modules/wms/niri/window-open.glsl deleted file mode 100644 index f5b3818..0000000 --- a/modules/wms/niri/window-open.glsl +++ /dev/null @@ -1,25 +0,0 @@ -vec4 expanding_circle(vec3 coords_geo, vec3 size_geo) { - vec3 coords_tex = niri_geo_to_tex * coords_geo; - vec4 color = texture2D(niri_tex, coords_tex.st); - vec2 coords = (coords_geo.xy - vec2(0.5, 0.5)) * size_geo.xy * 2.0; - coords = coords / length(size_geo.xy); - float p = niri_clamped_progress; - if (p * p <= dot(coords, coords)) - color = vec4(0.0); - - return color; -} - -vec4 slider(vec3 coords_geo, vec3 size_geo) { - vec3 coords_tex = niri_geo_to_tex * coords_geo; - vec4 color = texture2D(niri_tex, coords_tex.st); - - if(coords_geo.x >= niri_clamped_progress) { - color = vec4(0.0); - } - return color; -} - -vec4 open_color(vec3 coords_geo, vec3 size_geo) { - return slider(coords_geo, size_geo); -} diff --git a/modules/wms/niri/window-resize.glsl b/modules/wms/niri/window-resize.glsl deleted file mode 100644 index 433ab9f..0000000 --- a/modules/wms/niri/window-resize.glsl +++ /dev/null @@ -1,5 +0,0 @@ -vec4 resize_color(vec3 coords_curr_geo, vec3 size_curr_geo) { - vec3 coords_tex_next = niri_geo_to_tex_next * coords_curr_geo; - vec4 color = texture2D(niri_tex_next, coords_tex_next.st); - return color; -}