simon/dotfiles
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove nvim

Browse source
This commit is contained in:
Simon Bruder 2020-11-07 16:58:33 +01:00
parent 36c06ef4f9
commit d7298c2f85
No known key found for this signature in database
GPG key ID: 6F03E0000CC5B62F
10 changed files with 0 additions and 288 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -4,9 +4,6 @@
[submodule "mpv-gallery-view"]
path = mpv-gallery-view
url = https://github.com/occivink/mpv-gallery-view
[submodule "vim-plug"]
path = vim-plug
url = https://github.com/junegunn/vim-plug
[submodule "grml-etc-core"]
path = grml-etc-core
url = https://github.com/grml/grml-etc-core

3
home/.config/nvim/LanguageClient.json
View file

@ -1,3 +0,0 @@
{
"rust.clippy_preference": "on"
}

7
home/.config/nvim/UltiSnips/rust.snippets
View file

@ -1,7 +0,0 @@
snippet disp "Display trait implentation"
impl fmt::Display for ${1:Struct} {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "${2}", ${3})
}
}${0}
endsnippet

19
home/.config/nvim/UltiSnips/tex.snippets
View file

@ -1,19 +0,0 @@
extends tex
snippet s "Section" b
\section{$1}
endsnippet
snippet ss "Subsection" b
\subsection{$1}
endsnippet
snippet sss "Subsubsection" b
\subsubsection{$1}
endsnippet

23
home/.config/nvim/UltiSnips/texmath.snippets
View file

@ -1,23 +0,0 @@
extends texmath
snippet qf "Quadratic formula (user is responsible for parentheses)" w
\frac{-${2:b} \pm \sqrt{$2^2 - 4 \cdot ${1:a} \cdot ${3:c}}}{2 \cdot $1}$0
endsnippet
snippet aligned "aligned environment (in math mode)" w
\begin{aligned}
$1 &= $0 \\\\
\end{aligned}
endsnippet
snippet si "Insert SI unit (only works with simple numbers)" w
\SI{${1:amount}}{${2:unit}}
endsnippet
snippet · "Insert multiplication sign" A
\cdot $0
endsnippet
snippet // "Fraction" iA
\frac{$1}{$2}$0
endsnippet

1
home/.config/nvim/autoload/plug.vim
View file

@ -1 +0,0 @@
../../../../vim-plug/plug.vim

34
home/.config/nvim/ftdetect/filetypes.vim
View file

@ -1,34 +0,0 @@
" Set unknown filetypes
autocmd BufRead,BufNewFile *.scad set filetype=openscad
autocmd BufRead,BufNewFile *.vpy set filetype=python
autocmd BufRead,BufNewFile *.tex set filetype=tex
" Set properties
autocmd Filetype arduino setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype c setlocal ts=4 sw=4 sts=4 expandtab
autocmd Filetype cpp setlocal ts=4 sw=4 sts=4 expandtab
autocmd Filetype css setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype dockerfile setlocal ts=4 sw=4 sts=4 expandtab
autocmd Filetype dot setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype gitcommit setlocal colorcolumn=72
autocmd Filetype go setlocal ts=4 sw=4 sts=4
autocmd Filetype haskell setlocal ts=4 sw=4 sts=4 expandtab
autocmd Filetype html setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype jinja.html setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype javascript setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype jinja setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype json setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype lua setlocal ts=4 sw=4 sts=4 expandtab
autocmd Filetype markdown setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype openscad setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype python setlocal ts=4 sw=4 sts=4 expandtab
autocmd Filetype sass setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype scss setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype sh setlocal ts=4 sw=4 sts=4
autocmd Filetype tex setlocal ts=1 sw=1 sts=1 expandtab
autocmd Filetype toml setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype vim setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype vue setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype xml setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype yaml setlocal ts=2 sw=2 sts=2 expandtab
autocmd Filetype zsh setlocal ts=4 sw=4 sts=4 expandtab

20
home/.config/nvim/ftplugin/python.vim
View file

@ -1,20 +0,0 @@
let b:black_disable = 0
autocmd BufWritePre <buffer> if b:black_disable != 1 | execute 'silent Black' | endif
map <Leader>b :let b:black_disable = (b:black_disable + 1) % 2<CR>
" Show icon in airline when black is disabled
" Adapted from https://github.com/ryanoasis/vim-devicons/blob/a5750c6507602a7238e1c87669c64a6d820a319d/plugin/webdevicons.vim#L567
function! BlackIconStatus()
if &filetype ==# 'python' && b:black_disable == 1
return "  "
else
return ""
endif
endfunction
function! AirlineBlackIcon(...)
let w:airline_section_x = get(w:, 'airline_section_x', get(g:, 'airline_section_x', ''))
let w:airline_section_x .= '%{BlackIconStatus()}'
endfunction
call airline#add_statusline_func('AirlineBlackIcon')

177
home/.config/nvim/init.vim
View file

