aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xinstall.sh8
-rw-r--r--nvim/.config/nvim/init.vim72
-rwxr-xr-xzsh/.zsh/aliases.zsh6
3 files changed, 82 insertions, 4 deletions
diff --git a/install.sh b/install.sh
index fd2c12d..8be0c69 100755
--- a/install.sh
+++ b/install.sh
@@ -44,5 +44,13 @@ yaourt -S otf-fira-code
#git clone https://github.com/vundlevim/vundle.vim.git vim/.vim/bundle/Vundle.vim
#vim +PluginInstall +qall
+## The service doesn't work on my system...
+#./stow-services services/twmnd.service
+#stow twmnd
+#sed -i s/absolute_position=1920x25/absolute_position=3840x25/g ~/.config/twmn/twmn.conf
+
#stow nvim
+#git clone https://github.com/vundlevim/vundle.vim.git ~/.config/nvim/bundle/Vundle.vim
+
+#sudo pacman -S python-neovim
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 1bc22c8..e4e7284 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -16,7 +16,7 @@ Plugin 'VundleVim/Vundle.vim'
" Neomake build tool (mapped below to <c-b>)
Plugin 'benekastah/neomake'
" Autocomplete for python
-"Plugin 'davidhalter/jedi-vim'
+Plugin 'davidhalter/jedi-vim'
" Remove extraneous whitespace when edit mode is exited
"Plugin 'thirtythreeforty/lessspace.vim'
@@ -33,8 +33,55 @@ Plugin 'airblade/vim-gitgutter'
" Tab completion
Plugin 'ervandew/supertab'
+" Syntax for openscad files
Plugin 'sirtaj/vim-openscad'
+" NERDtree plugin
+Plugin 'scrooloose/nerdtree'
+
+" NERDTree git plugin
+Plugin 'Xuyuanp/nerdtree-git-plugin'
+
+" Global Auto Completion
+Plugin 'ajh17/VimCompletesMe'
+
+" PHP Auto Completion
+Plugin 'shawncplus/phpcomplete.vim'
+
+" Better syntax and highlighting
+Plugin 'pangloss/vim-javascript'
+
+" Syntax checker
+Plugin 'scrooloose/syntastic'
+
+" Git command managament from nvim
+"Plugin 'tpope/vim-fugitive'
+
+" Git plugin of fugitive plugin for view log of git
+Plugin 'gregsexton/gitv'
+
+" View tree of the file historic
+Plugin 'mbbill/undotree'
+
+" Ack search tool
+" Read more here : https://github.com/mileszs/ack.vim#can-i-use-ag-the-silver-searcher-with-this
+Plugin 'mileszs/ack.vim'
+
+" matchit
+Plugin 'isa/vim-matchit'
+
+" Unicode
+ Plugin 'chrisbra/unicode.vim'
+
+" Colorize text for exemple #fff
+Plugin 'lilydjwg/colorizer'
+
+" html5
+Plugin 'othree/html5.vim'
+
+" Markdon hightlighting
+Plugin 'gabrielelana/vim-markdown'
+
" After all plugins...
call vundle#end()
filetype plugin indent on
@@ -121,4 +168,27 @@ nnoremap <C-b> :w<cr>:Neomake<cr>
autocmd BufNewFile,BufRead *.tex,*.bib noremap <buffer> <C-b> :w<cr>:new<bar>r !make<cr>:setlocal buftype=nofile<cr>:setlocal bufhidden=hide<cr>:setlocal noswapfile<cr>
autocmd BufNewFile,BufRead *.tex,*.bib imap <buffer> <C-b> <Esc><C-b>
+" NERDTree keybinding
+map <C-n> :NERDTreeToggle<CR>
+autocmd StdinReadPre * let s:std_in=1
+autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
+
+" NERDTress File highlighting
+function! NERDTreeHighlightFile(extension, fg, bg, guifg, guibg)
+ exec 'autocmd filetype nerdtree highlight ' . a:extension .' ctermbg='. a:bg .' ctermfg='. a:fg .' guibg='. a:guibg .' guifg='. a:guifg
+ exec 'autocmd filetype nerdtree syn match ' . a:extension .' #^\s\+.*'. a:extension .'$#'
+endfunction
+call NERDTreeHighlightFile('jade', 'green', 'none', 'green', '#151515')
+call NERDTreeHighlightFile('ini', 'yellow', 'none', 'yellow', '#151515')
+call NERDTreeHighlightFile('md', 'blue', 'none', '#3366FF', '#151515')
+call NERDTreeHighlightFile('yml', 'yellow', 'none', 'yellow', '#151515')
+call NERDTreeHighlightFile('config', 'yellow', 'none', 'yellow', '#151515')
+call NERDTreeHighlightFile('conf', 'yellow', 'none', 'yellow', '#151515')
+call NERDTreeHighlightFile('json', 'yellow', 'none', 'yellow', '#151515')
+call NERDTreeHighlightFile('html', 'yellow', 'none', 'yellow', '#151515')
+call NERDTreeHighlightFile('styl', 'cyan', 'none', 'cyan', '#151515')
+call NERDTreeHighlightFile('css', 'cyan', 'none', 'cyan', '#151515')
+call NERDTreeHighlightFile('coffee', 'Red', 'none', 'red', '#151515')
+call NERDTreeHighlightFile('js', 'Red', 'none', '#ffa500', '#151515')
+call NERDTreeHighlightFile('php', 'Magenta', 'none', '#ff00ff', '#151515')
diff --git a/zsh/.zsh/aliases.zsh b/zsh/.zsh/aliases.zsh
index 9c8afd3..1f0a882 100755
--- a/zsh/.zsh/aliases.zsh
+++ b/zsh/.zsh/aliases.zsh
@@ -29,9 +29,9 @@ alias cp="cp -r"
alias scp="scp -r"
alias xsel="xsel -b"
alias fuck='sudo $(fc -ln -1)'
-alias v="vim"
-alias vi="vim"
-alias emacs="vim"
+alias v="nvim"
+alias vi="nvim"
+alias emacs="nvim"
alias g="git"
alias ga="git add"
alias gap="git add -p"