Merge branch 'master' of https://github.com/vaskozl/dotfiles

12 files changed, 153 insertions, 145 deletions

diff --git a/Browser/vimb/config b/Browser/vimb/config
index 4955cb1..8c143d2 100644
--- a/Browser/vimb/config
+++ b/Browser/vimb/config
@@ -35,11 +35,11 @@ nmap ) <C-N>
 nmap S :set scripts=false<CR> r :shellcmd mpv --no-terminal "%s"<CR> :set scripts=true<CR>
 
 
-set status-color-bg=#201405
-set status-color-fg=#b3d184
-set status-ssl-color-bg=#201405
-set status-ssl-color-fg=#b3d184
-set completion-bg-active=#201405
-set completion-bg-normal=#201405
-set completion-fg-active=#6faf63
-set completion-fg-normal=#b3d184
+set status-color-bg=#202009
+set status-color-fg=#cd7849
+set status-ssl-color-bg=#202009
+set status-ssl-color-fg=#cd7849
+set completion-bg-active=#202009
+set completion-bg-normal=#202009
+set completion-fg-active=#a0764d
+set completion-fg-normal=#cd7849
diff --git a/Editor/vimrc b/Editor/vimrc
index 0a080a0..7aef0da 100644
--- a/Editor/vimrc
+++ b/Editor/vimrc
@@ -49,7 +49,7 @@ set incsearch		" Incremental search
 "set hidden             " Hide buffers when they are abandoned
 "set mouse=a		" Enable mouse usage (all modes)
 
-"set number
+set number
 "set spell
 set ruler
 
@@ -153,3 +153,7 @@ nnoremap <Leader>w :w<CR>
  let g:ycm_goto_buffer_command = 'same-buffer' "[ 'same-buffer', 'horizontal-split', 'vertical-split', 'new-tab' ]
  let g:ycm_filetype_whitelist = { '*': 1 }
  let g:ycm_key_invoke_completion = '<C-Space>'
