From ca5cb68264e8372b70e6d657205ad32008c66498 Mon Sep 17 00:00:00 2001 From: Alex Janka Date: Sat, 21 Nov 2015 16:24:00 +1100 Subject: [PATCH] Added rofi --- bspwm/.config/bspwm/bspwmrc | 6 ++++-- bspwm/spotifykeys.sh | 19 +++++++++++++++++++ panel/bspwm/panel/panel | 2 +- panel/bspwm/panel/panel_colors | 2 +- sxhkd/.config/sxhkd/sxhkdrc | 2 +- vim/.vim/bundle/Vundle.vim | 2 +- vim/.vim/bundle/nerdtree | 2 +- vim/.vim/bundle/nerdtree-git-plugin | 2 +- vim/.vim/bundle/vim-airline | 2 +- x/.Xresources | 17 +++++++++++++++++ zsh/.zshrc | 9 +++++++-- 11 files changed, 54 insertions(+), 11 deletions(-) create mode 100755 bspwm/spotifykeys.sh diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc index cc84aff..1a4bf37 100755 --- a/bspwm/.config/bspwm/bspwmrc +++ b/bspwm/.config/bspwm/bspwmrc @@ -13,8 +13,8 @@ bspc config focus_by_distance true bspc config top_padding 16 bspc config focus_follows_pointer true -bspc monitor HDMI1 -d I II III IV V -bspc monitor eDP1 -d VI VII VIII IX X +bspc monitor DVI-I-1 -d I II III IV V +bspc monitor DVI-D-0 -d VI VII VIII IX X bspc monitor DVI-I-1 -n "" bspc monitor DVI-D-0 -n "" @@ -25,5 +25,7 @@ bspc rule -a mplayer2 floating=on bspc rule -a Kupfer.py focus=on bspc rule -a Screenkey manage=off +bspc rule -a vmplayer floating=on + export PANEL_FIFO="/tmp/panel-fifo" panel diff --git a/bspwm/spotifykeys.sh b/bspwm/spotifykeys.sh new file mode 100755 index 0000000..0093174 --- /dev/null +++ b/bspwm/spotifykeys.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +case $1 in + "play") + key="XF86AudioPlay" + ;; + "next") + key="XF86AudioNext" + ;; + "prev") + key="XF86AudioPrev" + ;; + *) + echo "Usage: $0 play|next|prev" + exit 1 + ;; +esac +xdotool key --window $(xdotool search --name "Spotify (Premium |Unlimited |Free )?- Linux Preview"|head -n1) $key +exit 0 diff --git a/panel/bspwm/panel/panel b/panel/bspwm/panel/panel index c89d0f3..ad4be67 100755 --- a/panel/bspwm/panel/panel +++ b/panel/bspwm/panel/panel @@ -17,6 +17,6 @@ clock -sf 'S%a %H:%M' > "$PANEL_FIFO" & . panel_colors -cat "$PANEL_FIFO" | panel_bar | lemonbar -g x$PANEL_HEIGHT -f "" -F "$COLOR_FOREGROUND" -B "$COLOR_BACKGROUND" & +cat "$PANEL_FIFO" | panel_bar | lemonbar -g x$PANEL_HEIGHT -f "Inconsolata" -F "$COLOR_FOREGROUND" -B "$COLOR_BACKGROUND" & wait diff --git a/panel/bspwm/panel/panel_colors b/panel/bspwm/panel/panel_colors index cbf105a..9625c17 100755 --- a/panel/bspwm/panel/panel_colors +++ b/panel/bspwm/panel/panel_colors @@ -5,7 +5,7 @@ COLOR_ACTIVE_MONITOR_BG='#FF10151B' # COLOR_INACTIVE_MONITOR_FG='#FF10151B' # COLOR_INACTIVE_MONITOR_BG='#FF0A0F14' # COLOR_FOCUSED_OCCUPIED_FG='#FFD3EBE9' # -COLOR_FOCUSED_OCCUPIED_BG='#FF5C5955' +COLOR_FOCUSED_OCCUPIED_BG='#FF081F2D' COLOR_FOCUSED_FREE_FG='#FFD3EBE9' # COLOR_FOCUSED_FREE_BG='#FF081f2d' # COLOR_FOCUSED_URGENT_FG='#FF0A0F14' # diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc index 59a3622..10f1623 100644 --- a/sxhkd/.config/sxhkd/sxhkdrc +++ b/sxhkd/.config/sxhkd/sxhkdrc @@ -81,7 +81,7 @@ super + Return urxvt super + space - dmenu_run + rofi -show run # make sxhkd reload its configuration files: super + Escape diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim index 0ee36b2..5f70ae6 160000 --- a/vim/.vim/bundle/Vundle.vim +++ b/vim/.vim/bundle/Vundle.vim @@ -1 +1 @@ -Subproject commit 0ee36b26e127cda512a8f2852a59e5a5f374c87f +Subproject commit 5f70ae6025e951f0154e3940d123138adffa4c88 diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree index 0b44415..47c20c4 160000 --- a/vim/.vim/bundle/nerdtree +++ b/vim/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 0b44415a3302030b56755cc1135ca9ca57dc1ada +Subproject commit 47c20c4b64e30e2948b327c55f49e140f80d5d79 diff --git a/vim/.vim/bundle/nerdtree-git-plugin b/vim/.vim/bundle/nerdtree-git-plugin index 932552e..23d5199 160000 --- a/vim/.vim/bundle/nerdtree-git-plugin +++ b/vim/.vim/bundle/nerdtree-git-plugin @@ -1 +1 @@ -Subproject commit 932552ee295971cfb202c3b360319cb56e4ba6f0 +Subproject commit 23d5199f0eaee036186f3df8a87ec356905c6a32 diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline index 8c30610..14d14cf 160000 --- a/vim/.vim/bundle/vim-airline +++ b/vim/.vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit 8c30610c5f60eada1d21ab23e96d45848a1e6e58 +Subproject commit 14d14cf951c08fc88ca6c3e6f28fe47b99421e23 diff --git a/x/.Xresources b/x/.Xresources index fe182d9..02ba1f8 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -39,3 +39,20 @@ URxvt*color14: #599caa URxvt*color7: #98d1ce URxvt*color15: #d3ebe9 + +rofi.fg: #98d1ce +rofi.bg: #0a0f14 + +rofi.fg-active: #599caa +rofi.fg-urgent: #d26939 + +rofi.hlfg-active: #26a98b +rofi.hlfg-urgent: #c33027 + +rofi.bg-active: #10151b +rofi.bg-urgent: #081f2d + +rofi.hlbg-active: #093748 +rofi.hlbg-urgent: #195465 + +rofi.bc: #4e5165 diff --git a/zsh/.zshrc b/zsh/.zshrc index 929ab39..b8af9d1 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -52,11 +52,11 @@ ZSH_THEME="eastwood" # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git) +plugins=() # User configuration -export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/home/alex/bspwm/panel" +export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/home/alex/bspwm/panel:/home/alex/Unreal/UnrealEngine/Engine/Binaries/Linux" # export MANPATH="/usr/local/man:$MANPATH" source $ZSH/oh-my-zsh.sh @@ -92,3 +92,8 @@ source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zs source /usr/share/doc/pkgfile/command-not-found.zsh alias tree="tree -C" + +function git_prompt_info() { + ref=$(git symbolic-ref HEAD 2> /dev/null) || return + echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$ZSH_THEME_GIT_PROMPT_SUFFIX" +}