@ -1,177 +0,0 @@
" Basic display
set number
set colorcolumn=80
" Persistent undo
set undofile
set undolevels=4096
set undoreload=16384
" Search
set ignorecase
" Hide search when enter is pressed
nnoremap <silent> <CR> :nohlsearch<CR>
" Autoload settings from file
set modeline
" Use system clipboard
set clipboard=unnamedplus
" Support more file encodings
set fileencodings=ucs-bom,utf-8,default,sjis,latin1
" Scroll before reaching top/bottom
set scrolloff=5
" Conceal when line is not active
set conceallevel=1
" Just hide buffer instead of unloading
set hidden
" Remap leader key
let mapleader = ","
" Jump to the last position
if has("autocmd")
au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
\| exe "normal! g`\"" | endif
endif
call plug#begin('~/.local/share/nvim/plugged')
" Multi-entry selection UI
Plug 'junegunn/fzf', { 'tag': trim(system('fzf --version')) }
" FIXME: update once nixpkgs stable has fzf ≥ 0.23
Plug 'junegunn/fzf.vim', { 'commit': '0fe8e198a3a501b54dbc4f9587526c097599f95a' }
" Per-project settings
Plug 'editorconfig/editorconfig-vim'
" Tagbar
Plug 'majutsushi/tagbar'
nmap <F8> :TagbarToggle<CR>
" Snippets
if has('python3')
Plug 'SirVer/ultisnips'
let g:UltiSnipsExpandTrigger = '<tab>'
let g:UltiSnipsJumpForwardTrigger = '<tab>'
let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
Plug 'honza/vim-snippets'
endif
" Deoplete
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
let g:deoplete#enable_at_startup = 1
" Airline
Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
let g:airline_powerline_fonts = 1
let g:airline_solarized_bg='dark'
let g:airline_theme='solarized'
" Airline for tmux
Plug 'edkolev/tmuxline.vim'
" NERDTree
Plug 'preservim/nerdtree'
Plug 'jistr/vim-nerdtree-tabs'
map <Leader>N <plug>NERDTreeTabsToggle<CR>
map <Leader>n <plug>NERDTreeFocusToggle<CR>
Plug 'Xuyuanp/nerdtree-git-plugin'
" Icons for NERDTree and airline
Plug 'ryanoasis/vim-devicons'
" Git integration
Plug 'tpope/vim-fugitive'
" Intra word motion
Plug 'chaoren/vim-wordmotion'
" Trailing whitespace highlighting
Plug 'ntpeters/vim-better-whitespace'
" Syntax highlighting/Language support
Plug 'Glench/Vim-Jinja2-Syntax', { 'for': 'jinja' }
Plug 'LnL7/vim-nix', { 'for': 'nix' }
Plug 'cespare/vim-toml', { 'for': 'toml' }
Plug 'mechatroner/rainbow_csv'
Plug 'posva/vim-vue', { 'for': 'vue' }
Plug 'sirtaj/vim-openscad', { 'for': 'openscad' }
" Language Client
Plug 'autozimu/LanguageClient-neovim', {
\ 'branch': 'next',
\ 'do': 'bash install.sh',
\ }
let g:LanguageClient_serverCommands = {
\ 'rust': ['nix-shell', '--quiet', '-p', 'rls', '--run', 'rls'],
\ 'go': ['nix-shell', '--quiet', '-p', 'gopls', '--run', 'gopls'],
\ 'python': ['nix-shell', '--quiet', '-p', 'python38Packages.python-language-server', '--run', 'pyls'],
\ 'typescript': ['nix-shell', '--quiet', '-p', 'nodePackages.javascript-typescript-langserver', '--run', 'javascript-typescript-stdio'],
\ 'javascript': ['nix-shell', '--quiet', '-p', 'nodePackages.javascript-typescript-langserver', '--run', 'javascript-typescript-stdio'],
\ 'haskell': ['nix-shell', '--quiet', '-p', 'haskellPackages.haskell-language-server', '--run', 'haskell-language-server --lsp'],
\ }
let g:LanguageClient_loggingFile = '~/.local/share/nvim/LanguageClient.log'
let g:LanguageClient_settingsPath = '~/.config/nvim/LanguageClient.json'
function LC_maps()
if has_key(g:LanguageClient_serverCommands, &filetype)
nnoremap <buffer> <silent> <F5> :call LanguageClient_contextMenu()<CR>
nnoremap <buffer> <silent> K :call LanguageClient#textDocument_hover()<CR>
nnoremap <buffer> <silent> gd :call LanguageClient#textDocument_definition()<CR>
nnoremap <buffer> <silent> <F2> :call LanguageClient#textDocument_rename()<CR>
set formatexpr=LanguageClient#textDocument_rangeFormatting_sync()
endif
endfunction
autocmd FileType * call LC_maps()
" Rust
Plug 'rust-lang/rust.vim'
let g:rustfmt_autosave_if_config_present = 1
let g:rust_fold = 1
map <Leader>rt :RustTest<CR>
" Black (python formatter)
Plug 'psf/black', { 'commit': '1d3fb871bec82d1263940ba1d32095d660fea2ab', 'for': 'python' }
" LaTeX helpers
Plug 'lervag/vimtex'
let g:tex_flavor='latex'
let g:vimtex_view_method='zathura'
let g:tex_conceal='abdmg'
let g:vimtex_syntax_autoload_packages = [
\'amsmath',
\'luacode',
\]
" this disables some helful warnings that often have a reason why I ignore them
let g:vimtex_quickfix_ignore_filters = [
\'Underfull \\hbox (badness [0-9]*) in ',
\'Overfull \\hbox ([0-9]*.[0-9]*pt too wide) in ',
\'Overfull \\vbox ([0-9]*.[0-9]*pt too high) detected ',
\'Package hyperref Warning: Token not allowed in a PDF string',
\'Package typearea Warning: Bad type area settings!',
\]
" When using math environments vim does not know if if it currently is in one
" or outside of one unless it parses the file from the start. Parsing the
" file from the start each time fixes this but leads to a performance drop
" (depending on the number of lines).
" Also, somehow using FileType tex does not work, so this will enable slow
" syntax highlighting everywhere once a *.tex file is opened.
autocmd BufEnter *.tex syntax sync fromstart
" Color schemes
Plug 'altercation/vim-colors-solarized'
call plug#end()
set background=dark
silent! colorscheme solarized

1
vim-plug

@ -1 +0,0 @@
Subproject commit 3aa3b5a4e85620dd58302926b571860c92fdbb2f