diff --git a/.config/dconf/user b/.config/dconf/user index 331677c..2cffd45 100644 Binary files a/.config/dconf/user and b/.config/dconf/user differ diff --git a/.config/niri/config.kdl b/.config/niri/config.kdl index 12f9a91..d8bd4bf 100644 --- a/.config/niri/config.kdl +++ b/.config/niri/config.kdl @@ -385,11 +385,8 @@ binds { Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; } Mod+B hotkey-overlay-title="Open a Browser: qutebrowser" { spawn "qutebrowser"; } Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; } - Mod+M hotkey-overlay-title="Search mpd Library: fuzzel" { spawn-sh "musicmenu.fish"; } - Mod+Shift+M hotkey-overlay-title="Browse mpd Playlist: fuzzel" { spawn-sh "playlistmenu.fish"; } - - Mod+P hotkey-overlay-title="Show the Power menu: fuzzel" { spawn-sh "powermenu.fish"; } - Mod+A hotkey-overlay-title="Show the Action menu: fuzzel" { spawn-sh "actionmenu.fish"; } + Mod+P hotkey-overlay-title="Show the Power menu: fuzzel" { spawn "powermenu.fish"; } + Mod+A hotkey-overlay-title="Show the Action menu: fuzzel" { spawn "actionmenu.fish"; } // Use spawn-sh to run a shell command. Do this if you need pipes, multiple commands, etc. // Note: the entire command goes as a single argument. It's passed verbatim to `sh -c`. // For example, this is a standard bind to toggle the screen reader (orca). diff --git a/.local/scripts/actionmenu.fish b/.local/scripts/actionmenu.fish index fb7ce85..2917ae9 100755 --- a/.local/scripts/actionmenu.fish +++ b/.local/scripts/actionmenu.fish @@ -66,22 +66,16 @@ function audio_sink wpctl set-default $ids[(contains -i $input $names)] end -set options "󱂵 Open Location" "󰐓 Clear Playlist" "󰌾 Lock" "󰍬 Select Audio Source" "󰕾 Select Audio Sink" +set options "󱂵 Open Location" "󰍬 Select Audio Source" "󰕾 Select Audio Sink" set input (menu $options) switch $input case $options[1] open_location - case $options[2] - mpc clear - - case $options[3] - exec swaylock - - case $options[4] + case $options[2] audio_source - case $options[5] + case $options[3] audio_sink end diff --git a/.local/scripts/powermenu.fish b/.local/scripts/powermenu.fish index a1789e1..feb8bb1 100755 --- a/.local/scripts/powermenu.fish +++ b/.local/scripts/powermenu.fish @@ -1,5 +1,5 @@ #!/usr/bin/env fish -set input_options "󰤄 Suspend" "󰐥 Poweroff" "󰜉 Reboot" +set input_options "󰌾 Lock" "󰤄 Suspend" "󰐥 Poweroff" "󰜉 Reboot" set input (menu $input_options) @@ -12,14 +12,17 @@ if test $check = $check_options[1] end switch $input - case $input_options[1] + case $input_options[1] + swaylock -f + + case $input_options[2] swaylock -f systemctl suspend - case $input_options[2] + case $input_options[3] systemctl poweroff - case $input_options[2] + case $input_options[4] systemctl reboot end