Merge branch 'master' of github.com:DarkWiiPlayer/darkrc

Conflicts:
	vimrc
This commit is contained in:
Talia 2017-10-05 19:02:20 +02:00
commit 5e367a8732

26
vimrc
View file

@ -110,6 +110,12 @@ endif
" CUSTOM STUFF " CUSTOM STUFF
noremap <space> :
noremap <C-space> @:
noremap <C-s> :w<enter>
noremap <C-x> :bdelete<enter>
noremap <C-n> :bnext<enter>
noremap <C-p> :bprevious<enter>
set bg=dark set bg=dark
set number set number
" Filetype stuff " Filetype stuff
@ -121,19 +127,33 @@ set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab
set t_Co=256 set t_Co=256
" Remapping some things " Remapping some things
vmap <C-f> :fold<CR> vmap <C-f> :fold<CR>
<<<<<<< HEAD
" nmap <C-b> :bprevious<CR> " nmap <C-b> :bprevious<CR>
noremap <space> : noremap <space> :
nnoremap <C-s> :w<enter> nnoremap <C-s> :w<enter>
nnoremap <C-x> :bdelete<enter> nnoremap <C-x> :bdelete<enter>
nnoremap <C-n> :bnext<enter> nnoremap <C-n> :bnext<enter>
nnoremap <C-p> :bprevious<enter> nnoremap <C-p> :bprevious<enter>
=======
>>>>>>> 621eebbe99c4cf7a82a1ee8875b122be5b59cff4
" Retab mappings " Retab mappings
nnoremap <S-tab> :retab!<enter> nnoremap <S-tab> :retab!<enter>
nnoremap <S-tab><S-tab> :setl expandtab!<enter> :set expandtab?<enter> nnoremap <S-tab><S-tab> :setl expandtab!<enter>:set expandtab?<enter>
" Unprintable Characters noremap <F1> :setl number!<enter>
noremap <F2> :setl relativenumber!<enter>
noremap <F3> :setl autowriteall!<enter>:setl autowriteall?<enter>
noremap <F4> :setl list!<enter> noremap <F4> :setl list!<enter>
noremap <F3> :setl number!<enter>
set listchars=eol,tab:»\ ,trail:. set listchars=eol,tab:»\ ,trail:.
set showbreak=+->\
" Commands " Commands
com! Setwd :cd %:p:h com! Setwd :cd %:p:h
com! Removetrailingspaces :%s/\ \+$//ge com! Removetrailingspaces :%s/\ \+$//ge
nmap <leader>t :Removetrailingspaces<enter>
set statusline=(%n)\ %f\ [%M%R]\ [%Y]%=%l,%c%V\ %4.P
set laststatus=2
set cmdheight=1
set winheight=10
set winminheight=4
set winheight=9999
set timeoutlen=300
let mapleader = "\\"