Compare commits
6 Commits
e7c411ec77
...
5d3264a3ce
Author | SHA1 | Date | |
---|---|---|---|
5d3264a3ce | |||
feaa7b7ca0 | |||
a2ae5af2bb | |||
a981a1b5a3 | |||
78930eb2d6 | |||
891a610718 |
95
init.vim
95
init.vim
@ -92,11 +92,16 @@
|
||||
" Fuzzy finding
|
||||
" Plug 'jhawthorn/fzy' " Install this systemwide (or configure a manual
|
||||
" location. See below)
|
||||
Plug 'srstevenson/vim-picker'
|
||||
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
|
||||
Plug 'junegunn/fzf.vim'
|
||||
Plug 'jesseleite/vim-agriculture'
|
||||
|
||||
" vim-telescope, dependencies, and related plugins
|
||||
Plug 'nvim-lua/plenary.nvim'
|
||||
Plug 'nvim-telescope/telescope.nvim', { 'branch': '0.1.x' }
|
||||
Plug 'nvim-telescope/telescope-ui-select.nvim'
|
||||
Plug 'stevearc/dressing.nvim'
|
||||
|
||||
" line indentation guides
|
||||
Plug 'Yggdroot/indentLine'
|
||||
|
||||
@ -189,6 +194,11 @@
|
||||
" Automatically switch fcitx5 modes based on the current vim mode
|
||||
Plug 'rlue/vim-barbaric'
|
||||
|
||||
" Arduino integration
|
||||
if system('command -v arduino-cli') != ""
|
||||
Plug 'stevearc/vim-arduino'
|
||||
endif
|
||||
|
||||
" vim-test - run perl-tests from inside the editor
|
||||
Plug 'janko-m/vim-test'
|
||||
|
||||
@ -307,22 +317,28 @@ tnoremap <Esc> <C-\><C-n>
|
||||
" \ 'gitbranch': '%{FugitiveStatusline()}',
|
||||
let g:lightline = {
|
||||
\ 'active': {
|
||||
\ 'left':[
|
||||
\ 'left': [
|
||||
\ [ 'mode', 'paste' ],
|
||||
\ [ 'gitbranch', 'readonly', 'filename', 'modified', 'lastmodified' ],
|
||||
\ [ 'gitbranch', 'arduino_board', 'arduino_programmer', 'arduino_serial_baud', 'arduino_port', 'readonly', 'filename', 'modified', 'lastmodified' ],
|
||||
\ ],
|
||||
\ },
|
||||
\ 'component': {
|
||||
\ 'lineinfo': ' %3l:%-2v',
|
||||
\ 'readonly': '%{&readonly?"":""}',
|
||||
\ 'gitbranch': '%{exists("*fugitive#head") && fugitive#head()!=""?"".fugitive#head():""}',
|
||||
\ 'lastmodified': '%{(localtime()-getftime(expand("%:p")) < 60)?"".localtime()-getftime(expand("%:p")):""}',
|
||||
\ 'readonly': '%{ &readonly ? "" : "" }',
|
||||
\ 'gitbranch': '%{ exists("*FugitiveHead") && FugitiveHead()!="" ? "".FugitiveHead() : "" }',
|
||||
\ 'lastmodified': '%{ (localtime()-getftime(expand("%:p")) < 60) ? "".localtime()-getftime(expand("%:p")) : "" }',
|
||||
\ 'arduino_board': '%{ &filetype=="arduino" ? "Board: " . ( !empty(g:arduino_board) ? g:arduino_board : "not set" ) : "" }',
|
||||
\ 'arduino_serial_baud': '%{ &filetype=="arduino" ? "Serial baud: " . ( !empty(g:arduino_serial_baud) ? g:arduino_serial_baud : "not set") : "" }',
|
||||
\ 'arduino_port': '%{ &filetype=="arduino" ? "Port: " . ( !empty(arduino#GetPort()) ? arduino#GetPort() : "not set" ) : "" }',
|
||||
\ },
|
||||
\ 'component_visible_condition': {
|
||||
\ 'readonly': '(&filetype!="help"&& &readonly)',
|
||||
\ 'modified': '(&filetype!="help"&&(&modified||!&modifiable))',
|
||||
\ 'gitbranch': '(exists("*fugitive#head") && fugitive#head()!="")',
|
||||
\ 'readonly': '(&filetype!="help" && &readonly)',
|
||||
\ 'modified': '(&filetype!="help" && (&modified||!&modifiable))',
|
||||
\ 'gitbranch': '(exists("*FugitiveHead") && FugitiveHead()!="")',
|
||||
\ 'lastmodified': '((localtime()-getftime(expand("%:p"))) < 60)',
|
||||
\ 'arduino_board': '(&filetype=="arduino")',
|
||||
\ 'arduino_serial_baud': '(&filetype=="arduino")',
|
||||
\ 'arduino_port': '(&filetype=="arduino")',
|
||||
\ },
|
||||
\ 'separator': {
|
||||
\ 'left': '',
|
||||
@ -487,46 +503,28 @@ if !(has('win32') || has('win64'))
|
||||
" nnoremap ¬ :PickerEdit ~/jobxx/<cr>
|
||||
endif
|
||||
|
||||
function! CallPickerEdit()
|
||||
function! FuzzyFileFinder()
|
||||
let l:IsInGitRepo = system('git rev-parse --is-inside-work-tree')
|
||||
if l:IsInGitRepo =~ 'true'
|
||||
let l:GitRepoDir = system('git rev-parse --show-toplevel')
|
||||
execute 'PickerEdit ' . l:GitRepoDir
|
||||
execute 'Telescope find_files cwd=' . l:GitRepoDir->fnameescape()
|
||||
else
|
||||
execute 'PickerEdit ' . glob('~/')
|
||||
" TODO: Verify if this works
|
||||
" if $USER =~ '^knyff$'
|
||||
" " TODO: Make PickerEdit work on windows
|
||||
" execute 'PickerEdit C:\User\' . $USER
|
||||
" PickerEdit C:\User\knyff\
|
||||
" else
|
||||
" PickerEdit ~/
|
||||
" endif
|
||||
execute 'Telescope find_files cwd=' . glob('~/')->fnameescape()
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! CallPickerPDF()
|
||||
let l:IsInGitRepo = system('git rev-parse --is-inside-work-tree')
|
||||
if l:IsInGitRepo =~ 'true'
|
||||
" TODO: Make this work
|
||||
" let l:CurrBufNr = bufnr('%')
|
||||
let l:GitRepoDir = system('git rev-parse --show-toplevel')
|
||||
call picker#File('git ls-files --cached --exclude-standard --others', 'te zathura', l:GitRepoDir)
|
||||
" execute 'b '.l:CurrBufNr
|
||||
else
|
||||
" let l:OldBufNr = bufnr('%')
|
||||
" echo bufnr('%')
|
||||
execute 'tabedit'
|
||||
call picker#File('find ' . glob('~/') . ' -type f', 'te zathura')
|
||||
" let l:CurrBufNr = bufnr('%')
|
||||
" echo bufnr('%')
|
||||
" execute 'tabclose'
|
||||
" execute 'b '.l:CurrBufNr
|
||||
endif
|
||||
nnoremap ¬ :call FuzzyFileFinder()<cr>
|
||||
|
||||
function! OpenPDFInsteadOfBuffer()
|
||||
echo expand('%')->fnameescape()
|
||||
call system('zathura ' . expand('%')->fnameescape() . ' &')
|
||||
bd
|
||||
endfunction
|
||||
|
||||
nnoremap ¬ :call CallPickerEdit()<cr>
|
||||
nnoremap ¿ :call CallPickerPDF()<cr>
|
||||
augroup OpenExternalFiles
|
||||
au!
|
||||
au FileType pdf call OpenPDFInsteadOfBuffer()
|
||||
augroup END
|
||||
endif
|
||||
|
||||
" NeoMake {{{
|
||||
@ -828,6 +826,7 @@ augroup CustomCommentDefinitions
|
||||
autocmd FileType c setlocal commentstring=\/\/\ %s
|
||||
autocmd FileType cpp setlocal commentstring=\/\/\ %s
|
||||
autocmd FileType cuda setlocal commentstring=\/\/\ %s
|
||||
autocmd FileType arduino setlocal commentstring=\/\/\ %s
|
||||
autocmd FileType openscad setlocal commentstring=\/\/\ %s
|
||||
autocmd FileType nix setlocal commentstring=#\ %s
|
||||
autocmd FileType dot setlocal commentstring=\/\/\ %s
|
||||
@ -962,6 +961,10 @@ augroup END
|
||||
\ "\\quo": "\\operatorname*{quo}",
|
||||
\ "\\rem": "\\operatorname*{rem}",
|
||||
\ "\\conv": "\\operatorname*{conv}",
|
||||
\ "\\lightning": "↯",
|
||||
\ "\\mdeg": "\\operatorname*{mdeg}",
|
||||
\ "\\lm": "\\operatorname*{lm}",
|
||||
\ "\\lt": "\\operatorname*{lt}",
|
||||
\ },
|
||||
\ },
|
||||
\ 'uml': {},
|
||||
@ -1150,6 +1153,8 @@ nnoremap <Space> :nohl<CR>
|
||||
autocmd FileType * let b:swap_completefunc = ''
|
||||
autocmd FileType tex :SwapList font_sizes tiny scriptsize footnotesize small normalsize large Large LARGE huge Huge
|
||||
autocmd FileType tex :SwapList sectioning part chapter section subsection subsubsection paragraph subparagraph
|
||||
autocmd FileType arduino :SwapList HIGHLOW HIGH LOW
|
||||
autocmd FileType arduino :SwapList pinMode OUTPUT INPUT INPUT_PULLUP
|
||||
autocmd BufEnter * let g:default_swap_list = [
|
||||
\ {'name':'yes/no', 'options': ['yes','no']},
|
||||
\ {'name':'Yes/No', 'options': ['Yes','No']},
|
||||
@ -1263,10 +1268,16 @@ endfunction
|
||||
|
||||
" Use ripgrep for vim grepping
|
||||
if executable("rg")
|
||||
set grepprg=rg\ --vimgrep\ --smart-case\ --hidden\ --auto-hybrid-regex
|
||||
set grepformat=%f:%l:%c:%m
|
||||
set grepprg=rg\ --vimgrep\ --smart-case\ --hidden\ --auto-hybrid-regex
|
||||
set grepformat=%f:%l:%c:%m
|
||||
endif
|
||||
|
||||
" vim-arduino {{{
|
||||
let g:arduino_serial_cmd = 'picocom {port} -b {baud} -q'
|
||||
let g:arduino_cli_args = '' " default: '-v'
|
||||
let g:arduino_auto_baud = 1
|
||||
" }}}
|
||||
|
||||
if $USER =~ "^jry$" && $HOSTNAME =~ "gnu"
|
||||
" Setup Perl language server
|
||||
" See https://github.com/neovim/nvim-lspconfig
|
||||
|
Loading…
Reference in New Issue
Block a user