fix font, italics + terminfo, update bundles etc.

main
Steffen Rademacker 8 years ago
parent d3d30959bb
commit 38a5a32c85

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -32,6 +32,9 @@ git clone https://github.com/Shougo/neobundle.vim ~/.vim/bundle/neobundle.vim
brew cask install forklift
brew cask install iterm2
# add a nice font
brew cask install caskroom/fonts/font-hack
# set zsh to the default
sudo vim /etc/shells
chsh -s /usr/local/bin/zsh
@ -61,8 +64,7 @@ ln -s ~/dotfiles/zshrc ~/.zshrc
# set xterm/screen terminals to enable italic fonts in terminal
ln -s ~/dotfiles/zsh/pure/pure.zsh /usr/local/share/zsh/site-functions/prompt_pure_setup
tic ~/dotfiles/terminfo/screen-256color-italic.terminfo
tic ~/dotfiles/terminfo/xterm-256color-italic.terminfo
tic ~/dotfiles/terminfo/xterm-256color.terminfo
# set iterm terminal to xterm-256color-italic and enable italics!
# set iterm terminal to xterm-256color and enable italics!
# now restart your terminal/iterm2 and hope for the best

@ -652,13 +652,15 @@
<key>NSWindow Frame NSFontPanel</key>
<string>831 374 445 270 0 0 1280 778 </string>
<key>NSWindow Frame Preferences</key>
<string>324 130 924 485 0 0 1280 778 </string>
<string>906 254 924 485 0 0 1920 1058 </string>
<key>NSWindow Frame iTerm Window 0</key>
<string>3 102 1130 656 0 0 1280 778 </string>
<string>0 444 1130 614 0 0 1920 1058 </string>
<key>NSWindow Frame iTerm Window 1</key>
<string>94 42 1130 656 0 0 1280 778 </string>
<string>1920 402 1130 656 1920 0 1920 1058 </string>
<key>NSWindow Frame iTerm Window 2</key>
<string>769 89 1130 656 0 0 1920 1058 </string>
<string>2689 89 1130 656 1920 0 1920 1058 </string>
<key>NSWindow Frame iTerm Window 3</key>
<string>2173 142 1123 641 1920 0 1920 1080 </string>
<key>New Bookmarks</key>
<array>
<dict>
@ -1208,11 +1210,11 @@
<key>Name</key>
<string>Default</string>
<key>Non Ascii Font</key>
<string>Hack 12</string>
<string>Hack-Regular 12</string>
<key>Non-ASCII Anti Aliased</key>
<true/>
<key>Normal Font</key>
<string>Hack 12</string>
<string>Hack-Regular 12</string>
<key>Option Key Sends</key>
<integer>0</integer>
<key>Prompt Before Closing 2</key>
@ -1362,7 +1364,7 @@
<key>Tags</key>
<array/>
<key>Terminal Type</key>
<string>xterm-256color-italic</string>
<string>xterm-256color</string>
<key>Transparency</key>
<real>0.0</real>
<key>Triggers</key>
@ -1378,7 +1380,7 @@
<key>Use Italic Font</key>
<true/>
<key>Vertical Spacing</key>
<real>0.84471338987350464</real>
<real>0.99974924325942993</real>
<key>Visual Bell</key>
<false/>
<key>Window Type</key>
@ -2117,7 +2119,7 @@
<key>NoSyncTimeOfLastPromo</key>
<real>453214263.015971</real>
<key>NoSyncTimeOfLastPromoDownload</key>
<real>470933011.22990698</real>
<real>477408799.95078999</real>
<key>OnlyWhenMoreTabs</key>
<false/>
<key>OpenArrangementAtStartup</key>
@ -2184,7 +2186,7 @@
<key>SUHasLaunchedBefore</key>
<true/>
<key>SULastCheckTime</key>
<date>2015-12-04T14:03:45Z</date>
<date>2016-02-17T13:04:07Z</date>
<key>SavePasteHistory</key>
<false/>
<key>Show Toolbelt</key>

