diff options
| author | vaskozl <vasil.zlatanov@gmail.com> | 2014-12-20 16:05:30 +0100 |
|---|---|---|
| committer | vaskozl <vasil.zlatanov@gmail.com> | 2014-12-20 16:05:30 +0100 |
| commit | 97e8967c83ca1125377d27bdcf593617ccdadb03 (patch) | |
| tree | 064d93d91778513b0b647474d95cacc4b0bdcaa6 | |
| parent | b66fa907412263f24f333b53544fff3585c99196 (diff) | |
| parent | 081bc0a359c029e883d28cb3a5003e74805bf68e (diff) | |
| download | dotfiles-97e8967c83ca1125377d27bdcf593617ccdadb03.tar.gz dotfiles-97e8967c83ca1125377d27bdcf593617ccdadb03.tar.bz2 dotfiles-97e8967c83ca1125377d27bdcf593617ccdadb03.zip | |
Merge branch 'master' of github.com:Vaskozl/dotfiles
| -rw-r--r-- | pentadactylrc | 2 | ||||
| -rw-r--r-- | ratpoison/ratpoisonrc.conf | 2 | ||||
| -rw-r--r-- | vimperatorrc | 7 | ||||
| -rwxr-xr-x | xinitrc | 11 |
4 files changed, 10 insertions, 12 deletions
diff --git a/pentadactylrc b/pentadactylrc index 50e55cc..9c1e688 100644 --- a/pentadactylrc +++ b/pentadactylrc @@ -118,7 +118,7 @@ map -count -modes=n,v d -builtin <count>d map -count -modes=n,v e -builtin <count><C-u> map -count -modes=n,v u -builtin <count>u map -count -modes=n,v x -builtin <count>d -map -count -modes=n,v w <count>owikipedia<Space> +map -count -modes=n,v w <count>owikilocal<Space> map -count -modes=n,v ( <count>H map -count -modes=n,v ) <count>L set autocomplete= diff --git a/ratpoison/ratpoisonrc.conf b/ratpoison/ratpoisonrc.conf index 45cc7ed..9d9ecd8 100644 --- a/ratpoison/ratpoisonrc.conf +++ b/ratpoison/ratpoisonrc.conf @@ -202,7 +202,7 @@ alias paneltoggle exec ~/.ratpoison/paneltoggle -addhook key bordscript +#addhook key bordscript definekey top s-b bordtoggle definekey top s-p paneltoggle diff --git a/vimperatorrc b/vimperatorrc index de65a53..5d93fc0 100644 --- a/vimperatorrc +++ b/vimperatorrc @@ -43,11 +43,14 @@ nnoremap l gt nnoremap h gT nnoremap s <C-d> nnoremap e <C-u> -nnoremap w :open<Space>wikipedia<Space> +nnoremap w :open<Space>wikilocal<Space> +nnoremap W :open<Space>wikipedia<Space> nnoremap x d nnoremap ( H nnoremap ) L +nnoremap gi gi<End> set focuscontent +set gui=nonavigation source! /home/vasko/.vimperatorrc.local -" vim: set ft=vimperator:
\ No newline at end of file +" vim: set ft=vimperator: @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +!/usr/bin/env bash # Inspiration: # http://www.desertsol.com/~kevin/ratpoison/ ratpoison_dir=$HOME/.ratpoison @@ -39,16 +39,11 @@ nitrogen --restore setxkbmap us -variant colemak 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 rate 200 30 +xset r rate 180 40 xset m 0 0 -#Mount some stuff -pmount sda1 & -pmount sda5 & -pmount sda6 & - # Launch locking program -#xautolock -detectsleep -locker i3lock -time 11 -corners 0-00 & +xautolock -detectsleep -locker 'i3lock -i ~/Pictures/1440.png' -time 11 -corners 0-00 & # Load xterm colors xrdb -merge ~/.Xresources |