diff --git a/.Xdefaults b/.Xdefaults index ea682c7..93a5aaa 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -3,7 +3,7 @@ URxvt*scrollBar: false URxvt*background: rgba:0000/0000/0000/eeee URxvt*foreground: #dddddd URxvt*transparent: true -URxvt*shading: 15 +URxvt*shading: 30 URxvt*cursorColor: green !URxvt*font: xft:Terminus:pixelsize=11,xft:IPAGothic:antialias=true URxvt*font: 6x13,xft:IPAGothic:antialias=true diff --git a/.vim/colors/inkpot.vim b/.vim/colors/inkpot.vim index a062248..341bd51 100644 --- a/.vim/colors/inkpot.vim +++ b/.vim/colors/inkpot.vim @@ -1,6 +1,8 @@ " Vim color file " Name: inkpot.vim -" Maintainer: Ciaran McCreesh +" Maintainer: Ciaran McCreesh +" Homepage: http://github.com/ciaranm/inkpot/ +" " This should work in the GUI, rxvt-unicode (88 colour mode) and xterm (256 " colour mode). It won't work in 8/16 colour terminals. " @@ -51,6 +53,8 @@ if has("gui_running") hi Normal gui=NONE guifg=#cfbfad guibg=#000000 endif + hi CursorLine guibg=#2e2e37 + hi IncSearch gui=BOLD guifg=#303030 guibg=#cd8b60 hi Search gui=NONE guifg=#303030 guibg=#cd8b60 hi ErrorMsg gui=BOLD guifg=#ffffff guibg=#ce4e4e @@ -134,11 +138,11 @@ if has("gui_running") hi SpellLocal gui=undercurl guisp=#cccc66 hi SpellCap gui=undercurl guisp=#66cccc - hi MatchParen gui=NONE guifg=#404040 guibg=#8fff8b + hi MatchParen gui=NONE guifg=#cfbfad guibg=#4e4e8f endif else if ! g:inkpot_black_background - exec "hi Normal cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(80) + "exec "hi Normal cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(80) else exec "hi Normal cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(16) endif diff --git a/.vim/filetype.vim b/.vim/filetype.vim index cb3fd62..37f11f3 100644 --- a/.vim/filetype.vim +++ b/.vim/filetype.vim @@ -10,5 +10,6 @@ augroup filetypedetect "au! BufNewFile,BufRead *.rhtml setfiletype rhtml au! BufNewFile,BufRead *.rhtml setfiletype eruby au! BufNewFile,BufRead *.s setfiletype asmx86 + au! BufRead,BufNewFile *.ijs,*.ijt,*.ijp,*.ijx setfiletype j augroup END diff --git a/.zshrc b/.zshrc index 92f5022..6187afb 100644 --- a/.zshrc +++ b/.zshrc @@ -142,11 +142,15 @@ alias -s mkv="mplayer" # Functions args() { echo $#; } title() { WINTITLE="$*"; print -Pn "\e]0;$WINTITLE\a" } -if [ x$WINDOW != x ]; then - # Running under screen(1) - precmd() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [W$WINDOW] [%~]\a" || : } - preexec() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [W$WINDOW] [$1]\a" || : } -else +#if [ x$WINDOW != x ]; then +# # Running under screen(1) +# precmd() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [W$WINDOW] [%~]\a" || : } +# preexec() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [W$WINDOW] [$1]\a" || : } +#else +# precmd() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [%~]\a" || : } +# preexec() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [$1]\a" || : } +#fi +if [ x$DISPLAY != x ]; then precmd() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [%~]\a" || : } preexec() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [$1]\a" || : } fi