diff --git a/_desktop/install-desktop.sh b/_desktop/install-desktop.sh index d8a5fe9..ed4e142 100644 --- a/_desktop/install-desktop.sh +++ b/_desktop/install-desktop.sh @@ -4,7 +4,7 @@ mkdir -p ~/.config ~/.local/settings # link config -for i in clipit dunst fontconfig qutebrowser rofi zathura; do +for i in clipit dunst fontconfig qutebrowser zathura; do rm -rf ~/.config/${i} ln -sf ~/.local/repos/dotfiles/_desktop/${i} ~/.config done diff --git a/_suckless/_scripts/rofi-bluetooth b/_suckless/_scripts/dmenu-bluetooth similarity index 98% rename from _suckless/_scripts/rofi-bluetooth rename to _suckless/_scripts/dmenu-bluetooth index 5c52fd8..0d59422 100755 --- a/_suckless/_scripts/rofi-bluetooth +++ b/_suckless/_scripts/dmenu-bluetooth @@ -271,7 +271,7 @@ show_menu() { fi # Open rofi menu, read chosen option - chosen="$(echo -e "$options" | $rofi_command "Bluetooth")" + chosen="$(echo -e "$options" | $rofi_command "Bluetooth:")" # Match chosen option to command case $chosen in @@ -299,7 +299,7 @@ show_menu() { } # Rofi command to pipe into, can add any options here -rofi_command="rofi -dmenu -no-fixed-num-lines -yoffset -100 -i -p" +rofi_command="dmenu -l 20 -i -p" case "$1" in --status) diff --git a/_suckless/_scripts/rofi_display b/_suckless/_scripts/dmenu-display similarity index 86% rename from _suckless/_scripts/rofi_display rename to _suckless/_scripts/dmenu-display index 01da2e5..bde3a65 100755 --- a/_suckless/_scripts/rofi_display +++ b/_suckless/_scripts/dmenu-display @@ -1,9 +1,9 @@ #!/bin/sh twoscreen() { - mirror=$(printf "no\\nyes" | rofi -dmenu -i -p "Mirror displays?") + mirror=$(printf "no\\nyes" | dmenu -l 20 -i -p "Mirror displays?") if [ "$mirror" = "yes" ]; then - external=$(echo "$screens" | rofi -dmenu -i -p "Optimize resolution for") + external=$(echo "$screens" | dmenu -l 20 -i -p "Optimize resolution for:") internal=$(echo "$screens" | grep -v "$external") res_external=$(xrandr --query | sed -n "/^$external/,/\+/p" | \ tail -n 1 | awk '{print $1}') @@ -19,9 +19,9 @@ twoscreen() { --output "$internal" --auto --same-as "$external" \ --scale "$scale_x"x"$scale_y" else - primary=$(echo "$screens" | rofi -dmenu -i -p "Select primary display") + primary=$(echo "$screens" | dmenu -l 20 -i -p "Select primary display:") secondary=$(echo "$screens" | grep -v "$primary") - direction=$(printf "left\\nright" | rofi -dmenu -i -p "What side of $primary should $secondary be on?") + direction=$(printf "left\\nright" | dmenu -l 20 -i -p "What side of $primary should $secondary be on?") xrandr --output "$primary" --auto --scale 1.0x1.0 --output "$secondary" --"$direction"-of "$primary" --auto --scale 1.0x1.0 fi } @@ -51,7 +51,7 @@ screens=$(echo "$allposs" | awk '/ connected/ {print $1}') { onescreen "$screens"; postrun; notify-send "💻 Only one screen detected."; exit ;} # Get user choice including both and manual selection: -chosen=$(printf -- "home-1\\nhome-2\\n----\\n%s\\n----\\nmulti" "$screens" | rofi -dmenu -i -p "Select display arangement") && +chosen=$(printf -- "home-1\\nhome-2\\n----\\n%s\\n----\\nmulti" "$screens" | dmenu -l 20 -i -p "Select display:") && case "$chosen" in "home-1") home 0 ;; "home-2") home 1 ;; diff --git a/_suckless/dwm/config.h b/_suckless/dwm/config.h index 5ee7d1f..42ad05f 100644 --- a/_suckless/dwm/config.h +++ b/_suckless/dwm/config.h @@ -104,7 +104,7 @@ static Key keys[] = { TAGKEYS( XK_0, 9) /* apps n'shit */ { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_space, spawn, SHCMD("rofi -show run -i") }, + { MODKEY, XK_space, spawn, SHCMD("dmenu_run -l 10 -i -p 'Run:'") }, { MODKEY, XK_f, spawn, SHCMD("st -n nnn -e nnn -de") }, { MODKEY, XK_i, spawn, SHCMD("scrot --select 'scrot_%Y-%m-%d_%H-%M-%S_%s.png'") }, { SHTKEY, XK_i, spawn, SHCMD("scrot 'scrot_%Y-%m-%d_%H-%M-%S_%s.png'") }, @@ -112,8 +112,8 @@ static Key keys[] = { { MODKEY, XK_q, killclient, {0} }, { MODKEY, XK_e, togglescratch, {.ui = 0 } }, /* service controls */ - { CTRKEY, XK_b, spawn, SHCMD("rofi-bluetooth") }, - { CTRKEY, XK_d, spawn, SHCMD("rofi_display") }, + { CTRKEY, XK_b, spawn, SHCMD("dmenu-bluetooth") }, + { CTRKEY, XK_d, spawn, SHCMD("dmenu-display") }, { CTRKEY, XK_l, spawn, SHCMD("slock") }, { CTRKEY, XK_v, spawn, SHCMD("pavucontrol") }, { CTRKEY, XK_u, spawn, SHCMD("rofi -show emoji") },