xonecas.io
2780
D2

dotfiles-2014 / commit f0a0307

argagagjjjhhh

Sean2017-02-14 f0a030798a48a7b3490179cbdae55511c501fbaa parent c9a04d6

3 files changed

bashrc+11−11
@@ -46,14 +46,14 @@ esac
4646 #force_color_prompt=yes
4747
4848 if [ -n "$force_color_prompt" ]; then
49- if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
50- # We have color support; assume it's compliant with Ecma-48
51- # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
52- # a case would tend to support setf rather than setaf.)
53- color_prompt=yes
54- else
55- color_prompt=
56- fi
49+ if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
50+ # We have color support; assume it's compliant with Ecma-48
51+ # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
52+ # a case would tend to support setf rather than setaf.)
53+ color_prompt=yes
54+ else
55+ color_prompt=
56+ fi
5757 fi
5858
5959 if [ "$color_prompt" = yes ]; then
@@ -134,7 +134,7 @@ nvm use stable &>/dev/null
134134 export VIRTUAL_ENV_DISABLE_PROMPT=1
135135 source `which virtualenvwrapper.sh`
136136
137-export SMITH_VM_MEMORY=4096
137+export SMITH_VM_MEMORY=6144
138138
139139 # Prompt
140140 function __git_dirty {
@@ -176,8 +176,8 @@ function __gitinfo {
176176 [ "$full" != "" ] && echo "$full"
177177 }
178178
179-COLOR1=$(tput setaf 4)
180-COLOR2=$(tput setaf 2)
179+COLOR1=$(tput setaf 7)
180+COLOR2=$(tput setaf 4)
181181 COLOR3=$(tput setaf 3)
182182 CLEAR=$(tput sgr0)
183183
install.py+12−22
@@ -1,5 +1,17 @@
11 #!/usr/bin/env python
22 """ Instalation script for Sean's dev environment.
3+
4+ @TODO:
5+
6+ * Create function that reads from current enviroment and updates
7+ the list of plugins, saves a copy of the current vimrc. This will be
8+ make managing different setups easier.
9+
10+ * Change the install command to allow specifying a branch, again
11+ this is to cater to multiple setups.
12+
13+ * Call necessary commands after each install.
14+
315 """
416
517 import sys
@@ -22,8 +34,6 @@ PWD = dirname(__file__)
2234 VIMRC = join(HOME, ".vimrc")
2335 VIM = join(HOME, ".vim")
2436 VIM_COLORS = join(HOME, ".vim", "colors")
25-TMUX_CONF = join(HOME, ".tmux.conf")
26-BASHRC = join(HOME, ".bashrc")
2737
2838
2939 def clean():
@@ -35,12 +45,6 @@ def clean():
3545 if exists(VIM):
3646 rmtree(VIM)
3747
38- # if exists(TMUX_CONF):
39- # remove(TMUX_CONF)
40-
41- # if exists(BASHRC):
42- # remove(BASHRC)
43-
4448
4549 def create_vim_bundle():
4650 """ Create necessary folders: .vim/bundle """
@@ -78,14 +82,6 @@ def clone_plugins():
7882 foldername = splitext(basename(plugin_url))[0]
7983 call(["git", "clone", plugin_url, join(bundle, foldername)])
8084
81- # install smyck:
82- makedirs(VIM_COLORS)
83- smyck = ("https://raw.githubusercontent.com/hukl/Smyck-Color-Scheme/" +
84- "master/smyck.vim")
85- local = join(VIM_COLORS, 'smyck.vim')
86-
87- call(["curl", "-L", smyck, "-o", local])
88-
8985
9086 def setup_vim():
9187 """ copy the vim file and supporting files """
@@ -98,12 +94,6 @@ def main():
9894 """ Install all """
9995 clean()
10096
101- # tmux
102- # copyfile(join(PWD, "tmux.conf"), TMUX_CONF)
103-
104- # bashrc
105- # copyfile(join(PWD, "bashrc"), BASHRC)
106-
10797 # vim
10898 create_vim_bundle()
10999 install_pathogen()
vimrc+39−6
@@ -24,6 +24,7 @@ set wildignore=*.pyc
2424 set list
2525 set lcs=tab:▸\ ,trail:·,eol:¬,nbsp:_
2626 set backspace=2 " make backspace work like most other apps
27+set laststatus=2
2728
2829 map <leader>] :bnext<CR>
2930 map <leader>[ :bprev<CR>
@@ -55,14 +56,46 @@ let g:syntastic_sass_checkers = ['scss_lint']
5556 " use git file scanner for Cmd+T
5657 let g:CommandTFileScanner = 'git'
5758
58-" Colors
59-set t_Co=256
60-set background=dark
61-colorscheme hybrid
62-"hi Normal ctermbg=none
59+let g:airline_powerline_fonts=1
60+let g:closetag_filenames = "*.html,*.jinja2,*.jinja2_fe"
61+
62+" Tagbar stuffs
63+nmap <F8> :TagbarToggle<CR>
6364
6465 " Set the right indent for each file.
6566 autocmd BufNewFile,BufRead *.py :set ts=4 sw=4
6667 autocmd BufNewFile,BufRead *.html :set ts=2 sw=2 filetype=htmldjango
67-autocmd BufNewFile,BufRead *.js,*.scss :set ts=2 sw=2
68+autocmd BufNewFile,BufRead *.js,*.scss, :set ts=2 sw=2
6869 autocmd BufNewFile,BufRead *.json setfiletype json syntax=javascript
70+autocmd BufNewFile,BufRead *.jinja2,*.jinja2_fe :set ts=2 sw=2 filetype=jinja
71+
72+" Colors
73+if has("termguicolors")
74+ set termguicolors
75+endif
76+set t_Co=256
77+set background=dark
78+
79+"colorscheme seattle
80+"colorscheme pencil
81+colorscheme badwolf
82+"colorscheme distinguished
83+"colorscheme hemisu
84+"colorscheme hybrid
85+"colorscheme jellybeans
86+"colorscheme molokai
87+"colorscheme nord
88+"colorscheme quantum
89+"colorscheme spacegray
90+"colorscheme tender
91+"colorscheme getafe
92+"colorscheme monrovia
93+"colorscheme minimalist
94+"let g:airline_theme='minimalist'
95+"let g:airline_theme='bubblegum'
96+"let g:airline_theme='distinguished'
97+"let g:airline_theme='quantum'
98+"let g:airline_theme='tender'
99+"let g:molokai_original=1
100+"let g:quantum_black = 1
101+"let g:rehash256=1