From d848835c576a30bccaea0dd5515e4a22af670992 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Fri, 5 Dec 2014 00:46:10 +0100 Subject: [PATCH 1/5] move to neobundle --- .gitmodules | 3 - vim/bundle/Vundle.vim | 1 - vim/snippets/javascript-jasmin.snippets | 60 -------------- vim/snippets/javascript.snippets | 11 --- vimrc | 101 +++++++++++++----------- 5 files changed, 55 insertions(+), 121 deletions(-) delete mode 160000 vim/bundle/Vundle.vim delete mode 100644 vim/snippets/javascript-jasmin.snippets delete mode 100644 vim/snippets/javascript.snippets diff --git a/.gitmodules b/.gitmodules index 2d0def5..3da96cf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "vim/bundle/Vundle.vim"] - path = vim/bundle/Vundle.vim - url = https://github.com/gmarik/Vundle.vim.git [submodule "oh-my-zsh"] path = oh-my-zsh url = git@github.com:robbyrussell/oh-my-zsh.git diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim deleted file mode 160000 index 8db3bcb..0000000 --- a/vim/bundle/Vundle.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8db3bcb5921103f0eb6de361c8b25cc03cb350b5 diff --git a/vim/snippets/javascript-jasmin.snippets b/vim/snippets/javascript-jasmin.snippets deleted file mode 100644 index 88143bd..0000000 --- a/vim/snippets/javascript-jasmin.snippets +++ /dev/null @@ -1,60 +0,0 @@ -# Describe -snippet des - describe('${1:description}', function(${2}) { - ${3} - }); - -# After Each -snippet aft - afterEach(function(${1}) { - ${2} - });${0} - -# Before Each -snippet bef - beforeEach(function(${1}) { - ${2} - }); - -# It -snippet it - it('${1:description}', function(${2}) { - ${3} - }); - -# Stub -snippet stub - sandbox.stub(${1:target},'${2:function}');${3} - -# Spy -snippet spy - sandbox.spy(${1:target},'${2:function}');${3} - -# Expect not to be defined -snippet end - expect(${1:target}).not.toBeDefined();${2} - -# Expect not to contain -snippet enc - expect(${1:target}).not.toContain(${2:value});${3} - -# Expect not to equal -snippet ene - expect(${1:target}).not.toEqual(${2:value});${3} - -# Expect not -snippet enx - expect(${1:target}).not.${2};${3} - -# Expect to be defined -snippet etd - expect(${1:target}).toBeDefined();${2} - -# Expect to contain -snippet etc - expect(${1:target}).toContain(${2:value});${3} - -# Expect to equal -snippet ete - expect(${1:target}).toEqual(${2:value});${3} - diff --git a/vim/snippets/javascript.snippets b/vim/snippets/javascript.snippets deleted file mode 100644 index e24d0d6..0000000 --- a/vim/snippets/javascript.snippets +++ /dev/null @@ -1,11 +0,0 @@ -# requirejs -snippet def - define([ - ${1} - ], function( - ${2} - ){ - 'use strict'; - - ${3} - }); diff --git a/vimrc b/vimrc index 5277b7f..031a360 100644 --- a/vimrc +++ b/vimrc @@ -1,58 +1,66 @@ -" FULL VIM -set nocompatible +" NeoBundle +if !1 | finish | endif -" Vundle +if has('vim_starting') + set nocompatible " Be iMproved -filetype off " required! -" set the runtime path to include Vundle and initialize -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() + set runtimepath+=~/.vim/bundle/neobundle.vim/ +endif -" let Vundle manage Vundle, required -Plugin 'gmarik/Vundle.vim' +call neobundle#begin(expand('~/.vim/bundle/')) -Plugin 'L9' -Plugin 'unimpaired.vim' +NeoBundleFetch 'Shougo/neobundle.vim' -Plugin 'scrooloose/nerdtree' -Plugin 'kien/ctrlp.vim' +" my bundles +NeoBundle 'L9' +NeoBundle 'unimpaired.vim' -Plugin 'Gundo' +NeoBundle 'Shougo/unite.vim' -Plugin 'scrooloose/nerdcommenter' +NeoBundle 'scrooloose/nerdtree' +NeoBundle 'kien/ctrlp.vim' -Plugin 'surround.vim' +NeoBundle 'scrooloose/nerdcommenter' -Plugin 'SirVer/ultisnips' -Plugin 'honza/vim-snippets' +NeoBundle 'surround.vim' -Plugin 'editorconfig/editorconfig-vim' +NeoBundle 'SirVer/ultisnips' +NeoBundle 'honza/vim-snippets' -Plugin 'sheerun/vim-polyglot' +NeoBundle 'editorconfig/editorconfig-vim' -Plugin 'nathanaelkane/vim-indent-guides' +NeoBundle 'sheerun/vim-polyglot' -Plugin 'tpope/vim-fugitive' -Plugin 'airblade/vim-gitgutter' +NeoBundle 'nathanaelkane/vim-indent-guides' -Plugin 'mileszs/ack.vim' +NeoBundle 'tpope/vim-fugitive' +NeoBundle 'airblade/vim-gitgutter' -Plugin 'vim-airline', {'name': 'airline'} -Plugin 'chriskempson/base16-vim' +NeoBundle 'rking/ag.vim' -Plugin 'scrooloose/syntastic.git' -Plugin 'Raimondi/delimitMate' +NeoBundle 'vim-airline' +NeoBundle 'chriskempson/base16-vim' -Plugin 'pangloss/vim-javascript' -Plugin 'mustache/vim-mustache-handlebars' -Plugin 'gorodinskiy/vim-coloresque' +NeoBundle 'scrooloose/syntastic.git' +NeoBundle 'Raimondi/delimitMate' -Plugin 'inside/vim-search-pulse' +NeoBundle 'jelera/vim-javascript-syntax' +NeoBundle 'JavaScript-Indent' +NeoBundle 'othree/javascript-libraries-syntax.vim' +NeoBundle 'marijnh/tern_for_vim' -" All of your Plugins must be added before the following line -call vundle#end() " required -filetype plugin indent on " required +NeoBundle 'mustache/vim-mustache-handlebars' +NeoBundle 'gorodinskiy/vim-coloresque' +NeoBundle 'inside/vim-search-pulse' + +call neobundle#end() + +filetype plugin indent on + +NeoBundleCheck + +" other stuff "" Encoding set encoding=utf-8 @@ -143,15 +151,16 @@ set t_vb= set spelllang=en,de "" long lines -let &showbreak='↪ ' +set showbreak=~ " " KEY MAPPINGS " "" MAP LEADER -noremap , \ + noremap , \ let mapleader = "," +"let mapleader = "\" "" fast saving nmap w :update @@ -231,7 +240,7 @@ endif " "" syntastic -let g:syntastic_javascript_checkers = ['jscs','jshint'] +let g:syntastic_javascript_checkers = ['jshint','jscs'] let g:syntastic_check_on_open = 1 "" ariline @@ -241,14 +250,6 @@ let g:airline#extensions#tabline#enabled = 1 "" NERDTree configuration nmap n :NERDTreeToggle -let NERDTreeChDirMode=2 -let NERDTreeIgnore=['\.rbc$', '\~$', '\.pyc$', '\.db$', '\.sqlite$', '__pycache__'] -let NERDTreeSortOrder=['^__\.py$', '\/$', '*', '\.swp$', '\.bak$', '\~$'] -let NERDTreeShowBookmarks=1 -let g:nerdtree_tabs_focus_on_files=1 -let g:NERDTreeMapOpenInTabSilent = '' -let g:NERDTreeWinSize = 20 -set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.pyc,*.db,*.sqlite "" Unimpaired "" bubble single lines @@ -272,6 +273,14 @@ nmap g :IndentGuidesToggle "" Gundo nmap u :GundoToggle +"" Ultisnips +"let g:UltiSnipsExpandTrigger="" +let g:UltiSnipsJumpForwardTrigger="" +"let g:UltiSnipsJumpBackwardTrigger="" + +" Tex +let g:tex_flavor = "latex" + " " Autocmd Rules " From 19de1b06517b5a3fbffec7764bb29458d2d1dd37 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Mon, 15 Dec 2014 00:13:35 +0100 Subject: [PATCH 2/5] little adjustments to airline --- vimrc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vimrc b/vimrc index 031a360..c22a14f 100644 --- a/vimrc +++ b/vimrc @@ -158,7 +158,7 @@ set showbreak=~ " "" MAP LEADER - noremap , \ +noremap , \ let mapleader = "," "let mapleader = "\" @@ -244,7 +244,9 @@ let g:syntastic_javascript_checkers = ['jshint','jscs'] let g:syntastic_check_on_open = 1 "" ariline -let g:airline_theme = 'powerlineish' +let g:airline_theme = 'bubblegum' +let g:airline_left_sep = '»' +let g:airline_right_sep = '«' let g:airline_enable_syntastic = 1 let g:airline#extensions#tabline#enabled = 1 From 986ec7eb4b1f906c3146b06722dc2741614fa10e Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Mon, 15 Dec 2014 00:15:57 +0100 Subject: [PATCH 3/5] saner font settings --- Xresources | 70 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 28 deletions(-) diff --git a/Xresources b/Xresources index 83560e4..a25a755 100644 --- a/Xresources +++ b/Xresources @@ -16,51 +16,65 @@ Xft.hintstyle: hintslight ! http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.1.pod !------------------------------------------------------------------------------- -URxvt.depth: 32 -URxvt.geometry: 90x30 -URxvt.transparent: false -URxvt.fading: 0 -! URxvt.urgentOnBell: true -! URxvt.visualBell: true -URxvt.loginShell: true -URxvt.internalBorder: 3 -URxvt.lineSpace: 0 +URxvt*depth: 32 +URxvt*geometry: 90x30 +URxvt*transparent: false +URxvt*fading: 0 +! URxvt*urgentOnBell: true +! URxvt*visualBell: true +URxvt*loginShell: true +URxvt*internalBorder: 3 +URxvt*lineSpace: 0 +URxvt*skipBuiltinGlyphs: true ! Fonts -URxvt*font: xft:DejaVu Sans Mono:pixelsize=13 -URxvt*boldFont: xft:DejaVu Sans Mono:bold:pixelsize=13 - +URxvt*font: xft:DejaVu Sans Mono:style=Book:size=10, \ + xft:Droid Sans Fallback:style=Regular, \ + xft:Droid Sans Japanese:style=Regular, \ + xft:unifont:style=Medium +URxvt*boldFont: xft:DejaVu Sans Mono:style=Book:size=10, \ + xft:Droid Sans Fallback:style=Regular, \ + xft:Droid Sans Japanese:style=Regular, \ + xft:unifont:style=Medium +URxvt*italicFont: xft:DejaVu Sans Mono:style=Book:size=10, \ + xft:Droid Sans Fallback:style=Regular, \ + xft:Droid Sans Japanese:style=Regular, \ + xft:unifont:style=Medium +URxvt*boldItalicFont: xft:DejaVu Sans Mono:style=Book:size=10, \ + xft:Droid Sans Fallback:style=Regular, \ + xft:Droid Sans Japanese:style=Regular, \ + xft:unifont:style=Medium ! 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 +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 -URxvt.scrollStyle: rxvt -URxvt.scrollBar: true -URxvt.scrollBar_right: true +URxvt*scrollStyle: rxvt +URxvt*scrollBar: true +URxvt*scrollBar_right: true ! Perl extensions -URxvt.perl-ext-common: default,matcher,font-size -URxvt.url-launcher: xdg-open -URxvt.matcher.button: 1 +URxvt*perl-ext-common: default,matcher,font-size +URxvt*url-launcher: xdg-open +URxvt*matcher.button: 1 ! Cursor -URxvt.cursorBlink: true -URxvt.cursorColor: #657b83 -URxvt.cursorUnderline: false +URxvt*cursorBlink: true +URxvt*cursorColor: #657b83 +URxvt*cursorUnderline: false ! Pointer -URxvt.pointerBlank: true +URxvt*pointerBlank: true ! scrollback buffer lines - 65535 is max on most machines (64 is default) -URxvt.saveLines: 65536 +URxvt*saveLines: 65536 ! Create a dump of the content of the terminal in /tmp ! : current screen ! + : current screen and scrollbackbuffer -URxvt.print-pipe: cat > $(echo /tmp/urxvt.dump.$(date +'%Y-%m-%d--%H:%M:%S')) +URxvt*print-pipe: cat > $(echo /tmp/urxvt.dump.$(date +'%Y-%m-%d--%H:%M:%S')) ! Base16 Solarized Dark ! Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized) From 49dec753ddeb88c4c0fb14e3b10679a731cc3278 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Mon, 15 Dec 2014 00:26:50 +0100 Subject: [PATCH 4/5] add a initial tmux.conf --- tmux.conf | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 tmux.conf diff --git a/tmux.conf b/tmux.conf new file mode 100644 index 0000000..d0964f9 --- /dev/null +++ b/tmux.conf @@ -0,0 +1,63 @@ +# force a reload of the config file +unbind r +bind r source-file ~/.tmux.conf + +# start window numbering at 1 for easier switching +set -g base-index 1 + +# colors +set -g default-terminal "screen-256color" + +# unicode +setw -g utf8 on +set -g status-utf8 on + +# bah, C-B is ugly +unbind C-b +set -g prefix C-a +bind C-a send-prefix + +# status bar config +set -g status-left "#h:[#S]" +set -g status-left-length 50 +set -g status-right-length 50 +#set -g status-right "⚡ #(~/bin/tmux-battery) [✉#(~/bin/imap_check.py)] %H:%M %d-%h-%Y" +set -g status-right "%H:%M %d-%h-%Y" +setw -g window-status-current-format "|#I:#W|" +set-window-option -g automatic-rename off + +# listen to alerts from all windows +set -g bell-action any + +# sessions +# bind Y source-file ~/.tmux/work + +# This tmux statusbar config was created by tmuxline.vim +# on Mon, 15 Dec 2014 + +set -g status-bg "colour238" +set -g message-command-fg "colour249" +set -g status-justify "left" +set -g status-left-length "100" +set -g status "on" +set -g pane-active-border-fg "colour150" +set -g message-bg "colour237" +set -g status-right-length "100" +set -g status-right-attr "none" +set -g message-fg "colour249" +set -g message-command-bg "colour237" +set -g status-attr "none" +set -g status-utf8 "on" +set -g pane-border-fg "colour237" +set -g status-left-attr "none" +setw -g window-status-fg "colour150" +setw -g window-status-attr "none" +setw -g window-status-activity-bg "colour238" +setw -g window-status-activity-attr "none" +setw -g window-status-activity-fg "colour150" +setw -g window-status-separator "" +setw -g window-status-bg "colour238" +set -g status-left "#[fg=colour236,bg=colour150] #S #[fg=colour150,bg=colour238,nobold,nounderscore,noitalics]»" +set -g status-right "#[fg=colour237,bg=colour238,nobold,nounderscore,noitalics]«#[fg=colour249,bg=colour237] %Y-%m-%d « %H:%M #[fg=colour150,bg=colour237,nobold,nounderscore,noitalics]«#[fg=colour236,bg=colour150] #h " +setw -g window-status-format "#[fg=colour150,bg=colour238] #I »#[fg=colour150,bg=colour238] #W " +setw -g window-status-current-format "#[fg=colour238,bg=colour237,nobold,nounderscore,noitalics]»#[fg=colour249,bg=colour237] #I »#[fg=colour249,bg=colour237] #W #[fg=colour237,bg=colour238,nobold,nounderscore,noitalics]»" From d1f111e00afb8ddf764ad582db602311d2638942 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Dec 2014 00:00:52 +0100 Subject: [PATCH 5/5] add a tmux.conf --- tmux.conf | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/tmux.conf b/tmux.conf index d0964f9..3c43768 100644 --- a/tmux.conf +++ b/tmux.conf @@ -35,29 +35,30 @@ set -g bell-action any # This tmux statusbar config was created by tmuxline.vim # on Mon, 15 Dec 2014 -set -g status-bg "colour238" -set -g message-command-fg "colour249" +set -g status-bg "colour234" +set -g message-command-fg "colour231" set -g status-justify "left" set -g status-left-length "100" set -g status "on" -set -g pane-active-border-fg "colour150" -set -g message-bg "colour237" +set -g pane-active-border-fg "colour254" +set -g message-bg "colour31" set -g status-right-length "100" set -g status-right-attr "none" -set -g message-fg "colour249" -set -g message-command-bg "colour237" +set -g message-fg "colour231" +set -g message-command-bg "colour31" set -g status-attr "none" set -g status-utf8 "on" -set -g pane-border-fg "colour237" +set -g pane-border-fg "colour240" set -g status-left-attr "none" -setw -g window-status-fg "colour150" +setw -g window-status-fg "colour250" setw -g window-status-attr "none" -setw -g window-status-activity-bg "colour238" +setw -g window-status-activity-bg "colour234" setw -g window-status-activity-attr "none" -setw -g window-status-activity-fg "colour150" +setw -g window-status-activity-fg "colour250" setw -g window-status-separator "" -setw -g window-status-bg "colour238" -set -g status-left "#[fg=colour236,bg=colour150] #S #[fg=colour150,bg=colour238,nobold,nounderscore,noitalics]»" -set -g status-right "#[fg=colour237,bg=colour238,nobold,nounderscore,noitalics]«#[fg=colour249,bg=colour237] %Y-%m-%d « %H:%M #[fg=colour150,bg=colour237,nobold,nounderscore,noitalics]«#[fg=colour236,bg=colour150] #h " -setw -g window-status-format "#[fg=colour150,bg=colour238] #I »#[fg=colour150,bg=colour238] #W " -setw -g window-status-current-format "#[fg=colour238,bg=colour237,nobold,nounderscore,noitalics]»#[fg=colour249,bg=colour237] #I »#[fg=colour249,bg=colour237] #W #[fg=colour237,bg=colour238,nobold,nounderscore,noitalics]»" +setw -g window-status-bg "colour234" +set -g status-left "#[fg=colour16,bg=colour254,bold] #S #[fg=colour254,bg=colour234,nobold,nounderscore,noitalics]>" +set -g status-right "#[fg=colour236,bg=colour234,nobold,nounderscore,noitalics]<#[fg=colour247,bg=colour236] %Y-%m-%d < %H:%M #[fg=colour252,bg=colour236,nobold,nounderscore,noitalics]<#[fg=colour235,bg=colour252] #h " +setw -g window-status-format "#[fg=colour244,bg=colour234] #I <#[fg=colour250,bg=colour234] #W " +setw -g window-status-current-format "#[fg=colour234,bg=colour31,nobold,nounderscore,noitalics]>#[fg=colour117,bg=colour31] #I >#[fg=colour231,bg=colour31,bold] #W #[fg=colour31,bg=colour234,nobold,nounderscore,noitalics]>" +