diff options
| author | Toby Vincent <tobyv@tobyvin.dev> | 2024-06-02 12:31:37 -0500 |
|---|---|---|
| committer | Toby Vincent <tobyv@tobyvin.dev> | 2024-06-02 12:34:19 -0500 |
| commit | c0e633d60622beb00ac2da6d980b68b57041b546 (patch) | |
| tree | 10969631a97e4bbde39e06bb5dee0a63174fdd2c | |
| parent | 972f81cc4a2c78dce35f4d1fcd66aed3589f2180 (diff) | |
fix(sway): simplify PATH var by not masking wmenu
| -rw-r--r-- | sh/.profile | 9 | ||||
| -rw-r--r-- | sway/.config/sway/config | 2 | ||||
| -rwxr-xr-x | sway/.local/bin/sway-menu | 10 | ||||
| -rwxr-xr-x | sway/.local/bin/wmenu | 16 |
4 files changed, 11 insertions, 26 deletions
diff --git a/sh/.profile b/sh/.profile index c311d4f..2b794d7 100644 --- a/sh/.profile +++ b/sh/.profile @@ -14,9 +14,6 @@ append_path() { esac } -# Store original (system) paths to fix prioritization later -_path=$PATH - # Use systemd-environment-d-generator(8) to generate environment, and export those variables # # See: https://wiki.archlinux.org/title/Environment_variables#Per_Wayland_session @@ -39,9 +36,3 @@ fi # Unload our profile API functions unset -f append_path - -# Fix PATH to prioritize user added paths -if [ -e "$_path" ]; then - PATH="${PATH#"$_path"}:$_path" - export PATH -fi diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 0543830..907e064 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -5,7 +5,7 @@ set $down j set $up k set $right l -set $menu ~/.local/bin/wmenu +set $menu sway-menu set $out1 - set $out2 - diff --git a/sway/.local/bin/sway-menu b/sway/.local/bin/sway-menu new file mode 100755 index 0000000..6bafccc --- /dev/null +++ b/sway/.local/bin/sway-menu @@ -0,0 +1,10 @@ +#!/bin/sh + +wmenu -i -f 'monospace 12' \ + -n"#$BASE16_COLOR_06_HEX" \ + -N"#$BASE16_COLOR_00_HEX" \ + -S"#$BASE16_COLOR_00_HEX" \ + -s"#$BASE16_COLOR_09_HEX" \ + -m"#$BASE16_COLOR_06_HEX" \ + -M"#$BASE16_COLOR_0C_HEX" \ + "$@" diff --git a/sway/.local/bin/wmenu b/sway/.local/bin/wmenu deleted file mode 100755 index 9840721..0000000 --- a/sway/.local/bin/wmenu +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# shellcheck disable=SC2068 - -base00="${BASE16_COLOR_06_HEX:-#1d2021}" -base06="${BASE16_COLOR_00_HEX:-#ebdbb2}" -base09="${BASE16_COLOR_09_HEX:-#fe8019}" -base0C="${BASE16_COLOR_0C_HEX:-#8ec07c}" - -command -p wmenu -i -f 'monospace 12' \ - -n"$base06" \ - -N"$base00" \ - -S"$base00" \ - -s"$base09" \ - -m"$base06" \ - -M"$base0C" \ - $@ |