diff --git a/home/.config/i3/config b/home/.config/i3/config
index e0bf0fff..2636ef34 100644
--- a/home/.config/i3/config
+++ b/home/.config/i3/config
@@ -76,8 +76,10 @@ exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
exec --no-startup-id gnome-keyring-daemon --start --components=pkcs11
# pressing super key alone simulates pressing Alt-F1
+# this is needed for super key to launch rofi
exec --no-startup-id ksuperkey -e 'Super_L=Alt_L|F1'
exec --no-startup-id ksuperkey -e 'Super_R=Alt_L|F1'
+bindsym Mod1+F1 exec --no-startup-id rofi_run -r
###########################################################
############# Bindings ##################
@@ -88,25 +90,19 @@ bindsym $Mod+Shift+q kill
bindsym Mod1+q kill
# launchers
-bindsym Control+space exec --no-startup-id rofr.sh -r
-
-# this is needed for super key to launch rofi
-bindsym Mod1+F1 exec --no-startup-id rofr.sh -r
+bindsym Control+space exec --no-startup-id rofi_run -r
# core
-bindsym $Mod+e exec --no-startup-id geany
bindsym $Mod+t exec --no-startup-id exo-open --launch TerminalEmulator
bindsym $Mod+Return --no-startup-id exec exo-open --launch TerminalEmulator
bindsym $Mod+w exec --no-startup-id exo-open --launch WebBrowser
bindsym $Mod+f exec --no-startup-id exo-open --launch FileManager
# logout script
-bindsym $Mod+x exec --no-startup-id rofr.sh -l
+bindsym $Mod+x exec --no-startup-id rofi_run -l
# Screenshot
-bindsym Print exec --no-startup-id "scrot '%S.png' \
- -e 'mv $f $$(xdg-user-dir PICTURES)/ArchLabs-%S-$wx$h.png \
- ; gpicview $$(xdg-user-dir PICTURES)/ArchLabs-%S-$wx$h.png'"
+bindsym Print exec --no-startup-id "scrot '%S.png' -e 'mv $f $$(xdg-user-dir PICTURES)/ArchLabs-%S-$wx$h.png ; feh $$(xdg-user-dir PICTURES)/ArchLabs-%S-$wx$h.png'"
# audio
bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
diff --git a/home/.config/jgmenu/prepend.csv b/home/.config/jgmenu/prepend.csv
index eaf0dbbe..41a9edc1 100644
--- a/home/.config/jgmenu/prepend.csv
+++ b/home/.config/jgmenu/prepend.csv
@@ -1,4 +1,4 @@
-Web browser,firefox,firefox
-File manager,thunar,system-file-manager
-Terminal,termite,utilities-terminal
+Web browser,exo-open --launch WebBrowser,web-browser
+File manager,exo-open --launch FileManager,system-file-manager
+Terminal,exo-open --launch TerminalEmulator,utilities-terminal
^sep()
diff --git a/home/.config/ob-autostart/config b/home/.config/ob-autostart/config
deleted file mode 100644
index ef2fded2..00000000
--- a/home/.config/ob-autostart/config
+++ /dev/null
@@ -1,4 +0,0 @@
-# OB_Autostart config
-LAUNCH_LIST = [
- ("Window switcher","skippy-xd --config $HOME/.config/skippy-xd/skippy-xd.rc --start-daemon","1","*"),
- ]
diff --git a/home/.config/openbox/autostart b/home/.config/openbox/autostart
index 10739e28..efcab4f3 100644
--- a/home/.config/openbox/autostart
+++ b/home/.config/openbox/autostart
@@ -17,12 +17,12 @@ ksuperkey -e 'Super_R=Alt_L|F1' &
# restore wallpaper
nitrogen --restore &
-# run the ob-autostart GUI configured commands
-ob-autostart -d &
-
# required for xfce settings to work
xfsettingsd &
+# fancy window switcher
+skippy-xd --config ~/.config/skippy-xd/skippy-xd.rc --start-daemon
+
# side panel shortcuts for file managers
xdg-user-dirs-gtk-update &
diff --git a/home/.config/openbox/menu-piped.xml b/home/.config/openbox/menu-piped.xml
deleted file mode 100644
index 392f7fe5..00000000
--- a/home/.config/openbox/menu-piped.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
-
diff --git a/home/.config/openbox/menu.xml b/home/.config/openbox/menu.xml
index f6de15d4..4474d1cc 100644
--- a/home/.config/openbox/menu.xml
+++ b/home/.config/openbox/menu.xml
@@ -64,11 +64,6 @@
obkey
- -
-
- ob-autostart
-
-
-
@@ -157,7 +152,7 @@
-
- rofr.sh -l
+ rofi_run -l
diff --git a/home/.config/sxhkd/sxhkdrc b/home/.config/sxhkd/sxhkdrc
index 9302648b..e4407c3f 100644
--- a/home/.config/sxhkd/sxhkdrc
+++ b/home/.config/sxhkd/sxhkdrc
@@ -16,11 +16,11 @@ super + f
# program launcher
super + @space
- rofr.sh -r
+ rofi_run -r
# program launcher
alt + F1
- rofr.sh -r
+ rofi_run -r
# make sxhkd reload its configuration files:
super + shift + r
@@ -28,7 +28,7 @@ super + shift + r
# quit bspwm normally
super + x
- rofr.sh -l
+ rofi_run -l
# close and kill
super + {_,shift + }q
diff --git a/home/.xinitrc b/home/.xinitrc
index 65ef59d8..7aec520d 100755
--- a/home/.xinitrc
+++ b/home/.xinitrc
@@ -2,17 +2,14 @@
# this file is executed when calling startx
-# to start a different WM, set session below, or in console run:
-# startx ~/.xinitrc WM
-
+# set session below, or in console run: startx ~/.xinitrc SESSION
# session to run if none passed as first arg ($1)
session="${1:-openbox}"
# set environment wm for use in scripts
WM="${session%-session}"
-WM="${session#start}"
-export WM
+export WM="${WM#start}"
# default arch xinit scripts
if [ -d /etc/X11/xinit/xinitrc.d ]; then
@@ -27,20 +24,6 @@ fi
[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
[ -f ~/.xprofile ] && source ~/.xprofile
-# display timeout and sleep
-xset s 3600 3600
-xset dpms 3600 3700 4000
-
-# keyboard repeat rate
-xset r rate 400 50
-kbdrate -d 400 -r 50
-
-if [[ $session =~ (dwm|cinnamon|gnome|xfce4) ]]; then
- nitrogen --restore &
- ksuperkey -e 'Super_L=Alt_L|p' &
- ksuperkey -e 'Super_R=Alt_L|p' &
-fi
-
# do NOT put commands below the exec lines
case $session in
dwm) exec dwm ;;
diff --git a/home/.xprofile b/home/.xprofile
index 24018768..b667d001 100644
--- a/home/.xprofile
+++ b/home/.xprofile
@@ -1,10 +1,32 @@
-# .xprofile
+# ~/.xprofile
+
# vim:ft=sh
-# sourced at boot by xinit
+# sourced at boot by xinit and lightdm
[ -d /sbin ] && PATH="$PATH:/sbin"
[ -d /usr/sbin ] && PATH="$PATH:/usr/sbin"
[ -d "$HOME/bin" ] && PATH="$HOME/bin:$PATH"
+# restore the background
+nitrogen --restore &
+
+if [[ $session == 'dwm' ]]; then
+ # allow pressing super alone to simulate Alt-p
+ ksuperkey -e 'Super_L=Alt_L|p' &
+ ksuperkey -e 'Super_R=Alt_L|p' &
+else
+ # allow pressing super alone to simulate Alt-p
+ ksuperkey -e 'Super_L=Alt_L|F1' &
+ ksuperkey -e 'Super_R=Alt_L|F1' &
+fi
+
+# display timeout and sleep
+xset s 3600 3600
+xset dpms 3600 3700 4000
+
+# keyboard repeat rate
+xset r rate 400 50
+kbdrate -d 400 -r 50
+
export XDG_CONFIG_HOME="$HOME/.config"
diff --git a/home/bin/rofr.sh b/home/bin/rofi_run
similarity index 100%
rename from home/bin/rofr.sh
rename to home/bin/rofi_run