pali112
/
vimrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 040d782aa8 into 5f6aa8fe09

This commit is contained in:
Siew Yi Liang 2016-05-06 11:23:21 +00:00
parent 5f6aa8fe09 040d782aa8
commit 16ff642c20
6 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -3,6 +3,8 @@ sources_non_forked/ack.vim/.netrwhist
temp_dirs/yankring_history_v2.txt temp_dirs/yankring_history_v2.txt
sources_forked/yankring/doc/tags sources_forked/yankring/doc/tags
sources_non_forked/tlib/doc/tags sources_non_forked/tlib/doc/tags
sources_non_forked/LaTeX-Box
sources_non_forked/vim-rails
my_configs.vim my_configs.vim
tags tags
.DS_Store .DS_Store

26
my_configs.vim Normal file
View File

@ -0,0 +1,26 @@
" Basic formatting settings
set listchars=tab:»·,trail:·
set list
" Turn on line numbering
set number
syntax on
colorscheme monokai
" Enable folding
set foldmethod=indent
set foldlevel=99
" Adds proper PEP-8 settings for Python files
au BufNewFile,BufRead *.py
\ set tabstop=4
\ set softtabstop=4
\ set shiftwidth=4
\ set textwidth=79
\ set expandtab
\ set autoindent
\ set fileformat=unix
au BufNewFile,BufRead *.js, *.html, *.css
\ set tabstop=2
\ set softtabstop=2
\ set shiftwidth=2

35
my_configs.vim.orig Normal file
View File

@ -0,0 +1,35 @@
<<<<<<< 3667b54b19b952b13d638536b5f47e226d252e30
" Basic formatting settings
set listchars=tab:»·,trail:·
set list
" Turn on line numbering
set number
syntax on
colorscheme monokai
" Enable folding
set foldmethod=indent
set foldlevel=99
" Adds proper PEP-8 settings for Python files
au BufNewFile,BufRead *.py
\ set tabstop=4
\ set softtabstop=4
\ set shiftwidth=4
\ set textwidth=79
\ set expandtab
\ set autoindent
\ set fileformat=unix
au BufNewFile,BufRead *.js, *.html, *.css
\ set tabstop=2
\ set softtabstop=2
\ set shiftwidth=2
||||||| merged common ancestors
=======
set listchars=tab:»·,trail:·
set list
set number
syntax on
colorscheme monokai
>>>>>>> -added personal git configuration file

1
sources_non_forked/LaTeX-Box Submodule

@ -0,0 +1 @@
Subproject commit 3c2901e12cb78bfb2be58ba4c62a488612550fe1

BIN
sources_non_forked/latexmk.zip Normal file
View File

Binary file not shown.

1
sources_non_forked/vim-rails Submodule

@ -0,0 +1 @@
Subproject commit fc5d7792afbebc7bef8de1e3a00713bba2932a24