@ -1,4 +0,0 @@
# A screen-256color based TERMINFO that adds the escape sequences for italic.
screen-256color-italic|screen with 256 colors and italic,
sitm=\E[3m, ritm=\E[23m,
use=screen-256color,

@ -1,4 +0,0 @@
# A xterm-256color based TERMINFO that adds the escape sequences for italic.
xterm-256color-italic|xterm with 256 colors and italic,
sitm=\E[3m, ritm=\E[23m,
use=xterm-256color,

@ -0,0 +1,186 @@
# Reconstructed via infocmp from file: /usr/share/terminfo/78/xterm-256color
xterm-256color|xterm with 256 colors,
am,
bce,
ccc,
km,
mc5i,
mir,
msgr,
npc,
xenl,
colors#256,
cols#80,
it#8,
lines#24,
pairs#32767,
acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
bel=^G,
blink=\E[5m,
bold=\E[1m,
cbt=\E[Z,
civis=\E[?25l,
clear=\E[H\E[2J,
cnorm=\E[?12l\E[?25h,
cr=^M,
csr=\E[%i%p1%d;%p2%dr,
cub=\E[%p1%dD,
cub1=^H,
cud=\E[%p1%dB,
cud1=^J,
cuf=\E[%p1%dC,
cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH,
cuu=\E[%p1%dA,
cuu1=\E[A,
cvvis=\E[?12;25h,
dch=\E[%p1%dP,
dch1=\E[P,
dl=\E[%p1%dM,
dl1=\E[M,
ech=\E[%p1%dX,
ed=\E[J,
el=\E[K,
el1=\E[1K,
flash=\E[?5h$<100/>\E[?5l,
home=\E[H,
hpa=\E[%i%p1%dG,
ht=^I,
hts=\EH,
ich=\E[%p1%d@,
il=\E[%p1%dL,
il1=\E[L,
ind=^J,
indn=\E[%p1%dS,
initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
invis=\E[8m,
is2=\E[!p\E[?3;4l\E[4l\E>,
kDC=\E[3;2~,
kEND=\E[1;2F,
kHOM=\E[1;2H,
kIC=\E[2;2~,
kLFT=\E[1;2D,
kNXT=\E[6;2~,
kPRV=\E[5;2~,
kRIT=\E[1;2C,
kb2=\EOE,
kbs=^H,
kcbt=\E[Z,
kcub1=\EOD,
kcud1=\EOB,
kcuf1=\EOC,
kcuu1=\EOA,
kdch1=\E[3~,
kend=\EOF,
kent=\EOM,
kf1=\EOP,
kf10=\E[21~,
kf11=\E[23~,
kf12=\E[24~,
kf13=\E[1;2P,
kf14=\E[1;2Q,
kf15=\E[1;2R,
kf16=\E[1;2S,
kf17=\E[15;2~,
kf18=\E[17;2~,
kf19=\E[18;2~,
kf2=\EOQ,
kf20=\E[19;2~,
kf21=\E[20;2~,
kf22=\E[21;2~,
kf23=\E[23;2~,
kf24=\E[24;2~,
kf25=\E[1;5P,
kf26=\E[1;5Q,
kf27=\E[1;5R,
kf28=\E[1;5S,
kf29=\E[15;5~,
kf3=\EOR,
kf30=\E[17;5~,
kf31=\E[18;5~,
kf32=\E[19;5~,
kf33=\E[20;5~,
kf34=\E[21;5~,
kf35=\E[23;5~,
kf36=\E[24;5~,
kf37=\E[1;6P,
kf38=\E[1;6Q,
kf39=\E[1;6R,
kf4=\EOS,
kf40=\E[1;6S,
kf41=\E[15;6~,
kf42=\E[17;6~,
kf43=\E[18;6~,
kf44=\E[19;6~,
kf45=\E[20;6~,
kf46=\E[21;6~,
kf47=\E[23;6~,
kf48=\E[24;6~,
kf49=\E[1;3P,
kf5=\E[15~,
kf50=\E[1;3Q,
kf51=\E[1;3R,
kf52=\E[1;3S,
kf53=\E[15;3~,
kf54=\E[17;3~,
kf55=\E[18;3~,
kf56=\E[19;3~,
kf57=\E[20;3~,
kf58=\E[21;3~,
kf59=\E[23;3~,
kf6=\E[17~,
kf60=\E[24;3~,
kf61=\E[1;4P,
kf62=\E[1;4Q,
kf63=\E[1;4R,
kf7=\E[18~,
kf8=\E[19~,
kf9=\E[20~,
khome=\EOH,
kich1=\E[2~,
kind=\E[1;2B,
kmous=\E[M,
knp=\E[6~,
kpp=\E[5~,
kri=\E[1;2A,
mc0=\E[i,
mc4=\E[4i,
mc5=\E[5i,
meml=\El,
memu=\Em,
op=\E[39;49m,
rc=\E8,
rev=\E[7m,
ri=\EM,
rin=\E[%p1%dT,
rmacs=\E(B,
rmam=\E[?7l,
rmcup=\E[?1049l,
rmir=\E[4l,
rmkx=\E[?1l\E>,
rmm=\E[?1034l,
rmso=\E[27m,
rmul=\E[24m,
rs1=\Ec,
rs2=\E[!p\E[?3;4l\E[4l\E>,
sc=\E7,
setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
sgr0=\E(B\E[m,
smacs=\E(0,
smam=\E[?7h,
smcup=\E[?1049h,
smir=\E[4h,
smkx=\E[?1h\E=,
smm=\E[?1034h,
smso=\E[7m,
smul=\E[4m,
tbc=\E[3g,
u6=\E[%i%d;%dR,
u7=\E[6n,
u8=\E[?1;2c,
u9=\E[c,
vpa=\E[%i%p1%dd,
sitm=\E[3m,
ritm=\E[23m,

@ -1,5 +1,5 @@
# Use a 256 color terminal
set -g default-terminal "screen-256color-italic"
set -g default-terminal "xterm-256color"
# zsh
set -g default-shell $SHELL
@ -58,6 +58,11 @@ bind -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
# Mouse support
set -g mouse-utf8 on
set -g mouse on
bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'select-pane -t=; copy-mode -e; send-keys -M'"
bind -n WheelDownPane select-pane -t= \; send-keys -M
bind -n C-WheelUpPane select-pane -t= \; copy-mode -e \; send-keys -M
bind -t vi-copy C-WheelUpPane halfpage-up
bind -t vi-copy C-WheelDownPane halfpage-down
# counting panes starts at 1
set -g base-index 1

@ -1,11 +1,29 @@
" All bundles, syntaxes and plugins
"======================================================================
"
NeoBundle 'Shougo/vimproc.vim', {
\ 'build': {
\ 'mac': 'make -f make_mac.mak',
\ 'linux': 'make',
\ 'unix': 'gmake'
\ }
\ }
NeoBundle 'matchit.zip', {
\ 'on_map' : ['%', 'g%']
\ }
let bundle = neobundle#get('matchit.zip')
function! bundle.hooks.on_post_source(bundle)
silent! execute 'doautocmd Filetype' &filetype
endfunction
" and now all bundles that don't need special treatment
NeoBundle 'Shougo/neocomplete'
NeoBundle 'Shougo/neosnippet'
NeoBundle 'Shougo/unite.vim'
NeoBundle 'altercation/vim-colors-solarized'
" NeoBundle 'cakebaker/scss-syntax.vim'
NeoBundle 'cakebaker/scss-syntax.vim'
NeoBundle 'christoomey/vim-tmux-navigator'
NeoBundle 'editorconfig/editorconfig-vim'
NeoBundle 'gcmt/wildfire.vim'
@ -26,23 +44,3 @@ NeoBundle 'matchit.zip'
NeoBundle 'webgefrickel/vim-snippets'
NeoBundle 'wellle/tmux-complete.vim'
NeoBundle 'Shougo/vimproc.vim', {
\ 'build': {
\ 'mac': 'make -f make_mac.mak',
\ 'linux': 'make',
\ 'unix': 'gmake'
\ }
\ }
NeoBundle 'matchit.zip', {
\ 'on_map' : ['%', 'g%']
\ }
let bundle = neobundle#get('matchit.zip')
function! bundle.hooks.on_post_source(bundle)
silent! execute 'doautocmd Filetype' &filetype
endfunction
" end neobundle config
call neobundle#end()

@ -8,8 +8,8 @@ set fillchars=
set laststatus=2 " statusbar is 2 high
set cmdheight=2 " command window is 2 high
set cpoptions+=$ " Add a $ to the end of a selection
set cpoptions+=J " 2 spaces after a sentence for easier text manupulation
set cpoptions+=$ " Add a $ to the end of a selection
set cpoptions+=J " 2 spaces after a sentence for easier text manupulation
colorscheme solarized
let g:solarized_termtrans = 1

@ -14,6 +14,11 @@ NeoBundleFetch 'Shougo/neobundle.vim'
" Let Neobundle handle the rest, and start by loading bundles and defaults
source ~/.vim/config/bundles.vim
" end neobundle config
call neobundle#end()
" load the default config and mappings
source ~/.vim/config/defaultconfig.vim
source ~/.vim/config/search.vim
source ~/.vim/config/whitespace.vim

Loading…
Cancel
Save