diff --git a/TODO.md b/TODO.md index 4bebd2a..7a0d244 100644 --- a/TODO.md +++ b/TODO.md @@ -1,3 +1,2 @@ -* fix: special workspace preload always loads first. Toggling it back is easy, but i'd rather create a new sh script that forces back to normal workspace. * add: similar to omarchy-menu -* cleanup: stylix configurations and wallpaper +* walker should have a script that initializes elephant if task does not exist. diff --git a/apps/hyprland/default.nix b/apps/hyprland/default.nix index 6e526a2..f993a37 100644 --- a/apps/hyprland/default.nix +++ b/apps/hyprland/default.nix @@ -16,5 +16,6 @@ pkgs.hyprlandPlugins.hyprsplit pkgs.hyprlandPlugins.hypr-dynamic-cursors pkgs.hyprlandPlugins.hyprspace + pkgs.hyprlandPlugins.hyprbars ]; } diff --git a/apps/hyprland/hypr/misc.nix b/apps/hyprland/hypr/misc.nix index d221007..37066cb 100644 --- a/apps/hyprland/hypr/misc.nix +++ b/apps/hyprland/hypr/misc.nix @@ -37,6 +37,21 @@ overview = { # Using default settings }; + + hyprbars = { + bar_height = 24; + bar_color = "$surface_container_high"; + bar_text_color = "$on_surface"; + bar_text_size = 0; + bar_text_font = "Sans"; + bar_button_padding = 4; + bar_padding = 8; + bar_precedence_over_border = true; + hyprbars-button = [ + "$error, 10, , hyprctl dispatch killactive" + "$tertiary, 10, , hyprctl dispatch fullscreen 1" + ]; + }; }; }; } diff --git a/apps/waybar/default.nix b/apps/waybar/default.nix index 99fddce..7da111c 100644 --- a/apps/waybar/default.nix +++ b/apps/waybar/default.nix @@ -13,10 +13,10 @@ WINDOW_PATTERN="$1" # Escaped Nix interpolation for shell default value logic - LAUNCH_COMMAND="''${2:- \"uwsm-app -- $WINDOW_PATTERN\"}" + LAUNCH_COMMAND="''${2:- \"uwsm-app -- $WINDOW_PATTERN\"}" # Locate window address via hyprctl and jq - WINDOW_ADDRESS=$(${pkgs.hyprland}/bin/hyprctl clients -j | ${pkgs.jq}/bin/jq -r --arg p "$WINDOW_PATTERN" + WINDOW_ADDRESS=$(${pkgs.hyprland}/bin/hyprctl clients -j | ${pkgs.jq}/bin/jq -r --arg p "$WINDOW_PATTERN" '.[] | select((.class | test("\\b" + $p + "\\b"; "i")) or (.title | test("\\b" + $p + "\\b"; "i"))) | .address' | head -n1) if [[ -n $WINDOW_ADDRESS ]]; then @@ -119,7 +119,7 @@ fi done fi - ) & + ) & exit 0 ''; @@ -226,7 +226,7 @@ in { "custom/omarchy" = { format = ""; - on-click = "omarchy-menu"; + on-click = "nc -U $XDG_RUNTIME_DIR/walker/walker.sock"; on-click-right = "xdg-terminal-exec"; tooltip-format = "Omarchy Menu\n\nSuper + Alt + Space"; }; @@ -328,4 +328,5 @@ in { }; }; }; -} \ No newline at end of file +} +