Merge branch 'master' into jenipapo

This commit is contained in:
Thomas Ruoff
2017-01-31 21:56:57 +01:00
3 changed files with 19 additions and 14 deletions

View File

@@ -45,10 +45,6 @@ URxvt*boldItalicFont: xft:DejaVu Sans Mono:style=Book:size=10, \
xft:Droid Sans Japanese:style=Regular, \ xft:Droid Sans Japanese:style=Regular, \
xft:unifont:style=Medium xft:unifont:style=Medium
! Font size ! Font size
URxvt*keysym.C-Up: perl:font-size:increase
URxvt*keysym.C-Down: perl:font-size:decrease
URxvt*keysym.C-S-Up: perl:font-size:incglobal
URxvt*keysym.C-S-Down: perl:font-size:decglobal
! Scrollbar ! Scrollbar
URxvt*scrollStyle: rxvt URxvt*scrollStyle: rxvt
@@ -56,9 +52,18 @@ URxvt*scrollBar: true
URxvt*scrollBar_right: true URxvt*scrollBar_right: true
! Perl extensions ! Perl extensions
URxvt*perl-ext-common: default,matcher,font-size URxvt.perl-ext-common: default,selection-to-clipboard,url-select,keyboard-select,matcher,font-size
URxvt*url-launcher: xdg-open URxvt.url-select.launcher: xdg-open
URxvt*matcher.button: 1 URxvt.url-select.underline: true
URxvt.matcher.button: 1
URxvt.keysym.M-u: perl:url-select:select_next
URxvt.keysym.M-Escape: perl:keyboard-select:activate
URxvt.keysym.M-s: perl:keyboard-select:search
URxvt.keysym.C-Up: perl:font-size:increase
URxvt.keysym.C-Down: perl:font-size:decrease
URxvt.keysym.C-S-Up: perl:font-size:incglobal
URxvt.keysym.C-S-Down: perl:font-size:decglobal
! Cursor ! Cursor
URxvt*cursorBlink: true URxvt*cursorBlink: true

9
vimrc
View File

@@ -64,7 +64,7 @@ set hidden
set ttyfast set ttyfast
set synmaxcol=512 " Limit syntax highlighting to 512 characters per line set synmaxcol=512 " Limit syntax highlighting to 512 characters per line
set modeline " Use file-specific settings, if available. set modeline " Use file-specific settings, if available.
set nobackup set nobackup " Make backup files.
set noswapfile set noswapfile
set mouse=a " Mouse support everywhere. set mouse=a " Mouse support everywhere.
set mousehide " Auto-hide cursor while typing. set mousehide " Auto-hide cursor while typing.
@@ -89,12 +89,7 @@ let g:netrw_liststyle=3 " Use tree style directory listing.
set background=dark set background=dark
set path+=** set path+=**
" Writes to the unnamed register also writes to the * and + registers. This set clipboard^=unnamedplus
" makes it easy to interact with the system clipboard
set clipboard^=unnamed
if has ('unnamedplus')
set clipboard^=unnamedplus
endif
" }}} " }}}

View File

@@ -20,6 +20,11 @@ xrdb $HOME/.Xresources
xset +fp /usr/share/fonts/local xset +fp /usr/share/fonts/local
xset fp rehash xset fp rehash
# sync primary and secondary clipboard
autocutsel -fork &
autocutsel -selection PRIMARY -fork &
echo $1 > ~/.xinitrc-arg echo $1 > ~/.xinitrc-arg
case $1 in case $1 in