From 5d3264a3ceb8a8a34ce32b1e316c2db890857ee9 Mon Sep 17 00:00:00 2001 From: Knyffen Date: Fri, 17 Nov 2023 09:42:30 +0100 Subject: [PATCH] Arduino improvements Spacing --- init.vim | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/init.vim b/init.vim index 4af2870..bb6dfac 100644 --- a/init.vim +++ b/init.vim @@ -317,22 +317,28 @@ tnoremap " \ '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("*FugitiveHead") && FugitiveHead()!=""?"".FugitiveHead():""}', - \ '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))', + \ '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': '', @@ -820,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 @@ -1146,6 +1153,8 @@ nnoremap :nohl 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']}, @@ -1259,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