-added personal git configuration file
This commit is contained in:
parent
818a7fb941
commit
040d782aa8
3 changed files with 37 additions and 0 deletions
35
my_configs.vim.orig
Normal file
35
my_configs.vim.orig
Normal 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
1
sources_non_forked/LaTeX-Box
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 3c2901e12cb78bfb2be58ba4c62a488612550fe1
|
1
sources_non_forked/vim-rails
Submodule
1
sources_non_forked/vim-rails
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit fc5d7792afbebc7bef8de1e3a00713bba2932a24
|
Loading…
Reference in a new issue