Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
  • dotfiles/vim
1 result
Select Git revision
Loading items
Show changes
Commits on Source (8)
{ {
"languageserver": {
"ccls": {
"command": "ccls",
"filetypes": ["c", "cpp", "cuda", "objc", "objcpp"],
"rootPatterns": [".ccls-root", "compile_commands.json"],
"initializationOptions": {
"cache": {
"directory": ".ccls-cache"
},
"client": {
"snippetSupport": true
}
}
}
},
// diagnostic-languageserver // diagnostic-languageserver
"diagnostic-languageserver.enable": true, "diagnostic-languageserver.enable": true,
"diagnostic-languageserver.mergeConfig": false, "diagnostic-languageserver.mergeConfig": false,
...@@ -158,6 +143,7 @@ ...@@ -158,6 +143,7 @@
"ACTL", "ACTL",
"ADDRE", "ADDRE",
"ALGO", "ALGO",
"ALTA",
"ARTCSP", "ARTCSP",
"ASIC", "ASIC",
"ASYNCH", "ASYNCH",
...@@ -179,6 +165,7 @@ ...@@ -179,6 +165,7 @@
"AwesomeWM", "AwesomeWM",
"BANKB", "BANKB",
"BAUDRATE", "BAUDRATE",
"BBPR",
"BKSWRST", "BKSWRST",
"BOOTPROT", "BOOTPROT",
"BTreeMap", "BTreeMap",
...@@ -191,6 +178,7 @@ ...@@ -191,6 +178,7 @@
"Bootprotection", "Bootprotection",
"Brusell", "Brusell",
"Buildroot", "Buildroot",
"CACHERAM",
"CARCFG", "CARCFG",
"CBOR", "CBOR",
"CBPDIS", "CBPDIS",
...@@ -226,17 +214,50 @@ ...@@ -226,17 +214,50 @@
"Conv", "Conv",
"Cpuram", "Cpuram",
"Ctype", "Ctype",
"DALL",
"DARCHITECTURE",
"DARM",
"DBBPR",
"DBGT",
"DCURRENT",
"DDEBUG",
"DDMA",
"DEBOUNCEN", "DEBOUNCEN",
"DEXTERNAL",
"DFAMILY",
"DFLPR",
"DFPGA",
"DGLOBAL",
"DGMRAM",
"DGUNILLAS",
"DHALTIUM",
"DHFV",
"DIAG", "DIAG",
"DINTERNAL",
"DIRCLR", "DIRCLR",
"DLCS",
"DLILIUMSOC",
"DMA", "DMA",
"DMAIN",
"DNRF",
"DNVM",
"DPLLCTRLA", "DPLLCTRLA",
"DPLLCTRLB", "DPLLCTRLB",
"DPLLRATIO", "DPLLRATIO",
"DPPR",
"DPRODUCT",
"DRADIO",
"DRNGSEED", "DRNGSEED",
"DRTL",
"DSCR", "DSCR",
"DSEC",
"DSECURE",
"DSTM",
"DSU", "DSU",
"DSYSCTRL",
"DSYSTEM",
"DUT's", "DUT's",
"DVERSION",
"DWT", "DWT",
"Damiano", "Damiano",
"Danaux", "Danaux",
...@@ -266,6 +287,7 @@ ...@@ -266,6 +287,7 @@
"EXTI1", "EXTI1",
"EXTI2", "EXTI2",
"EXTI3", "EXTI3",
"EXTMEM",
"Enhetsvektor", "Enhetsvektor",
"Epostadress", "Epostadress",
"Eposthistoriken", "Eposthistoriken",
...@@ -275,6 +297,7 @@ ...@@ -275,6 +297,7 @@
"FFI", "FFI",
"FILTE", "FILTE",
"FLASHSIZE", "FLASHSIZE",
"FLPR",
"Feriejobb", "Feriejobb",
"Flashmode", "Flashmode",
"Flashmodes", "Flashmodes",
...@@ -288,6 +311,7 @@ ...@@ -288,6 +311,7 @@
"GHA", "GHA",
"GHAS", "GHAS",
"GHASH", "GHASH",
"GMRAM",
"GND", "GND",
"GPIO", "GPIO",
"GPIOA", "GPIOA",
...@@ -296,6 +320,7 @@ ...@@ -296,6 +320,7 @@
"GPIOI", "GPIOI",
"GPIOTE", "GPIOTE",
"GPIOs", "GPIOs",
"GROM",
"Gatewaying", "Gatewaying",
"Gclk", "Gclk",
"GitLab", "GitLab",
...@@ -303,6 +328,7 @@ ...@@ -303,6 +328,7 @@
"Grepit", "Grepit",
"Grundkurs", "Grundkurs",
"Gränssnitt", "Gränssnitt",
"HFCLKSTAT",
"HOTP", "HOTP",
"HW", "HW",
"Haltium", "Haltium",
...@@ -318,6 +344,7 @@ ...@@ -318,6 +344,7 @@
"ISR", "ISR",
"ITM", "ITM",
"ITMDump", "ITMDump",
"Ibuild",
"Idents", "Idents",
"Ints", "Ints",
"IoT", "IoT",
...@@ -355,6 +382,7 @@ ...@@ -355,6 +382,7 @@
"MISO", "MISO",
"MMIO", "MMIO",
"MOSI", "MOSI",
"MRAM",
"MSRV", "MSRV",
"Macrocell", "Macrocell",
"Maskable", "Maskable",
...@@ -367,9 +395,11 @@ ...@@ -367,9 +395,11 @@
"Mthd", "Mthd",
"Munns", "Munns",
"Mutex", "Mutex",
"NFCT",
"NMIENCLR", "NMIENCLR",
"NMIENSET", "NMIENSET",
"NMIFLAG", "NMIFLAG",
"NONSECURE",
"NVIC", "NVIC",
"NVM", "NVM",
"NVMCTRL", "NVMCTRL",
...@@ -393,6 +423,7 @@ ...@@ -393,6 +423,7 @@
"PAGESIZE", "PAGESIZE",
"PARTNO", "PARTNO",
"PID", "PID",
"PINSET",
"PMIC", "PMIC",
"POOKEY", "POOKEY",
"PRIMASK", "PRIMASK",
...@@ -460,6 +491,7 @@ ...@@ -460,6 +491,7 @@
"SLOC", "SLOC",
"SMT", "SMT",
"SPI", "SPI",
"SPIM",
"SRP", "SRP",
"STM", "STM",
"STM32", "STM32",
...@@ -523,11 +555,14 @@ ...@@ -523,11 +555,14 @@
"UARTs", "UARTs",
"UDEV", "UDEV",
"UI", "UI",
"UNENCRY",
"UNINNIT", "UNINNIT",
"URAD", "URAD",
"URAT", "URAT",
"USART2", "USART2",
"USARTs", "USARTs",
"USBD",
"USBH",
"USEE", "USEE",
"Ultrascale", "Ultrascale",
"Undel", "Undel",
...@@ -539,6 +574,7 @@ ...@@ -539,6 +574,7 @@
"Utvecklarinformation", "Utvecklarinformation",
"V3", "V3",
"VBFs", "VBFs",
"VBUS",
"VCC", "VCC",
"VECS", "VECS",
"VIUs", "VIUs",
...@@ -560,10 +596,13 @@ ...@@ -560,10 +596,13 @@
"WWAN", "WWAN",
"WWDG", "WWDG",
"Wahlquist", "Wahlquist",
"Werror",
"Wextra",
"Winsa", "Winsa",
"XCVU", "XCVU",
"XORed", "XORed",
"XOUT", "XOUT",
"XXAA",
"Xargo", "Xargo",
"Xeri", "Xeri",
"Xidfc", "Xidfc",
...@@ -577,6 +616,7 @@ ...@@ -577,6 +616,7 @@
"actf", "actf",
"aesmode", "aesmode",
"afirst", "afirst",
"ahbap",
"ahbmask", "ahbmask",
"ahbs", "ahbs",
"aktiveringstid", "aktiveringstid",
...@@ -654,6 +694,7 @@ ...@@ -654,6 +694,7 @@
"checkexamples", "checkexamples",
"checkmacros", "checkmacros",
"checkopt", "checkopt",
"cifra",
"ciplen", "ciplen",
"cksum", "cksum",
"cleanup", "cleanup",
...@@ -665,11 +706,14 @@ ...@@ -665,11 +706,14 @@
"cmdex", "cmdex",
"cntr", "cntr",
"codegen", "codegen",
"comlink",
"compat", "compat",
"compiledb",
"concat", "concat",
"const", "const",
"consts", "consts",
"contiki", "contiki",
"coremark",
"cosinussatsen", "cosinussatsen",
"countsync", "countsync",
"croutes", "croutes",
...@@ -765,8 +809,10 @@ ...@@ -765,8 +809,10 @@
"exekveringsmodeller", "exekveringsmodeller",
"extint", "extint",
"extintpin", "extintpin",
"falign",
"fancyhdr", "fancyhdr",
"fastboot", "fastboot",
"ffunction",
"fidx", "fidx",
"fifo", "fifo",
"figurtexter", "figurtexter",
...@@ -776,6 +822,8 @@ ...@@ -776,6 +822,8 @@
"flashable", "flashable",
"flashbank", "flashbank",
"flavor", "flavor",
"fmax",
"fomit",
"formatcp", "formatcp",
"forskningsartiklar", "forskningsartiklar",
"forskningspapper", "forskningspapper",
...@@ -794,6 +842,7 @@ ...@@ -794,6 +842,7 @@
"getswlm", "getswlm",
"gfmcmp", "gfmcmp",
"gfmul", "gfmul",
"ggdb",
"gpio", "gpio",
"gridlayout", "gridlayout",
"gsettings", "gsettings",
...@@ -832,6 +881,7 @@ ...@@ -832,6 +881,7 @@
"intflag", "intflag",
"introductional", "introductional",
"io", "io",
"ipct",
"iser", "iser",
"itm", "itm",
"jokertecken", "jokertecken",
...@@ -862,7 +912,9 @@ ...@@ -862,7 +912,9 @@
"legalpaper", "legalpaper",
"letterpaper", "letterpaper",
"letterspacing", "letterspacing",
"lfclk",
"lightgray", "lightgray",
"liliumsoc",
"linkchecker", "linkchecker",
"linkedin", "linkedin",
"linux", "linux",
...@@ -879,6 +931,8 @@ ...@@ -879,6 +931,8 @@
"mars", "mars",
"masq", "masq",
"matchclr", "matchclr",
"mcmse",
"mcpu",
"md", "md",
"mdbook", "mdbook",
"meddelanderad", "meddelanderad",
...@@ -890,6 +944,7 @@ ...@@ -890,6 +944,7 @@
"messageram", "messageram",
"metaprogramming", "metaprogramming",
"metodbeskrivningen", "metodbeskrivningen",
"mfloat",
"microcontroller", "microcontroller",
"microcontrollers", "microcontrollers",
"microkernel", "microkernel",
...@@ -904,6 +959,8 @@ ...@@ -904,6 +959,8 @@
"momentaneous", "momentaneous",
"motorvärmare", "motorvärmare",
"mottagaradress", "mottagaradress",
"msoft",
"mthumb",
"mult", "mult",
"multibib", "multibib",
"multiremove", "multiremove",
...@@ -920,6 +977,7 @@ ...@@ -920,6 +977,7 @@
"noexecstack", "noexecstack",
"nondeleted", "nondeleted",
"nonempty", "nonempty",
"nvmc",
"nvmp", "nvmp",
"oathmode", "oathmode",
"oathtool", "oathtool",
...@@ -998,6 +1056,7 @@ ...@@ -998,6 +1056,7 @@
"regexstöd", "regexstöd",
"relän", "relän",
"repo", "repo",
"repower",
"repr", "repr",
"resched", "resched",
"resendings", "resendings",
...@@ -1021,6 +1080,7 @@ ...@@ -1021,6 +1080,7 @@
"rustfmt", "rustfmt",
"rustup", "rustup",
"rxts", "rxts",
"saadc",
"samd", "samd",
"sblk", "sblk",
"schedulability", "schedulability",
...@@ -1050,6 +1110,7 @@ ...@@ -1050,6 +1110,7 @@
"socmodtest", "socmodtest",
"spawnee", "spawnee",
"specialtecken", "specialtecken",
"spiss",
"spki", "spki",
"spsc", "spsc",
"src", "src",
...@@ -1150,6 +1211,7 @@ ...@@ -1150,6 +1211,7 @@
"v2", "v2",
"videostreaming", "videostreaming",
"virtualenv", "virtualenv",
"vref",
"vscode", "vscode",
"wakeups", "wakeups",
"wbuf", "wbuf",
...@@ -1173,5 +1235,6 @@ ...@@ -1173,5 +1235,6 @@
"yaml", "yaml",
"zcvf", "zcvf",
"ämnesvalet" "ämnesvalet"
] ],
"clangd.path": "~/.config/coc/extensions/coc-clangd-data/install/14.0.3/clangd_14.0.3/bin/clangd"
} }
...@@ -277,9 +277,6 @@ else ...@@ -277,9 +277,6 @@ else
" Grammatical checking " Grammatical checking
Plug 'rhysd/vim-grammarous' Plug 'rhysd/vim-grammarous'
" Tag generation for ctags
"Plug 'ludovicchabant/vim-gutentags'
" Rust-lang support " Rust-lang support
Plug 'rust-lang/rust.vim' Plug 'rust-lang/rust.vim'
...@@ -947,9 +944,29 @@ nmap <silent> <leader>gt :call CocAction('jumpDefinition', 'tabe')<CR> ...@@ -947,9 +944,29 @@ nmap <silent> <leader>gt :call CocAction('jumpDefinition', 'tabe')<CR>
nmap <silent> <leader>me <Plug>(coc-command)expandMacro nmap <silent> <leader>me <Plug>(coc-command)expandMacro
nmap <silent> <leader>gh :CocCommand clangd.switchSourceHeader<CR>
nmap <silent> <leader>gH :CocCommand clangd.switchSourceHeader vsplit<CR>
nmap <silent> <leader>gsi :CocCommand clangd.SymbolInfo<CR>
" From coc-completion-help 2022-08-01
inoremap <expr> <cr> coc#pum#visible() ? coc#_select_confirm() : "\<CR>"
" Use K to show documentation in preview window " Use K to show documentation in preview window
nnoremap <silent> K :call <SID>show_documentation()<CR> nnoremap <silent> K :call <SID>show_documentation()<CR>
function! s:check_back_space() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~ '\s'
endfunction
" Insert <tab> when previous text is space, refresh completion if not.
inoremap <silent><expr> <TAB>
\ coc#pum#visible() ? coc#pum#next(1):
\ <SID>check_back_space() ? "\<Tab>" :
\ coc#refresh()
inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
function! s:show_documentation() function! s:show_documentation()
if (index(['vim','help'], &filetype) >= 0) if (index(['vim','help'], &filetype) >= 0)
execute 'h '.expand('<cword>') execute 'h '.expand('<cword>')
...@@ -1042,14 +1059,21 @@ let g:coc_global_extensions = [ ...@@ -1042,14 +1059,21 @@ let g:coc_global_extensions = [
\'coc-markdownlint', \'coc-markdownlint',
\'coc-yaml', \'coc-yaml',
\'coc-toml', \'coc-toml',
\'coc-xml',
\'coc-pyright', \'coc-pyright',
\'coc-diagnostic', \'coc-diagnostic',
\'coc-spell-checker', \'coc-spell-checker',
\'coc-ltex', \'coc-ltex',
\'coc-cspell-dicts', \'coc-cspell-dicts',
\'coc-clangd', \'coc-clangd',
\'coc-snippets',
\'coc-git',
\'coc-vimtex'] \'coc-vimtex']
" Of interest later:
"\'coc-explorer',
" Conflict with coc-git and coc-explorer https://github.com/weirongxu/coc-explorer/issues/480
" Coc END " Coc END
nnoremap <silent> <leader>lt :!languagetool -l en-GB -d DOUBLE_PUNCTUATION,MORFOLOGIK_RULE_EN_GB,ARROWS[1],NON_STANDARD_WORD[1] %<CR> nnoremap <silent> <leader>lt :!languagetool -l en-GB -d DOUBLE_PUNCTUATION,MORFOLOGIK_RULE_EN_GB,ARROWS[1],NON_STANDARD_WORD[1] %<CR>
...@@ -1143,8 +1167,7 @@ let g:fzf_preview_window = 'right:60%' ...@@ -1143,8 +1167,7 @@ let g:fzf_preview_window = 'right:60%'
let g:fzf_buffers_jump = 1 " [Buffers] to existing split let g:fzf_buffers_jump = 1 " [Buffers] to existing split
let $FZF_DEFAULT_COMMAND='rg --vimgrep --no-heading --color=never --smart-case --hidden --files-with-matches -g\!.git -g\!.pijul -g\!.ccls-cache . || git ls-tree -r --name-only HEAD || fd --type f || find .' let $FZF_DEFAULT_COMMAND='rg --vimgrep --no-heading --color=never --smart-case --hidden --files-with-matches -g\!.git -g\!.pijul -g\!.ccls-cache -g\!\*.svd . || git ls-tree -r --name-only HEAD || fd --type f || find .'
"Get Files "Get Files
"command! -bang -nargs=? -complete=dir Files "command! -bang -nargs=? -complete=dir Files
...@@ -1153,12 +1176,12 @@ let $FZF_DEFAULT_COMMAND='rg --vimgrep --no-heading --color=never --smart-case - ...@@ -1153,12 +1176,12 @@ let $FZF_DEFAULT_COMMAND='rg --vimgrep --no-heading --color=never --smart-case -
"" Get text in files with Rg "" Get text in files with Rg
"command! -bang -nargs=* Rg "command! -bang -nargs=* Rg
" \ call fzf#vim#grep( " \ call fzf#vim#grep(
"\ 'rg --column --line-number --no-heading --color=always --smart-case '.shellescape(<q-args>), 1, " \ 'rg --vimgrep --no-heading --color=always --smart-case --hidden -g\!.git -g\!.pijul -g\!.ccls-cache -g\!\*.svd .'.shellescape(<q-args>), 1,
" \ fzf#vim#with_preview(), <bang>0) " \ fzf#vim#with_preview(), <bang>0)
" Ripgrep advanced " Ripgrep advanced
function! RipgrepFzf(query, fullscreen) function! RipgrepFzf(query, fullscreen)
let command_fmt = 'rg --column --line-number --no-heading --color=always --smart-case --hidden -g\!.git -g\!.pijul -g\!.ccls-cache %s || true' let command_fmt = 'rg --column --line-number --no-heading --color=always --smart-case --hidden -g\!.git -g\!.pijul -g\!.ccls-cache -g\!\*.svd %s || true'
let initial_command = printf(command_fmt, shellescape(a:query)) let initial_command = printf(command_fmt, shellescape(a:query))
let reload_command = printf(command_fmt, '{q}') let reload_command = printf(command_fmt, '{q}')
let spec = {'options': ['--phony', '--query', a:query, '--bind', 'change:reload:'.reload_command]} let spec = {'options': ['--phony', '--query', a:query, '--bind', 'change:reload:'.reload_command]}
......