From 0395bcb124c3be383489c9ca1f9cd1c57081bcea Mon Sep 17 00:00:00 2001 From: Julian T Date: Mon, 18 May 2020 12:10:52 +0200 Subject: Tabs to spaces --- vim/.vimrc | 296 ++++++++++++++++++++++++------------------------ xinit/Scripts/xlaunchrc | 28 ++--- 2 files changed, 162 insertions(+), 162 deletions(-) diff --git a/vim/.vimrc b/vim/.vimrc index b7fdaf9..10f64b6 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -3,157 +3,157 @@ filetype plugin on set shellslash " Plugins - " set the runtime path to include Vundle and initialize - set rtp+=~/.vim/bundle/Vundle.vim - call vundle#begin() - " alternatively, pass a path where Vundle should install plugins - "call vundle#begin('~/some/path/here') - - " let Vundle manage Vundle, required - Plugin 'VundleVim/Vundle.vim' - - " Completion - Plugin 'prabirshrestha/async.vim' - Plugin 'prabirshrestha/vim-lsp' - Plugin 'fatih/vim-go' - Plugin 'ajh17/VimCompletesMe' - - Plugin 'tpope/vim-surround' - Plugin 'tpope/vim-repeat' - Plugin 'tpope/vim-unimpaired' - Plugin 'tpope/vim-commentary' - - Plugin 'godlygeek/tabular' - - " Editor config - " Plugin 'editorconfig/editorconfig-vim' - - " Color theme - " Plugin 'agude/vim-eldar' - " Plugin 'ntk148v/vim-horizon' - " Plugin 'rakr/vim-colors-rakr' - " Plugin 'rakr/vim-one' - Plugin 'morhetz/gruvbox' - " Plugin 'ntk148v/vim-horizon' - - " Git - Plugin 'tpope/vim-fugitive' - - " File support - " Plugin 'cespare/vim-toml' - Plugin 'lervag/vimtex' - - " Plugin 'vimwiki/vimwiki' - - - " Snippets are separated from the engine. Add this if you want them: - " Plugin 'honza/vim-snippets' - - call vundle#end() " required - filetype plugin indent on " required + " set the runtime path to include Vundle and initialize + set rtp+=~/.vim/bundle/Vundle.vim + call vundle#begin() + " alternatively, pass a path where Vundle should install plugins + "call vundle#begin('~/some/path/here') + + " let Vundle manage Vundle, required + Plugin 'VundleVim/Vundle.vim' + + " Completion + Plugin 'prabirshrestha/async.vim' + Plugin 'prabirshrestha/vim-lsp' + Plugin 'fatih/vim-go' + Plugin 'ajh17/VimCompletesMe' + + Plugin 'tpope/vim-surround' + Plugin 'tpope/vim-repeat' + Plugin 'tpope/vim-unimpaired' + Plugin 'tpope/vim-commentary' + + Plugin 'godlygeek/tabular' + + " Editor config + " Plugin 'editorconfig/editorconfig-vim' + + " Color theme + " Plugin 'agude/vim-eldar' + " Plugin 'ntk148v/vim-horizon' + " Plugin 'rakr/vim-colors-rakr' + " Plugin 'rakr/vim-one' + Plugin 'morhetz/gruvbox' + " Plugin 'ntk148v/vim-horizon' + + " Git + Plugin 'tpope/vim-fugitive' + + " File support + " Plugin 'cespare/vim-toml' + Plugin 'lervag/vimtex' + + " Plugin 'vimwiki/vimwiki' + + + " Snippets are separated from the engine. Add this if you want them: + " Plugin 'honza/vim-snippets' + + call vundle#end() " required + filetype plugin indent on " required " Completion - set completeopt=menuone - " let g:go_def_mode='gopls' - " let g:go_info_mode='gopls' + set completeopt=menuone + " let g:go_def_mode='gopls' + " let g:go_info_mode='gopls' - autocmd FileType c let b:vcm_tab_complete = 'omni' - autocmd FileType py let b:vcm_tab_complete = 'omni' - autocmd FileType go let b:vcm_tab_complete = 'omni' - autocmd FileType vim let b:vcm_tab_complete = 'vim' + autocmd FileType c let b:vcm_tab_complete = 'omni' + autocmd FileType py let b:vcm_tab_complete = 'omni' + autocmd FileType go let b:vcm_tab_complete = 'omni' + autocmd FileType vim let b:vcm_tab_complete = 'vim' " Lsp options - let g:lsp_diagnostics_echo_cursor = 0 - let g:lsp_signature_help_enabled = 0 - let g:lsp_insert_text_enabled = 0 - - " Setup lsp servers - if executable('pyls') - au User lsp_setup call lsp#register_server({ - \ 'name': 'python', - \ 'cmd': {server_info->['pyls']}, - \ 'whitelist': ['python'], - \ }) - endif - if executable('clangd') - au User lsp_setup call lsp#register_server({ - \ 'name': 'clangd', - \ 'cmd': {server_info->['clangd']}, - \ 'whitelist': ['c', 'cpp'], - \ }) - endif - if executable('gopls') - au User lsp_setup call lsp#register_server({ - \ 'name': 'golang', - \ 'cmd': {server_info->['gopls']}, - \ 'whitelist': ['go'], - \ }) - endif - - " Enable csp if available, stolen from lsp github - function! s:on_lsp_buffer_enabled() abort - echo "Enabling lsp" - set omnifunc=lsp#complete - set signcolumn=yes - nmap gd (lsp-definition) - nmap (lsp-rename) - " refer to doc to add more commands - endfunction - - augroup lsp_install - au! - " call s:on_lsp_buffer_enabled only for languages that has the server registered. - autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled() - augroup END + let g:lsp_diagnostics_echo_cursor = 0 + let g:lsp_signature_help_enabled = 0 + let g:lsp_insert_text_enabled = 0 + + " Setup lsp servers + if executable('pyls') + au User lsp_setup call lsp#register_server({ + \ 'name': 'python', + \ 'cmd': {server_info->['pyls']}, + \ 'whitelist': ['python'], + \ }) + endif + if executable('clangd') + au User lsp_setup call lsp#register_server({ + \ 'name': 'clangd', + \ 'cmd': {server_info->['clangd']}, + \ 'whitelist': ['c', 'cpp'], + \ }) + endif + if executable('gopls') + au User lsp_setup call lsp#register_server({ + \ 'name': 'golang', + \ 'cmd': {server_info->['gopls']}, + \ 'whitelist': ['go'], + \ }) + endif + + " Enable csp if available, stolen from lsp github + function! s:on_lsp_buffer_enabled() abort + echo "Enabling lsp" + set omnifunc=lsp#complete + set signcolumn=yes + nmap gd (lsp-definition) + nmap (lsp-rename) + " refer to doc to add more commands + endfunction + + augroup lsp_install + au! + " call s:on_lsp_buffer_enabled only for languages that has the server registered. + autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled() + augroup END " General vim settings - syntax enable - set number - set relativenumber + syntax enable + set number + set relativenumber - " More sensible splitting - set splitbelow splitright + " More sensible splitting + set splitbelow splitright - set tabstop=4 - set softtabstop=4 + set tabstop=4 + set softtabstop=4 set shiftwidth=4 - set expandtab - set colorcolumn=79 + set expandtab + set colorcolumn=79 - " Show 5 lines above and below cursor - set scrolloff=5 + " Show 5 lines above and below cursor + set scrolloff=5 set list - " Remove statusline - set laststatus=1 + " Remove statusline + set laststatus=1 - if has('nvim') - set inccommand=split - endif + if has('nvim') + set inccommand=split + endif - set hidden + set hidden - " Case insensitive search if all letters are small - set smartcase - set ignorecase + " Case insensitive search if all letters are small + set smartcase + set ignorecase - " Persistent undo - set undofile + " Persistent undo + set undofile - set autoread + set autoread - " Exit insert mode on inactivity - " au CursorHoldI * stopinsert + " Exit insert mode on inactivity + " au CursorHoldI * stopinsert " Vimwiki stuff - let g:vimwiki_list = [{'path': '~/Documents/vimwiki', 'path_html': '~/Documents/vimwiki/export'}] + let g:vimwiki_list = [{'path': '~/Documents/vimwiki', 'path_html': '~/Documents/vimwiki/export'}] " Latex stuff - let g:tex_flavor='latex' + let g:tex_flavor='latex' - let g:vimtex_quickfix_blgparser = {'disable': 1} - let g:vimtex_quickfix_open_on_warning = 0 - let g:vimtex_compiler_latexmk = { + let g:vimtex_quickfix_blgparser = {'disable': 1} + let g:vimtex_quickfix_open_on_warning = 0 + let g:vimtex_compiler_latexmk = { \ 'backend' : 'nvim', \ 'background' : 0, \ 'build_dir' : '', @@ -168,36 +168,36 @@ set shellslash \} " File management - " Fuzzy like menu - set path+=** - set wildmenu + " Fuzzy like menu + set path+=** + set wildmenu - let g:netrw_liststyle=2 - let g:netrw_banner = 0 + let g:netrw_liststyle=2 + let g:netrw_banner = 0 " Keymapping - " When moving more lines make it a jump. If couns i 2 it will run m'2j, - " thus storing it on the jumplist and then jumping - nnoremap j (v:count > 1 ? "m'" . v:count : '' ) . 'j' - nnoremap k (v:count > 1 ? "m'" . v:count : '' ) . 'k' + " When moving more lines make it a jump. If couns i 2 it will run m'2j, + " thus storing it on the jumplist and then jumping + nnoremap j (v:count > 1 ? "m'" . v:count : '' ) . 'j' + nnoremap k (v:count > 1 ? "m'" . v:count : '' ) . 'k' - " Leader stuff - let mapleader=" " + " Leader stuff + let mapleader=" " - map mm :make V=1 - map mf :make flash V=1 + map mm :make V=1 + map mf :make flash V=1 " Enforcing filetypes - autocmd BufRead,BufNewFile *.ino set filetype=c - autocmd BufRead,BufNewFile *.asc set filetype=asciidoc + autocmd BufRead,BufNewFile *.ino set filetype=c + autocmd BufRead,BufNewFile *.asc set filetype=asciidoc " Highlightning And colors - set termguicolors - " let g:one_allow_italics = 1 - let g:gruvbox_italic = 1 - colorscheme gruvbox + set termguicolors + " let g:one_allow_italics = 1 + let g:gruvbox_italic = 1 + colorscheme gruvbox " Spell check - set spelllang=en - autocmd FileType tex,markdown,rst set spell + set spelllang=en + autocmd FileType tex,markdown,rst set spell diff --git a/xinit/Scripts/xlaunchrc b/xinit/Scripts/xlaunchrc index c24f4d9..05d65cf 100755 --- a/xinit/Scripts/xlaunchrc +++ b/xinit/Scripts/xlaunchrc @@ -26,19 +26,19 @@ dbus-update-activation-environment --systemd DISPLAY for arg in "$LOPTS" do - case $arg in - *"panel"*) - echo starting panel - xfce4-panel & - ;; - *"composer"*) - echo starting comp - xcompmgr & - ;; - *"gnome-keyring"*) - dbus-update-activation-environment --systemd DISPLAY & - eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets) & - ;; + case $arg in + *"panel"*) + echo starting panel + xfce4-panel & + ;; + *"composer"*) + echo starting comp + xcompmgr & + ;; + *"gnome-keyring"*) + dbus-update-activation-environment --systemd DISPLAY & + eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets) & + ;; *"screensaver"*) xscreensaver & xss-lock -- xscreensaver-command --lock & @@ -46,7 +46,7 @@ do *"autorandr"*) autorandr -c ;; - esac + esac done -- cgit v1.2.3