+
+"relative number in normal but just number in insert
+autocmd InsertEnter * :set norelativenumber
+autocmd InsertLeave * :set relativenumber
diff --git a/Mail/mutt/mailcap b/Mail/mutt/mailcap
index 136a03f..2ff7cf2 100644
--- a/Mail/mutt/mailcap
+++ b/Mail/mutt/mailcap
@@ -1,2 +1,3 @@
 application/*; mkdir -p /tmp/mutt \; cp %s /tmp/mutt \; rifle /tmp/mutt/$(basename %s) &
+text/html; vimb '%s' &; test=test -n "$DISPLAY"; needsterminal;
 text/html; w3m -I %{charset} -T text/html; copiousoutput;
diff --git a/Mail/muttrc b/Mail/muttrc
index 514b1be..840e70e 100644
--- a/Mail/muttrc
+++ b/Mail/muttrc
@@ -65,7 +65,7 @@ ignore "Authentication-Results:"
 ignore "DomainKey-Signature:"
 ignore "DKIM-Signature:"
 hdr_order Date From To Cc
-alternative_order text/plain text/html *
+alternative_order text/plain text/enriched text/html *
 auto_view text/html
 
 # Hide crap
diff --git a/README.md b/README.md
index ecf22a2..f0ec5b3 100644
--- a/README.md
+++ b/README.md
@@ -10,13 +10,9 @@ File_Manager: ranger
 News_Aggregator: newsbeuter
 Shell: zsh
 ```
-![alt tag](https://skozl.com/2p2g)
-![alt tag](https://skozl.com/nxVg)
-![alt tag](https://skozl.com/xJPg)
-![alt tag](https://skozl.com/98mg)
-![alt tag](https://skozl.com/c22g)
-![alt tag](https://skozl.com/Prtg)
-![alt tag](https://skozl.com/oXqg)
-![alt tag](https://skozl.com/TnVg)
-![alt tag](https://skozl.com/XMfg)
-![alt tag](https://skozl.com/xQWg)
+![alt tag](https://skozl.com/scrot0.png)
+![alt tag](https://skozl.com/scrot1.png)
+![alt tag](https://skozl.com/scrot2.png)
+![alt tag](https://skozl.com/scrot3.png)
+![alt tag](https://skozl.com/scrot4.png)
+![alt tag](https://skozl.com/scrot5.png)
diff --git a/Shell/bash_aliases b/Shell/bash_aliases
index a284d4d..d9612b7 100644
--- a/Shell/bash_aliases
+++ b/Shell/bash_aliases
@@ -46,7 +46,7 @@ alias py='python3'
 alias scan='iwlist wlp2s0 scan'
 alias connect='sudo iwconfig wlan0 essid'
 alias home='cd /home/vasko'
-alias l='ls -F'
+alias l='ls'
 alias d='ls'
 alias dm='ls | more'
 alias e='cd'
diff --git a/Shell/bashrc b/Shell/bashrc
index abe85a8..2cf29d4 100644
--- a/Shell/bashrc
+++ b/Shell/bashrc
@@ -73,21 +73,21 @@ xterm*|rxvt*)
 esac
 
 # enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    alias dir='dir --color=auto'
-    alias vdir='vdir --color=auto'
-
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
+#if [ -x /usr/bin/dircolors ]; then
+#    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+#    alias ls='ls --color=auto'
+#    alias dir='dir --color=auto'
+#    alias vdir='vdir --color=auto'
+#
+#    alias grep='grep --color=auto'
+#    alias fgrep='fgrep --color=auto'
+#    alias egrep='egrep --color=auto'
+#fi
+#
+## some more ls aliases
+#alias ll='ls -alF'
+#alias la='ls -A'
+#alias l='ls -CF'
 
 # Add an "alert" alias for long running commands.  Use like so:
 #   sleep 10; alert
diff --git a/Shell/zshrc b/Shell/zshrc
index 36ee6ac..3e4b71d 100644
--- a/Shell/zshrc
+++ b/Shell/zshrc
@@ -54,6 +54,8 @@ if [ -x /usr/bin/dircolors ]; then
       alias egrep='egrep --color=auto'
 fi
 
+export ANDROID_HOME=/opt/android-sdk
+
 
 ~/bin/sysinfo
 
diff --git a/Window_Manager/ratpoison/ratpoisonrc.clipboard b/Window_Manager/ratpoison/ratpoisonrc.clipboard
index dbdcef1..fb4e791 100644
--- a/Window_Manager/ratpoison/ratpoisonrc.clipboard
+++ b/Window_Manager/ratpoison/ratpoisonrc.clipboard
@@ -33,7 +33,7 @@ definekey clipboard_set C exec ~/.config/ratpoison/clipboard init
 definekey clipboard_paste a exec ~/.config/ratpoison/clipboard pop
 definekey clipboard_set a exec ~/.config/ratpoison/clipboard push
 # pop queue
-definekey clipboard_paste q exec ~/.config/ratpoison/clipboard pop_queue
+definekey clipboard_paste A exec ~/.config/ratpoison/clipboard pop_queue
 
 definekey clipboard_paste 1 exec ~/.config/ratpoison/clipboard paste 1
 definekey clipboard_paste 2 exec ~/.config/ratpoison/clipboard paste 2
diff --git a/Window_Manager/ratpoison/ratpoisonrc.conf b/Window_Manager/ratpoison/ratpoisonrc.conf
index 2cc873e..535bb14 100644
--- a/Window_Manager/ratpoison/ratpoisonrc.conf
+++ b/Window_Manager/ratpoison/ratpoisonrc.conf
@@ -1,3 +1,4 @@
+#using jcs hacks
 # info: C=control, M=meta/alt, s=super, S=shift, H = Hyper
 # xnest for testing
 escape grave
@@ -50,6 +51,8 @@ showpanel
 
 alias showborder set border 2
 alias hideborder set border 0
+
+set gap 1
 showborder
 #bordscript
 
@@ -98,18 +101,16 @@ definekey top F10 exec ratpoison -c 'vselect 10' && printf "D10\nIclear\n" > /tm
 definekey top F11 exec ratpoison -c 'vselect 11' && echo "D11" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
 definekey top F12 exec ratpoison -c 'vselect 12' && echo "D12" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
 
-definekey top s-1 exec ratpoison -c 'vselect 1' && echo "D1" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
-definekey top s-2 exec ratpoison -c 'vselect 2' && echo "D2" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
-definekey top s-3 exec ratpoison -c 'vselect 3' && echo "D3" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
-definekey top s-4 exec ratpoison -c 'vselect 4' && echo "D4" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
-definekey top s-5 exec ratpoison -c 'vselect 5' && echo "D5" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
-definekey top s-6 exec ratpoison -c 'vselect 6' && echo "D6" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
-definekey top s-7 exec ratpoison -c 'vselect 7' && echo "D7" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
-definekey top s-8 exec ratpoison -c 'vselect 8' && echo "D8" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
-definekey top s-9 exec ratpoison -c 'vselect 9' && printf "D9\nIxlear\n" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
-definekey top s-0 exec ratpoison -c 'vselect 10' && printf "D10\nIclear\n" > /tmp/panel-fifo & xset -led named "Scroll Lock" & ratpoison -c barsend && ratpoison -c bordscript
-
-
+definekey top s-1 exec ratpoison -c 'vselect 1'  && echo "D1" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
+definekey top s-2 exec ratpoison -c 'vselect 2'  && echo "D2" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
+definekey top s-3 exec ratpoison -c 'vselect 3'  && echo "D3" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
+definekey top s-4 exec ratpoison -c 'vselect 4'  && echo "D4" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
+definekey top s-5 exec ratpoison -c 'vselect 5'  && echo "D5" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
+definekey top s-6 exec ratpoison -c 'vselect 6'  && echo "D6" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
+definekey top s-7 exec ratpoison -c 'vselect 7'  && echo "D7" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
+definekey top s-8 exec ratpoison -c 'vselect 8'  && echo "D8" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
+definekey top s-9 exec ratpoison -c 'vselect 9'  && printf "D9\nIxlear\n" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript
+definekey top s-0 exec ratpoison -c 'vselect 10' && printf "D10\nIclear\n" > /tmp/panel-fifo && ratpoison -c barsend && ratpoison -c bordscript & xset -led named "Scroll Lock" 
 
 definekey top M-F1 exec ratpoison -c 'vmove 1' && echo "D1" > /tmp/panel-fifo && ratpoison -c barsend
 definekey top M-F2 exec ratpoison -c 'vmove 2' && echo "D2" > /tmp/panel-fifo && ratpoison -c barsend
@@ -132,7 +133,7 @@ definekey top M-s-5 exec ratpoison -c 'vmove 5' && echo "D5" > /tmp/panel-fifo &
 definekey top M-s-6 exec ratpoison -c 'vmove 6' && echo "D6" > /tmp/panel-fifo && ratpoison -c barsend
 definekey top M-s-7 exec ratpoison -c 'vmove 7' && echo "D7" > /tmp/panel-fifo && ratpoison -c barsend
 definekey top M-s-8 exec ratpoison -c 'vmove 8' && echo "D8" > /tmp/panel-fifo && ratpoison -c barsend
-definekey top M-s-9 exec ratpoison -c 'vmove 9' printf "D9\nIxlear\n" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top M-s-9 exec ratpoison -c 'vmove 9' && printf "D9\nIxlear\n" > /tmp/panel-fifo && ratpoison -c barsend
 definekey top M-s-0 exec ratpoison -c 'vmove 10' && printf "D10\nIclear\n" > /tmp/panel-fifo & xset -led named "Scroll Lock" && ratpoison -c barsend
 
 definekey top S-F1 exec ratpoison -c 'vselect 13' && echo "D13" > /tmp/panel-fifo && ratpoison -c barsend
@@ -155,8 +156,8 @@ definekey top S-M-F1 exec ratpoison -c 'vmove 13' && echo "D13" > /tmp/panel-fif
 
 
 
-definekey top S-F12 exec ratpoison -c 'vselect 1'3
-definekey top M-S-F12 'vmove 1'3
+definekey top S-F12 exec ratpoison -c 'vselect 13'
+definekey top M-S-F12 'vmove 13'
 
 
 #-------------------------------------------------------------
diff --git a/Window_Manager/ratpoisonrc b/Window_Manager/ratpoisonrc
index d6b6fdf..0005637 100644
--- a/Window_Manager/ratpoisonrc
+++ b/Window_Manager/ratpoisonrc
@@ -1,5 +1,6 @@
-set virtuals 13
+set virtuals 24
 vinit
-alias config source /home/vsz/.tools/ratpoisonrc.conf
+chdir
+alias config source dotfiles/Windows_Manager/ratpoison/ratpoisonrc.conf
 config
 bind C-r config
diff --git a/Xinit/xinitrc b/Xinit/xinitrc
index 08564d0..5316587 100755
--- a/Xinit/xinitrc
+++ b/Xinit/xinitrc
@@ -23,6 +23,9 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
   unset f
 fi
 
+#get wifi
+sudo safeconnect
+
 # Autodisable rodent
 #sudo modprobe -r bcm5974
 
@@ -57,7 +60,7 @@ sudo /usr/bin/brightchown
 ~/.custom
 
 #Keyboard Bindings
-setxkbmap us -variant vaskozl
+setxkbmap uc -variant colemak
 #xcape -t 300 -e 'Shift_L=parenleft;Shift_R=parenright;Hyper_L=Shift_L|exclam;Hyper_R=Shift_L|question' &
 xcape -t 300 -e 'Shift_L=parenleft;Shift_R=parenright;' &
 xset r 64
@@ -133,102 +136,102 @@ fi
 #fi
 
 
-# workspace 1 : Ranger workspace
-#     window 1+: Ranger
-if [ $run_everything = true -o $run_workspace = 1 ]; then
-    $workspace 1
-    $xtoolwait $term  ranger 
-fi
-
-# workspace 2 is at the end (pentadactyl) slowing down
-
-# workspace 3 : newsbeuter
-if [ $run_everything = true -o $run_workspace = 3 ]; then
-    $workspace 3
-    $xtoolwait $term newsbeuter
-fi
-
-# workspace 4 : admin workspace
-#     window 1: screen (see screenrc.admin for the screen config)
-if [ $run_everything = true -o $run_workspace = 4 ]; then
-    $workspace 4
-#    $xtoolwait $term $screen_run admin
-fi
-
-# workspace 5 : School
-#     windows 1: screen notebok
-if [ $run_everything = true -o $run_workspace = 5 ]; then
-    $workspace 5
-    cd $HOME/Sync/notes
-#    $xtoolwait $term $screen_run school
-fi
+## workspace 1 : Ranger workspace
+##     window 1+: Ranger
+#if [ $run_everything = true -o $run_workspace = 1 ]; then
+#    $workspace 1
+#    $xtoolwait $term  ranger 
+#fi
+#
+## workspace 2 is at the end (pentadactyl) slowing down
+#
+## workspace 3 : newsbeuter
+#if [ $run_everything = true -o $run_workspace = 3 ]; then
+#    $workspace 3
+#    $xtoolwait $term newsbeuter
+#fi
+#
+## workspace 4 : admin workspace
+##     window 1: screen (see screenrc.admin for the screen config)
+#if [ $run_everything = true -o $run_workspace = 4 ]; then
+#    $workspace 4
+##    $xtoolwait $term $screen_run admin
+#fi
 #
-## workspace 7 : kde workspace (VNC session)
+## workspace 5 : School
+##     windows 1: screen notebok
+#if [ $run_everything = true -o $run_workspace = 5 ]; then
+#    $workspace 5
+#    cd $HOME/Sync/notes
+##    $xtoolwait $term $screen_run school
+#fi
+##
+### workspace 7 : kde workspace (VNC session)
+##if [ $run_everything = true -o $run_workspace = 7 ]; then
+##    $workspace ^7
+##    $xtoolwait vncviewer nerd:1
+##    number_and_title 0 "kde"
+##fi
+#
+## workspace 7 : skype workspace 
 #if [ $run_everything = true -o $run_workspace = 7 ]; then
-#    $workspace ^7
-#    $xtoolwait vncviewer nerd:1
-#    number_and_title 0 "kde"
+#    $workspace 7
+##    skype &
+##    number_and_title 0 "skype"
+#    sleep 6
 #fi
-
-# workspace 7 : skype workspace 
-if [ $run_everything = true -o $run_workspace = 7 ]; then
-    $workspace 7
-#    skype &
-#    number_and_title 0 "skype"
-    sleep 6
-fi
-
 #
-## workspace 8 : windows workspace (VMware session)
-#if [ $run_everything = true -o $run_workspace = 8 ]; then
-#    $workspace ^8
-#    #$xtoolwait gnomesu -c /stor/vmware/bin/vmware
-#    #number_and_title 0 "windows xp"
+##
+### workspace 8 : windows workspace (VMware session)
+##if [ $run_everything = true -o $run_workspace = 8 ]; then
+##    $workspace ^8
+##    #$xtoolwait gnomesu -c /stor/vmware/bin/vmware
+##    #number_and_title 0 "windows xp"
+##fi
+##
+#
+## workspace 9 : email workspace
+##     window 1: mutt 
+#if [ $run_everything = true -o $run_workspace = 2 ]; then
+#    $workspace 8
+#    $xtoolwait $term mutt
 #fi
 #
-
-# workspace 9 : email workspace
-#     window 1: mutt 
-if [ $run_everything = true -o $run_workspace = 2 ]; then
-    $workspace 8
-    $xtoolwait $term mutt
-fi
-
-# workspace 10 : irc workspace
-#     window 1: irc 
-if [ $run_everything = true -o $run_workspace = 2 ]; then
-    $workspace 10
-    $xtoolwait $term vps
-#    $xtoolwait $term irssi
-fi
-
-# workspace 11 : wifi workspace
-#     window 1: wicd 
-if [ $run_everything = true -o $run_workspace = 2 ]; then
-    $workspace 11
-    $xtoolwait $term sudo /usr/bin/safeconnect
-fi
-
-# workspace 12 : music workspace
-#     window 1: music 
-if [ $run_everything = true -o $run_workspace = 2 ]; then
-    $workspace 12
-    mopidy &
-    $xtoolwait $term ncmpcpp
-fi
-
-# workspace 13 : volume workspace
-#     window 1: volume 
-if [ $run_everything = true -o $run_workspace = 2 ]; then
-    $workspace 13
-    $xtoolwait $term alsamixer
-fi
-
-# workspace 2 : Vimb workspace
-if [ $run_everything = true -o $run_workspace = 2 ]; then
-    $workspace 2
-    vimb &
-fi
+## workspace 10 : irc workspace
+##     window 1: irc 
+#if [ $run_everything = true -o $run_workspace = 2 ]; then
+#    $workspace 10
+#    $xtoolwait $term vps
+##    $xtoolwait $term irssi
+#fi
+#
+## workspace 11 : wifi workspace
+##     window 1: wicd 
+#if [ $run_everything = true -o $run_workspace = 2 ]; then
+#    $workspace 11
+#    $xtoolwait $term sudo /usr/bin/safeconnect
+#fi
+#
+## workspace 12 : music workspace
+##     window 1: music 
+#if [ $run_everything = true -o $run_workspace = 2 ]; then
+#    $workspace 12
+#    mopidy &
+#    $xtoolwait $term ncmpcpp
+#fi
+#
+## workspace 13 : volume workspace
+##     window 1: volume 
+##if [ $run_everything = true -o $run_workspace = 2 ]; then
+##    $workspace 13
+##    $xtoolwait $term alsamixer
+##fi
+#
+## workspace 2 : Vimb workspace
+#if [ $run_everything = true -o $run_workspace = 2 ]; then
+#    $workspace 2
+#    vimb &
+#fi
 
 # Default workspace: 1(ranger)
 #	$workspace ^1