From 4b164c41403a5170a667e473f00846133fbdc18d Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Tue, 20 Oct 2015 19:10:08 +0100 Subject: add ratpoison bordscript back --- Browser/vimb/config | 16 +++++----- Editor/vimrc | 13 +++++++- Panel/lemonbar/panel | 4 +-- Shell/bash_aliases | 4 ++- Window_Manager/ratpoison/borderscript | 6 ++-- Window_Manager/ratpoison/ratpoisonrc.conf | 50 +++++++++++++++---------------- Xinit/xinitrc | 3 +- 7 files changed, 54 insertions(+), 42 deletions(-) diff --git a/Browser/vimb/config b/Browser/vimb/config index 8972d08..09aebd3 100644 --- a/Browser/vimb/config +++ b/Browser/vimb/config @@ -30,11 +30,11 @@ nmap ) nmap S :set scripts=false r :shellcmd mpv --no-terminal "%s" :set scripts=true -set status-color-bg=#0D0F20 -set status-color-fg=#D10F2F -set status-ssl-color-bg=#0D0F20 -set status-ssl-color-fg=#D10F2F -set completion-bg-active=#0D0F20 -set completion-bg-normal=#0D0F20 -set completion-fg-active=#A02896 -set completion-fg-normal=#D10F2F +set status-color-bg=#200208 +set status-color-fg=#e08e79 +set status-ssl-color-bg=#200208 +set status-ssl-color-fg=#e08e79 +set completion-bg-active=#200208 +set completion-bg-normal=#200208 +set completion-fg-active=#e05841 +set completion-fg-normal=#e08e79 diff --git a/Editor/vimrc b/Editor/vimrc index 7f602a7..859cd1d 100644 --- a/Editor/vimrc +++ b/Editor/vimrc @@ -85,7 +85,6 @@ nnoremap k gk "set leader to comma let mapleader = "," - "Math with qalc nnoremap m :.!~/bin/calc nnoremap i :read !latestimage @@ -94,6 +93,15 @@ nnoremap v :!open '' "read spaces in path's set isfname+=32 +"Set tab to two spaces +set expandtab +set shiftwidth=2 +set softtabstop=2 + + +let g:ycm_confirm_extra_conf = 1 + + "Make tab into another escape "nnoremap "vnoremap gV @@ -108,6 +116,9 @@ set clipboard^=unnamed " don't clobber up the directory with dot undo file set undodir=~/.vim/undodir// +"disable mouse +set mouse= + "Open new file nnoremap o :CtrlP diff --git a/Panel/lemonbar/panel b/Panel/lemonbar/panel index b8c7f48..0477467 100755 --- a/Panel/lemonbar/panel +++ b/Panel/lemonbar/panel @@ -25,5 +25,5 @@ source ./panel_colors cat "$PANEL_FIFO" | ./panel_bar | lemonbar -f "$FONT_FONT" -f "$ICON_FONT" -g x$PANEL_HEIGHT -F "$COLOR11" -B "$COLOR0" -u 3 & -sleep 1; -stalonetray --geometry 1x1-415+2 --icon-gravity E --grow-gravity E -bg $COLOR0 -i 20 & +#sleep 1; +#stalonetray --geometry 1x1-415+2 --icon-gravity E --grow-gravity E -bg $COLOR0 -i 20 & diff --git a/Shell/bash_aliases b/Shell/bash_aliases index a0f818e..d2fa496 100644 --- a/Shell/bash_aliases +++ b/Shell/bash_aliases @@ -19,7 +19,9 @@ alias swedish='vim ~/Sync/Notes/Swedish/swedish.txt' #zombify alias zombify='sudo -u dork /home/vasko/dorknet/dork zombify' -alias radio="unbuffer mpv 'http://relay.181.fm:8028' |grep --line-buffered icy-title | sed -u 's/.*icy-title: /p/' > /tmp/panel-fifo" +alias radiorock="unbuffer mpv 'http://relay.181.fm:8028' |grep --line-buffered icy-title | sed -u 's/.*icy-title: /p/' > /tmp/panel-fifo" +alias radio40="unbuffer mpv 'http://relay.181.fm:8070' |grep --line-buffered icy-title | sed -u 's/.*icy-title: /p/' > /tmp/panel-fifo" +alias radiolounge="unbuffer mpv 'http://sc-tcl.1.fm:8010/' |grep --line-buffered icy-title | sed -u 's/.*icy-title: /p/' > /tmp/panel-fifo" alias irc='autossh -M 0 -o "ServerAliveInterval 45" -o "ServerAliveCountMax 2" -p 55022 vasko@skozl.com' alias vps='autossh -M 0 -o "ServerAliveInterval 45" -o "ServerAliveCountMax 2" -p 22 vasko@108.61.173.91' alias sourcel='source ~/.bash_aliases' diff --git a/Window_Manager/ratpoison/borderscript b/Window_Manager/ratpoison/borderscript index 1495bec..9ac2113 100755 --- a/Window_Manager/ratpoison/borderscript +++ b/Window_Manager/ratpoison/borderscript @@ -1,11 +1,9 @@ -#!/bin/bash +#!/bin/sh frames=`ratpoison -c fdump | tr -d -C '(' | wc -c` -if [[ $frames == 1 ]];then +if [ $frames -eq 1 ];then ratpoison -c "hideborder" -ratpoison -c "hidepadding" else ratpoison -c "showborder" -ratpoison -c "showpadding" fi diff --git a/Window_Manager/ratpoison/ratpoisonrc.conf b/Window_Manager/ratpoison/ratpoisonrc.conf index 0c81e09..c8c4a04 100644 --- a/Window_Manager/ratpoison/ratpoisonrc.conf +++ b/Window_Manager/ratpoison/ratpoisonrc.conf @@ -43,7 +43,7 @@ exec xsetroot -cursor_name left_ptr #exec nitrogen --restore #Border & Padding -alias showpanel set padding 0 27 0 0 +alias showpanel set padding 0 24 0 0 alias hidepanel set padding 0 0 0 0 showpanel @@ -82,29 +82,29 @@ unmanage ratbar.pl #Get F-keys to switch windows now in /usr/bin/rpws -definekey top F1 exec rpws 1 && echo "D1" > /tmp/panel-fifo && ratpoison -c barsend -definekey top F2 exec rpws 2 && echo "D2" > /tmp/panel-fifo && ratpoison -c barsend -definekey top F3 exec rpws 3 && echo "D3" > /tmp/panel-fifo && ratpoison -c barsend -definekey top F4 exec rpws 4 && echo "D4" > /tmp/panel-fifo && ratpoison -c barsend -definekey top F5 exec rpws 5 && echo "D5" > /tmp/panel-fifo && ratpoison -c barsend -definekey top F6 exec rpws 6 && echo "D6" > /tmp/panel-fifo && ratpoison -c barsend -definekey top F7 exec rpws 7 && echo "D7" > /tmp/panel-fifo && ratpoison -c barsend -definekey top F8 exec rpws 8 && echo "D8" > /tmp/panel-fifo && ratpoison -c barsend -definekey top F9 exec rpws 9 && printf "D9\nIxlear\n" > /tmp/panel-fifo && ratpoison -c barsend -definekey top F10 exec rpws 10 && printf "D10\nIclear\n" > /tmp/panel-fifo & xset -led named "Scroll Lock" & ratpoison -c barsend -definekey top F11 exec rpws 11 && echo "D11" > /tmp/panel-fifo && ratpoison -c barsend -definekey top F12 exec rpws 12 && echo "D12" > /tmp/panel-fifo && ratpoison -c barsend - -definekey top s-1 exec rpws 1 && echo "D1" > /tmp/panel-fifo && ratpoison -c barsend -definekey top s-2 exec rpws 2 && echo "D2" > /tmp/panel-fifo && ratpoison -c barsend -definekey top s-3 exec rpws 3 && echo "D3" > /tmp/panel-fifo && ratpoison -c barsend -definekey top s-4 exec rpws 4 && echo "D4" > /tmp/panel-fifo && ratpoison -c barsend -definekey top s-5 exec rpws 5 && echo "D5" > /tmp/panel-fifo && ratpoison -c barsend -definekey top s-6 exec rpws 6 && echo "D6" > /tmp/panel-fifo && ratpoison -c barsend -definekey top s-7 exec rpws 7 && echo "D7" > /tmp/panel-fifo && ratpoison -c barsend -definekey top s-8 exec rpws 8 && echo "D8" > /tmp/panel-fifo && ratpoison -c barsend -definekey top s-9 exec rpws 9 && printf "D9\nIxlear\n" > /tmp/panel-fifo && ratpoison -c barsend -definekey top s-0 exec rpws 10 && printf "D10\nIclear\n" > /tmp/panel-fifo & xset -led named "Scroll Lock" & ratpoison -c barsend +definekey top F1 exec rpws 1 && echo "D1" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top F2 exec rpws 2 && echo "D2" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top F3 exec rpws 3 && echo "D3" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top F4 exec rpws 4 && echo "D4" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top F5 exec rpws 5 && echo "D5" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top F6 exec rpws 6 && echo "D6" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top F7 exec rpws 7 && echo "D7" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top F8 exec rpws 8 && echo "D8" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top F9 exec rpws 9 && printf "D9\nIxlear\n" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top F10 exec rpws 10 && printf "D10\nIclear\n" > /tmp/panel-fifo & xset -led named "Scroll Lock" & ratpoison -c barsend && ratpoison -c bordscript +definekey top F11 exec rpws 11 && echo "D11" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top F12 exec rpws 12 && echo "D12" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript + +definekey top s-1 exec rpws 1 && echo "D1" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top s-2 exec rpws 2 && echo "D2" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top s-3 exec rpws 3 && echo "D3" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top s-4 exec rpws 4 && echo "D4" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top s-5 exec rpws 5 && echo "D5" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top s-6 exec rpws 6 && echo "D6" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top s-7 exec rpws 7 && echo "D7" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top s-8 exec rpws 8 && echo "D8" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top s-9 exec rpws 9 && printf "D9\nIxlear\n" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript +definekey top s-0 exec rpws 10 && printf "D10\nIclear\n" > /tmp/panel-fifo & xset -led named "Scroll Lock" & ratpoison -c barsend && ratpoison -c bordscript @@ -206,7 +206,7 @@ alias paneltoggle exec ~/.config/ratpoison/paneltoggle -#addhook key bordscript +addhook key bordscript definekey top s-b bordtoggle definekey top s-p paneltoggle diff --git a/Xinit/xinitrc b/Xinit/xinitrc index faeb5d1..180fa23 100755 --- a/Xinit/xinitrc +++ b/Xinit/xinitrc @@ -57,6 +57,7 @@ sudo /usr/bin/brightchown setxkbmap us -variant vaskozl xcape -t 300 -e 'Shift_L=parenleft;Shift_R=parenright;Hyper_L=Shift_L|exclam;Hyper_R=Shift_L|question' & xset r 64 +xset r 133 xset r rate 170 60 xset m 0 0 xset -b @@ -205,7 +206,7 @@ fi # window 1: music if [ $run_everything = true -o $run_workspace = 2 ]; then $workspace 12 - mpd & + mopidy & $xtoolwait $term ncmpcpp fi -- cgit v1.2.3-54-g00ecf