aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nvim/autocmd.vim6
-rw-r--r--nvim/keymaps.vim3
-rw-r--r--nvim/plugins.vim9
-rw-r--r--nvim/settings.vim13
-rw-r--r--tmux/tmux.conf6
5 files changed, 32 insertions, 5 deletions
diff --git a/nvim/autocmd.vim b/nvim/autocmd.vim
index e6d07ee..e00153f 100644
--- a/nvim/autocmd.vim
+++ b/nvim/autocmd.vim
@@ -1,5 +1,5 @@
1autocmd VimEnter * NERDTree | wincmd p 1"autocmd VimEnter * NERDTree | wincmd p
2autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif 2"autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
3autocmd BufWinEnter * if getcmdwintype() == '' | silent NERDTreeMirror | endif 3"autocmd BufWinEnter * if getcmdwintype() == '' | silent NERDTreeMirror | endif
4 4
5autocmd FileType html,css EmmetInstall 5autocmd FileType html,css EmmetInstall
diff --git a/nvim/keymaps.vim b/nvim/keymaps.vim
index 6facd32..6c2ee1b 100644
--- a/nvim/keymaps.vim
+++ b/nvim/keymaps.vim
@@ -23,6 +23,9 @@ vnoremap <A-k> :m '<-2<CR>gv=gv
23map j gj 23map j gj
24map k gk 24map k gk
25 25
26" Funktionstasten
26nnoremap <F4> :NERDTreeToggle<CR> 27nnoremap <F4> :NERDTreeToggle<CR>
27nnoremap <F5> :make<CR> 28nnoremap <F5> :make<CR>
29nnoremap <F7> :MundoToggle<CR>
30nnoremap <F8> :TagbarToggle<CR>
28 31
diff --git a/nvim/plugins.vim b/nvim/plugins.vim
index 8bbb15d..4d234d8 100644
--- a/nvim/plugins.vim
+++ b/nvim/plugins.vim
@@ -8,10 +8,12 @@ endif
8call plug#begin() 8call plug#begin()
9 Plug 'mattn/emmet-vim' 9 Plug 'mattn/emmet-vim'
10 Plug 'romainl/vim-cool' 10 Plug 'romainl/vim-cool'
11 Plug 'preservim/tagbar'
11 Plug 'preservim/nerdtree' 12 Plug 'preservim/nerdtree'
12 Plug 'Xuyuanp/nerdtree-git-plugin' 13 Plug 'Xuyuanp/nerdtree-git-plugin'
13 Plug 'tpope/vim-repeat' 14 Plug 'tpope/vim-repeat'
14 Plug 'tpope/vim-surround' 15 Plug 'tpope/vim-surround'
16 Plug 'simnalamburt/vim-mundo'
15call plug#end() 17call plug#end()
16 18
17" EMMET 19" EMMET
@@ -33,3 +35,10 @@ let g:WebDevIconsUnicodeDecorateFolderNodes=1
33let g:DevIconsEnableFoldersOpenClose=1 35let g:DevIconsEnableFoldersOpenClose=1
34let g:WebDevIconsNerdTreeBeforeGlyphPadding='' 36let g:WebDevIconsNerdTreeBeforeGlyphPadding=''
35 37
38" Tagbar
39let g:tagbar_ctags_bin='/usr/local/bin/uctags'
40
41" Vimundo
42let g:mundo_right=1
43let g:mundo_width=40
44let g:mundo_preview_height=30
diff --git a/nvim/settings.vim b/nvim/settings.vim
index 773bcd6..7500225 100644
--- a/nvim/settings.vim
+++ b/nvim/settings.vim
@@ -9,6 +9,7 @@ set wildmenu
9set noshowcmd 9set noshowcmd
10set splitright 10set splitright
11set splitbelow 11set splitbelow
12set hidden
12 13
13" Rechtsschreibprüfung 14" Rechtsschreibprüfung
14set spell 15set spell
@@ -52,6 +53,18 @@ set foldcolumn=0
52" externe Programme 53" externe Programme
53set makeprg=gmake 54set makeprg=gmake
54 55
56" provider
57let g:python3_host_prog='/usr/local/bin/python'
58let g:loaded_node_provider=0
59let g:loaded_ruby_provider=0
60let g:loaded_perl_provider=0
61
62" Swap files und UnDo
63set noswapfile
64set undofile
65set undolevels=10000
66set undoreload=10000
67
55" weitere Einstellungen 68" weitere Einstellungen
56syntax enable 69syntax enable
57filetype plugin indent on 70filetype plugin indent on
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 464d5bd..dba81bd 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -1,5 +1,6 @@
1set -g mouse on 1set -g mouse on
2set -g default-terminal "xterm-256color" 2set -g default-terminal "tmux-256color"
3set -sa terminal-overrides ',xterm-256color:Tc'
3set -g status on 4set -g status on
4set -g status-left " " 5set -g status-left " "
5set -g status-right "| #[fg=white]#(curl 'wttr.in/Störnstein?format="%%l:+%%t+%%w"')#[fg=black] | #[fg=darkblue]#(date '+%H:%M') " 6set -g status-right "| #[fg=white]#(curl 'wttr.in/Störnstein?format="%%l:+%%t+%%w"')#[fg=black] | #[fg=darkblue]#(date '+%H:%M') "
@@ -9,8 +10,9 @@ set -g history-limit 10000
9set -g escape-time 0 10set -g escape-time 0
10set -g aggressive-resize on 11set -g aggressive-resize on
11set -g window-status-style fg=black,bg=green 12set -g window-status-style fg=black,bg=green
12set -g window-status-current-style fg=black,bg=blue,bold 13set -g window-status-current-style fg=white,bg=blue,bold
13set -g mode-keys vi 14set -g mode-keys vi
15set -g focus-events on
14 16
15bind -n C-S-Left previous-window 17bind -n C-S-Left previous-window
16bind -n C-S-Right next-window 18bind -n C-S-Right next-window