6 files changed, 23 insertions, 24 deletions

diff --git a/herbstluftwm/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index aa7c430..ebef530 100755
--- a/herbstluftwm/.config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
@@ -11,22 +11,13 @@ export HLWM_CONF_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
 source "$HLWM_CONF_DIR/hlwm-theming"
 
-#Dmenu opts
-dmenu_screen=0
-dmenu_width=400
-dmenu_height=30
-dmenu_lines=9
-
 geometry=($(hc monitor_rect $dmenu_screen))
 
-dmenu_x=$(echo "(${geometry[2]} / 2) - ($dmenu_width / 2)" | bc)
-dmenu_y="${geometry[1]}"
-
 # Tags
 tag_names=()
 tag_keys=({1..9} 0)
 for key in ${tag_keys[@]}; do
-    if [ $key -eq 0 ]; then 
+    if [ $key -eq 0 ]; then
         key=10
     else
         key=$(echo "$key - 1" | bc)
diff --git a/herbstluftwm/.config/herbstluftwm/dependencylist b/herbstluftwm/.config/herbstluftwm/dependencylist
index 9092324..beed0dd 100644
--- a/herbstluftwm/.config/herbstluftwm/dependencylist
+++ b/herbstluftwm/.config/herbstluftwm/dependencylist
@@ -1,7 +1,6 @@
 alsa-utils
 bc
 compton
-dmenu2
 feh
 herbstluftwm-git
 i3lock
@@ -10,6 +9,7 @@ mpc
 playerctl
 pulseaudio
 pulseaudio-alsa
+rofi-git
 scrot
 sed
 ttf-dejavu
diff --git a/herbstluftwm/.config/herbstluftwm/dmenu_theme.sh b/herbstluftwm/.config/herbstluftwm/dmenu_theme.sh
deleted file mode 100755
index 6b825ce..0000000
--- a/herbstluftwm/.config/herbstluftwm/dmenu_theme.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-theme_dir="$HLWM_CONF_DIR/themes"
-themes=$(ls "$theme_dir" | grep -vE "current|template")
-theme=$(echo "$themes" | dmenu "$@")
-
-if [ -n "$theme" ] && [ -f "$theme_dir/$theme" ]; then
-        ln -sf "$theme" "$theme_dir/current" && herbstclient reload
-fi
-
diff --git a/herbstluftwm/.config/herbstluftwm/hlwm-keybindings b/herbstluftwm/.config/herbstluftwm/hlwm-keybindings
index 1711760..63325f5 100644
--- a/herbstluftwm/.config/herbstluftwm/hlwm-keybindings
+++ b/herbstluftwm/.config/herbstluftwm/hlwm-keybindings
@@ -10,9 +10,10 @@ hc keybind $Mod-Shift-q quit
 hc keybind $Mod-Shift-r chain , spawn echo "!! HLWM reload config !!" , reload
 hc keybind $Mod-Shift-c close
 hc keybind $Mod-Return spawn xterm
-hc keybind $Mod-grave spawn dmenu_app -i -h $dmenu_height -w $dmenu_width -x $dmenu_x -y $dmenu_y -p "Launch:" -s $dmenu_screen -l $dmenu_lines -fn "$HLWM_PANEL_FONT" -nb $HLWM_BG_COLOR -nf $HLWM_FG_COLOR -sb $HLWM_ACCENT_COLOR -sf $HLWM_BG_COLOR
-hc keybind $Mod-e spawn dmenu_run -i -h $dmenu_height -w $dmenu_width -x $dmenu_x -y $dmenu_y -p "Execute:" -s $dmenu_screen -l $dmenu_lines -fn "$HLWM_PANEL_FONT" -nb $HLWM_BG_COLOR -nf $HLWM_FG_COLOR -sb $HLWM_ACCENT_COLOR -sf $HLWM_BG_COLOR
-hc keybind $Mod-t spawn env HLWM_CONF_DIR=$HLWM_CONF_DIR $HLWM_CONF_DIR/dmenu_theme.sh -i -h $dmenu_height -w $dmenu_width -x $dmenu_x -y $dmenu_y -p "Theme:" -s $dmenu_screen -l $dmenu_lines -fn "$HLWM_PANEL_FONT" -nb $HLWM_BG_COLOR -nf $HLWM_FG_COLOR -sb $HLWM_ACCENT_COLOR -sf $HLWM_BG_COLOR
+
+hc keybind $Mod-Escape spawn rofi -color-enabled -modi "run,ssh" -show run
+hc keybind $Mod-t spawn env HLWM_CONF_DIR=$HLWM_CONF_DIR $HLWM_CONF_DIR/rofi_theme.sh -color-enabled
+
 hc keybind XF86AudioLowerVolume spawn amixer set Master 1%-
 hc keybind XF86AudioRaiseVolume spawn amixer set Master 1%+
 
diff --git a/herbstluftwm/.config/herbstluftwm/hlwm-theming b/herbstluftwm/.config/herbstluftwm/hlwm-theming
index aca737f..8e043fb 100644
--- a/herbstluftwm/.config/herbstluftwm/hlwm-theming
+++ b/herbstluftwm/.config/herbstluftwm/hlwm-theming
@@ -20,6 +20,12 @@ done
 
 echo "XTerm*background: $HLWM_BG_COLOR" | xrdb -override
 
+#     Mode:              BG,              FG               BG ALT,          HL BG,              HL FG
+echo "rofi.color-normal: $HLWM_BG_COLOR,  $HLWM_FG_COLOR,  $HLWM_BG_COLOR,  $HLWM_ACCENT_COLOR, $HLWM_FG_COLOR" | xrdb -override
+
+#     Windowi            BACKGROUND,     BORDER
+echo "rofi.color-window: $HLWM_BG_COLOR, $HLWM_ACCENT_COLOR" | xrdb -override
+
 export HLWM_FG_ACOLOR=$(add_alpha_channel $HLWM_FG_COLOR)
 export HLWM_ACCENT_ACOLOR=$(add_alpha_channel $HLWM_ACCENT_COLOR)
 export HLWM_BG_ACOLOR=$(add_alpha_channel $HLWM_BG_COLOR)
diff --git a/herbstluftwm/.config/herbstluftwm/rofi_theme.sh b/herbstluftwm/.config/herbstluftwm/rofi_theme.sh
new file mode 100755
index 0000000..4921a66
--- /dev/null
+++ b/herbstluftwm/.config/herbstluftwm/rofi_theme.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+theme_dir="$HLWM_CONF_DIR/themes"
+current=$(readlink "$theme_dir/current")
+themes=$(ls "$theme_dir" | grep -vE "current|template|README\.md|$current")
+theme=$(echo "$themes" | rofi -dmenu -p "theme:" $@)
+
+if [ -n "$theme" ] && [ -f "$theme_dir/$theme" ]; then
+        ln -sf "$theme" "$theme_dir/current" && herbstclient reload
+fi
+