made it pretty

This commit is contained in:
Stefan Friese 2023-07-26 12:00:10 +02:00
parent b9db184a09
commit 0409ac4005
3 changed files with 107 additions and 28 deletions

3
.gitmodules vendored
View File

@ -31,3 +31,6 @@
[submodule "vim/.vim/pack/default/start/vim-flog"] [submodule "vim/.vim/pack/default/start/vim-flog"]
path = vim/.vim/pack/default/start/vim-flog path = vim/.vim/pack/default/start/vim-flog
url = https://github.com/rbong/vim-flog.git url = https://github.com/rbong/vim-flog.git
[submodule "vim/.vim/pack/default/start/vim-gitgutter"]
path = vim/.vim/pack/default/start/vim-gitgutter
url = https://github.com/airblade/vim-gitgutter.git

@ -0,0 +1 @@
Subproject commit 8a2f8199b689b93fe4391a8ba1d97dd84b86ebd6

View File

@ -6,49 +6,89 @@ syntax on
filetype plugin on filetype plugin on
set tabstop=4 shiftwidth=4 autoindent smartindent expandtab set tabstop=4 shiftwidth=4 autoindent smartindent expandtab
set mouse=v set mouse=v
"set noswapfile
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Numbering of lines " Numbering of lines
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" set relativenumber " set relativenumber
set number set number
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Runtimepath variables " Runtimepath variables
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" call -> set rtp? show the runtime path " call -> set rtp? show the runtime path
let $RTP=split(&runtimepath, ',')[0] let $RTP=split(&runtimepath, ',')[0]
let $RC="$HOME/.vimrc" let $RC="$HOME/.vimrc"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Move Swap,Backup and undo files into .vim directory " Move Swap,Backup and undo files into .vim directory
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
set directory^=$HOME/.vim/.swap// set directory^=$HOME/.vim/.swap//
set backupdir^=$HOME/.vim/.backup// set backupdir^=$HOME/.vim/.backup//
set undodir^=$HOME/.vim/.undo// set undodir^=$HOME/.vim/.undo//
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Split to the right and below " Split to the right and below
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
set splitbelow set splitbelow
set splitright set splitright
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Folding " Folding
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
set foldenable foldlevelstart=20 foldmethod=indent set foldenable foldlevelstart=20 foldmethod=indent
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Rebind shortcut to switch splits " Rebind shortcut to switch splits
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
nmap <C-h> <C-w>h nmap <C-h> <C-w>h
nmap <C-j> <C-w>j nmap <C-j> <C-w>j
nmap <C-k> <C-w>k nmap <C-k> <C-w>k
nmap <C-l> <C-w>l nmap <C-l> <C-w>l
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Finding files " Finding files
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
set path+=** set path+=**
set wildmenu set wildmenu
" Tags """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Create Tags thorugh :MakeTags
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
command! MakeTags !ctags -R . command! MakeTags !ctags -R .
set autochdir set autochdir
set tags=tags; set tags=tags;
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Execute Python Scripts
" Press F9 to run Python script " Press F9 to run Python script
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
autocmd FileType python map <buffer> <F9> :w<CR>:exec '!python3' shellescape(@%, 1)<CR> autocmd FileType python map <buffer> <F9> :w<CR>:exec '!python3' shellescape(@%, 1)<CR>
autocmd FileType python imap <buffer> <F9> <esc>:w<CR>:exec '!python3' shellescape(@%, 1)<CR> autocmd FileType python imap <buffer> <F9> <esc>:w<CR>:exec '!python3' shellescape(@%, 1)<CR>
" File browsing """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" File browsing through a tree on the left side
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
let g:netrw_banner=0 let g:netrw_banner=0
let g:netrw_browse_split=4 let g:netrw_browse_split=4
let g:netrw_altv=1 let g:netrw_altv=1
@ -57,10 +97,20 @@ let g:netrw_list_hide=netrw_gitignore#Hide()
let g:netrw_list_hide.=',\(\^\|\s\s\)\zs\.\S\+' let g:netrw_list_hide.=',\(\^\|\s\s\)\zs\.\S\+'
map <C-n> :Lex <bar> vertical resize 30 <CR> map <C-n> :Lex <bar> vertical resize 30 <CR>
" Cursorline """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Cursorline on the cursor
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
set cursorline set cursorline
hi CursorLine cterm=NONE ctermbg=darkgrey ctermfg=white hi CursorLine cterm=NONE ctermbg=darkgrey ctermfg=white
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Status Line on the bottom
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Statusline " Statusline
" function! gitbranch() " function! gitbranch()
" return system("git rev-parse --abbrev-ref head 2>/dev/null | tr -d '\n'") " return system("git rev-parse --abbrev-ref head 2>/dev/null | tr -d '\n'")
@ -102,24 +152,40 @@ set statusline+=\ %c:%l/%L
set statusline+=\ %p%% set statusline+=\ %p%%
set statusline+=\ [%n] set statusline+=\ [%n]
"packadd! indentLine
"let g: indentLine_char = '⦙'
" let g:vimspector_enable_mappings = 'HUMAN'
" packadd! vimspector
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Colors
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
set termguicolors set termguicolors
" colorscheme gruvbox " colorscheme gruvbox
colorscheme catppuccin_macchiato colorscheme catppuccin_macchiato
set bg=dark set bg=dark
packadd! vim-log-highlighting " tmux color correction
if exists('+termguicolors')
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
set termguicolors
endif
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" tagbar, press F8 " tagbar, press F8
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
nmap <F8> :TagbarToggle<CR> nmap <F8> :TagbarToggle<CR>
" ---------- Selection Highlighting
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Selection Highlighting
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" hlsearch colors " hlsearch colors
highlight Search ctermbg=black ctermfg=darkgrey ctermbg=grey highlight Search ctermbg=black ctermfg=darkgrey ctermbg=grey
" Highlight all instances of word under cursor, when idle. " Highlight all instances of word under cursor, when idle.
@ -133,11 +199,16 @@ function! AutoHighlightToggle()
endfunction endfunction
call AutoHighlightToggle() call AutoHighlightToggle()
" ----------- Code Completion
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Code Completion
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
let g:ale_enabled = 1 let g:ale_enabled = 1
let g:ale_hover_enabled = 1 let g:ale_hover_enabled = 1
" nmap gr :ALEFindReferences<CR> " nmap gr :ALEFindReferences<CR>
nmap K :ALEHover<CR> " nmap K :ALEHover<CR>
set completeopt+=menuone set completeopt+=menuone
set completeopt+=noselect set completeopt+=noselect
@ -165,23 +236,27 @@ let g:ale_set_balloons=1
"" ""
autocmd InsertLeave,CompleteDone * if pumvisible() == 0 | pclose | endif autocmd InsertLeave,CompleteDone * if pumvisible() == 0 | pclose | endif
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Remove conceal from Markdown when Insert mode is set
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
autocmd InsertEnter *.{markdown,md} set conceallevel=0
autocmd InsertLeave *.{markdown,md} set conceallevel=2
autocmd InsertEnter *.{json} set conceallevel=0
autocmd InsertLeave *.{json} set conceallevel=2
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
" Load all packages and activate tags
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
packadd! vim-log-highlighting
packloadall packloadall
" Load all of the helptags now, after plugins have been loaded. " Load all of the helptags now, after plugins have been loaded.
" All messages and errors will be ignored. " All messages and errors will be ignored.
silent! helptags ALL silent! helptags ALL
silent! helptags ALE
" tmux color correction silent! helptags vim-gitgutter/doc
if exists('+termguicolors')
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
set termguicolors
endif
" Remove conceal from Markdown when Insert mode is set
autocmd InsertEnter *.{markdown,md} set conceallevel=0
autocmd InsertLeave *.{markdown,md} set conceallevel=2
" Remove conceal from JSON when Insert mode is on
autocmd InsertEnter *.{json} set conceallevel=0
autocmd InsertLeave *.{json} set conceallevel=2