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
  • master
1 result

Target

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