Browse Source

latest changes

master
Julio Biason 11 years ago
parent
commit
322667f1c6
  1. 6
      configs/gvimrc
  2. 20
      configs/vimrc
  3. 18
      snippets/htmldjango.snippets

6
configs/gvimrc

@ -8,8 +8,10 @@ if has('mac')
set gfn=monofur:h15 " My screen size sucks, mkay? set gfn=monofur:h15 " My screen size sucks, mkay?
set lines=63 " number of lines, based on my screen size and font set lines=63 " number of lines, based on my screen size and font
else else
set gfn=monofur\ 12 set gfn=monofur\ for\ Powerline\ 12
set lines=48 " set gfn=Source\ Code\ Pro\ for\ Powerline\ Medium\ 11
set lines=54
let g:Powerline_symbols = 'fancy'
endif endif
color Mustang color Mustang

20
configs/vimrc

@ -85,9 +85,9 @@ au FileType python set expandtab tabstop=4 shiftwidth=4 softtabstop=4 textwidth=
" reStructured files follow python closely, but use 3 tab stops instead of 4 " reStructured files follow python closely, but use 3 tab stops instead of 4
au FileType rst set expandtab tabstop=3 sw=3 sts=3 textwidth=78 au FileType rst set expandtab tabstop=3 sw=3 sts=3 textwidth=78
" templates (Jinja2 in this case) will also have spaces instead of tabs and " templates (Jinja2 in this case) will use tabs instead (to reduce file size)
" follow most of the python standards (with the exception of the textwidth) " but also 2 spaces for tabs.
au FileType htmldjango set expandtab tabstop=4 shiftwidth=4 softtabstop=4 au FileType htmldjango set noet tabstop=4 shiftwidth=4 softtabstop=4
" the smarty filetypes doesn't have any sort of indentation, so we set it to " the smarty filetypes doesn't have any sort of indentation, so we set it to
" auto " auto
@ -167,20 +167,18 @@ let php_smart_members=1
set rtp+=~/.vim/bundle/vundle/ set rtp+=~/.vim/bundle/vundle/
call vundle#rc() call vundle#rc()
Bundle 'Lokaltog/vim-powerline' Bundle "Lokaltog/powerline"
Bundle 'tpope/vim-fugitive' Bundle 'tpope/vim-fugitive'
Bundle 'tpope/vim-commentary' Bundle 'tpope/vim-commentary'
Bundle 'godlygeek/tabular' Bundle 'godlygeek/tabular'
Bundle 'jiangmiao/auto-pairs' Bundle 'jiangmiao/auto-pairs'
Bundle 'nvie/vim-flake8' Bundle 'nvie/vim-flake8'
" Bundle 'scrooloose/nerdtree'
" Bundle 'terryma/vim-multiple-cursors'
Bundle 'msanders/snipmate.vim' Bundle 'msanders/snipmate.vim'
Bundle 'kien/ctrlp.vim' Bundle 'kien/ctrlp.vim'
" Bundle 'Glench/Vim-Jinja2-Syntax' Bundle 'terryma/vim-multiple-cursors'
" powerline settings " powerline settings
""let g:Powerline_symbols = 'fancy' let g:Powerline_symbols = 'fancy'
" auto-pair settings " auto-pair settings
let g:AutoPairsMapCR = 1 let g:AutoPairsMapCR = 1
@ -233,3 +231,9 @@ function PowerTabLine()
endfunction endfunction
set tabline=%!PowerTabLine() set tabline=%!PowerTabLine()
" powerline
python from powerline.vim import setup as powerline_setup
python powerline_setup()
python del powerline_setup

18
snippets/htmldjango.snippets

@ -1,20 +1,30 @@
snippet for snippet for
{% for ${1:record} in ${2:list} %} {% for ${1:record} in ${2:list} %}
${3:{# content #}} ${3:{% content %}}
{% endfor %} {% endfor %}
snippet if snippet if
{% if ${1:condition} %} {% if ${1:condition} %}
${2:{# content #}} ${2:{% content %}}
{% endif %} {% endif %}
snippet else
{% else %}
snippet block snippet block
{% block ${1:blockname} %} {% block ${1:blockname} %}
${2:{# content #}} ${2:{% content %}}
{% endblock $1 %} {% endblock $1 %}
snippet macro snippet macro
{% macro ${1:name}(${2:params}) %} {% macro ${1:name}(${2:params}) %}
${3:{# content #}} ${3:{% content %}}
{% endmacro %} {# $1 #} {% endmacro %} {# $1 #}
snippet import snippet import
{% import "${1:filename}" as ${2:namespace}${3: with context} %} {% import "${1:filename}" as ${2:namespace}${3: with context} %}
snippet modeline snippet modeline
{# vim:set ft=htmldjango: #} {# vim:set ft=htmldjango: #}
snippet include
{% include "${1:filename}"${2: ignore missing}${3: with context} %}
snippet set
{% set ${1:variable} = ${2:value} %}
snippet call
{% call ${1:macro}(${2:params}) %}
${3:{% content %}}
{% endcall %} {# $1 #}

Loading…
Cancel
Save