Archives
/
steffen-dotfiles
mirror of https://github.com/webgefrickel/dotfiles
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

wwoooooop, more nvim

Browse Source
main
Steffen Rademacker 8 years ago
parent a3f1500f23
commit 117e7ff45f
19 changed files with 49 additions and 85 deletions
Show Stats Download Patch File Download Diff File

3
config/configstore/first-run_Kap-1.0.0.json
Unescape Escape View File

@ -0,0 +1,3 @@
{
"firstRun": false
}

3
config/configstore/first-run_Kap.json
Unescape Escape View File

@ -0,0 +1,3 @@
{
"firstRun": false
}

3
config/configstore/insight-Kap.json
Unescape Escape View File

@ -0,0 +1,3 @@
{
"clientId": 613154905326
}

4
config/configstore/update-notifier-trash-cli.json
Unescape Escape View File

@ -0,0 +1,4 @@
{
"optOut": false,
"lastUpdateCheck": 1482674139375
}

5
config/nvim/bundles.vim
Unescape Escape View File

@ -3,8 +3,11 @@
" TODO Replace those with the de-versions
" NeoBundle 'Shougo/neocomplete'
" NeoBundle 'Shougo/neosnippet'
call dein#add('Shougo/neosnippet')
" NeoBundle 'Shougo/unite.vim'
call dein#add('Shougo/deoplete.nvim')
call dein#add('junegunn/fzf', { 'build': './install --all' })
call dein#add('junegunn/fzf.vim')
call dein#add('cakebaker/scss-syntax.vim')
call dein#add('christoomey/vim-tmux-navigator')
call dein#add('cocopon/lightline-hybrid.vim')

1
config/nvim/dein/repos/github.com/Shougo/deoplete.nvim

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

1
config/nvim/dein/repos/github.com/Shougo/neosnippet

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

1
config/nvim/dein/repos/github.com/junegunn/fzf

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

1
config/nvim/dein/repos/github.com/junegunn/fzf.vim

@ -0,0 +1 @@
Subproject commit 2066643243eddf2ed1f5d3a1a5485d6ff71851a4

4
config/nvim/init.vim
Unescape Escape View File

@ -22,8 +22,8 @@ source ~/.config/nvim/leaderkeys.vim
source ~/.config/nvim/plugins/fugitive.vim
source ~/.config/nvim/plugins/incsearch.vim
source ~/.config/nvim/plugins/lightline.vim
" source ~/.config/nvim/plugins/neosnippet.vim
" source ~/.config/nvim/plugins/neocomplete.vim
source ~/.config/nvim/plugins/neosnippet.vim
source ~/.config/nvim/plugins/deoplete.vim
source ~/.config/nvim/plugins/sneak.vim
source ~/.config/nvim/plugins/syntastic.vim
" source ~/.config/nvim/plugins/unite.vim

4
config/nvim/leaderkeys.vim
Unescape Escape View File

@ -12,8 +12,8 @@ nnoremap <leader>- <C-w>s<C-w>j
nnoremap <leader>= <C-w>=
" open a new split and edit the vimrc // easy sourcing vimrc
nnoremap <leader>ve <C-w>v<C-w>l :e ~/.vimrc<cr>
nnoremap <leader>vs :source ~/.vimrc<cr>
nnoremap <leader>ve <C-w>v<C-w>l :e ~/.config/nvim/init.vim<cr>
nnoremap <leader>vs :source ~/.config/nvim/init.vim<cr>
" Opens an edit command with the path of the currently edited file filled in
nnoremap <leader>o :e <C-R>=expand("%:p:h") . "/" <CR>

17
config/nvim/plugins/deoplete.vim
Unescape Escape View File

@ -0,0 +1,17 @@
" deoplete
"======================================================================
let g:deoplete#enable_at_startup = 1
let g:deoplete#enable_smart_case = 1
let g:deoplete#auto_completion_start_length = 3
" <C-h>, <BS>: close popup and delete backword char.
inoremap <expr><C-h> deoplete#smart_close_popup()."\<C-h>"
inoremap <expr><BS> deoplete#smart_close_popup()."\<C-h>"
" <CR>: close popup and save indent.
inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR>
function! s:my_cr_function() abort
return deoplete#close_popup() . "\<CR>"
endfunction

28
config/nvim/plugins/neocomplete.vim
Unescape Escape View File

@ -1,28 +0,0 @@
" Neocomplete
"======================================================================
let g:acp_enableAtStartup = 0
let g:neocomplete#enable_at_startup = 1
let g:neocomplete#auto_completion_start_length = 3
let g:neocomplete#force_overwrite_completefunc = 1
inoremap <expr><C-g> neocomplete#undo_completion()
inoremap <expr><C-l> neocomplete#complete_common_string()
inoremap <silent> <CR> <C-r>=<SID>neocomplete_cr_function()<CR>
inoremap <expr><C-y> neocomplete#close_popup()
inoremap <expr><C-e> neocomplete#cancel_popup()
" <TAB>: completion.
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
" " <C-h>, <BS>: close popup and delete backword char.
inoremap <expr><C-h> neocomplete#smart_close_popup()."\<C-h>"
inoremap <expr><BS> neocomplete#smart_close_popup()."\<C-h>"
function! s:neocomplete_cr_function()
return neocomplete#close_popup() . "\<CR>"
endfunction
if !exists('g:neocomplete#sources#omni#input_patterns')
let g:neocomplete#sources#omni#input_patterns = {}
let g:neocomplete#sources#omni#input_patterns.php = '[^. \t]->\h\w*\|\h\w*::'
endif

2
config/nvim/plugins/neosnippet.vim
Unescape Escape View File

@ -5,7 +5,7 @@ let g:neosnippet#disable_runtime_snippets = { "_": 1 }
let g:neosnippet#scope_aliases = {}
let g:neosnippet#scope_aliases['scss'] = 'scss,css'
let g:neosnippet#scope_aliases['php'] = 'php,html'
let g:neosnippet#snippets_directory = '~/.vim/bundle/vim-snippets/snippets'
let g:neosnippet#snippets_directory = '~/.config/nvim/dein/repos/github.com/webgefrickel/vim-snippets/snippets'
" Plugin key-mappings, expand with ctrl + j
imap <C-j> <Plug>(neosnippet_expand_or_jump)

5
install/_install.sh
Unescape Escape View File

@ -24,14 +24,17 @@ brew install tmux
brew install zsh
brew install neovim/neovim/neovim --HEAD
brew install python3
read -p "Press any key to continue... " -n1 -s
# install deps + plugins for neovim
pip3 install neovim
curl https://raw.githubusercontent.com/Shougo/dein.vim/master/bin/installer.sh > installer.sh
sh installer.sh ~/.config/nvim/dein
read -p "Press any key to continue... " -n1 -s
# install fzf
/usr/local/opt/fzf/install
read -p "Press any key to continue... " -n1 -s
# this is the minimal software and fonts used
brew cask install forklift
@ -39,6 +42,8 @@ brew cask install hyper
brew cask install iterm2
brew cask install owncloud
brew cask install caskroom/fonts/font-hack
read -p "Press any key to continue... " -n1 -s
brew linkapps
brew tap homebrew/services

0
vim/.gitignore vendored
Unescape Escape View File

1
vim/vim
Unescape Escape View File

@ -1 +0,0 @@
/Users/webgefrickel/dotfiles/vim

40
vimrc
Unescape Escape View File

@ -1,40 +0,0 @@
" my vimrc - this file basically initalies neobundle and loads
" other config files from vim/config + the plugins-subfolder
"======================================================================
if has('vim_starting')
set nocompatible
set runtimepath+=~/.vim/bundle/neobundle.vim/
endif
call neobundle#begin(expand('~/.vim/bundle/'))
" Let NeoBundle manage NeoBundle
NeoBundleFetch 'Shougo/neobundle.vim'
" Let Neobundle handle the rest, and start by loading bundles and defaults
source ~/.vim/config/bundles.vim
" end neobundle config
call neobundle#end()
" load the default config and mappings
source ~/.vim/config/defaultconfig.vim
source ~/.vim/config/search.vim
source ~/.vim/config/whitespace.vim
source ~/.vim/config/autocommands.vim
source ~/.vim/config/gui.vim
source ~/.vim/config/colorscheme.vim
source ~/.vim/config/keymappings.vim
source ~/.vim/config/leaderkeys.vim
" and the configs and mappings for plugins loaded in bundles.vim
source ~/.vim/config/plugins/emmet.vim
source ~/.vim/config/plugins/fugitive.vim
source ~/.vim/config/plugins/incsearch.vim
source ~/.vim/config/plugins/lightline.vim
source ~/.vim/config/plugins/neocomplete.vim
source ~/.vim/config/plugins/neosnippet.vim
source ~/.vim/config/plugins/syntastic.vim
source ~/.vim/config/plugins/unite.vim
source ~/.vim/config/plugins/sneak.vim

11
zshrc
Unescape Escape View File

@ -72,13 +72,4 @@ export NVM_DIR="$HOME/.nvm"
eval "$(rbenv init -)"
# fzf
if [[ ! "$PATH" == */usr/local/opt/fzf/bin* ]]; then
export PATH="$PATH:/usr/local/opt/fzf/bin"
fi
if [[ ! "$MANPATH" == */usr/local/opt/fzf/man* && -d "/usr/local/opt/fzf/man" ]]; then
export MANPATH="$MANPATH:/usr/local/opt/fzf/man"
fi
[[ $- == *i* ]] && source "/usr/local/opt/fzf/shell/completion.zsh" 2> /dev/null
source "/usr/local/opt/fzf/shell/key-bindings.zsh"
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh

Write Preview
Loading…
Cancel
Save