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 (5)
...@@ -139,6 +139,7 @@ ...@@ -139,6 +139,7 @@
"cSpell.userWords": [ "cSpell.userWords": [
"#rument", "#rument",
"--globalkeys", "--globalkeys",
"ACMR",
"ACTIVATIONCODE", "ACTIVATIONCODE",
"ACTL", "ACTL",
"ADDRE", "ADDRE",
...@@ -196,6 +197,12 @@ ...@@ -196,6 +197,12 @@
"CMSIS", "CMSIS",
"CNAME", "CNAME",
"CONEX", "CONEX",
"CPHA",
"CPOL",
"CPPCOMSTR",
"CPPDEFFLAGS",
"CPPDEFINES",
"CPPINCFLAGS",
"CRC32", "CRC32",
"CStr", "CStr",
"CamelCase", "CamelCase",
...@@ -257,6 +264,7 @@ ...@@ -257,6 +264,7 @@
"DSYSCTRL", "DSYSCTRL",
"DSYSTEM", "DSYSTEM",
"DUT's", "DUT's",
"DUTs",
"DVERSION", "DVERSION",
"DWT", "DWT",
"Damiano", "Damiano",
...@@ -293,11 +301,14 @@ ...@@ -293,11 +301,14 @@
"Eposthistoriken", "Eposthistoriken",
"Epostsök", "Epostsök",
"Ethernet", "Ethernet",
"FERNANDOZ",
"FFFF", "FFFF",
"FFI", "FFI",
"FILTE", "FILTE",
"FLASHSIZE", "FLASHSIZE",
"FLPR", "FLPR",
"FRLVL",
"FTLVL",
"Feriejobb", "Feriejobb",
"Flashmode", "Flashmode",
"Flashmodes", "Flashmodes",
...@@ -328,8 +339,10 @@ ...@@ -328,8 +339,10 @@
"Grepit", "Grepit",
"Grundkurs", "Grundkurs",
"Gränssnitt", "Gränssnitt",
"HALTI",
"HFCLKSTAT", "HFCLKSTAT",
"HOTP", "HOTP",
"HSSPIS",
"HW", "HW",
"Haltium", "Haltium",
"HashMap", "HashMap",
...@@ -341,7 +354,11 @@ ...@@ -341,7 +354,11 @@
"IMULT", "IMULT",
"INDAT", "INDAT",
"IPTAT", "IPTAT",
"IRWXG",
"IRWXO",
"IRWXU",
"ISR", "ISR",
"ISRs",
"ITM", "ITM",
"ITMDump", "ITMDump",
"Ibuild", "Ibuild",
...@@ -367,6 +384,7 @@ ...@@ -367,6 +384,7 @@
"LPA", "LPA",
"LSEE", "LSEE",
"LTU", "LTU",
"LUMOS",
"LXML", "LXML",
"Labbhandledare", "Labbhandledare",
"Laboratiorievägen", "Laboratiorievägen",
...@@ -381,6 +399,8 @@ ...@@ -381,6 +399,8 @@
"MCUs", "MCUs",
"MISO", "MISO",
"MMIO", "MMIO",
"MOBO",
"MOBO's",
"MOSI", "MOSI",
"MRAM", "MRAM",
"MSRV", "MSRV",
...@@ -400,6 +420,7 @@ ...@@ -400,6 +420,7 @@
"NMIENSET", "NMIENSET",
"NMIFLAG", "NMIFLAG",
"NONSECURE", "NONSECURE",
"NSSP",
"NVIC", "NVIC",
"NVM", "NVM",
"NVMCTRL", "NVMCTRL",
...@@ -410,12 +431,15 @@ ...@@ -410,12 +431,15 @@
"Nucleo64", "Nucleo64",
"Num", "Num",
"Nätverkskommunikation", "Nätverkskommunikation",
"OBJCOPYCOMSTR",
"OBJDUMP",
"ONKEY", "ONKEY",
"OO", "OO",
"OOM", "OOM",
"OSCCTRL", "OSCCTRL",
"OSX", "OSX",
"OUTCLR", "OUTCLR",
"OVERREAD",
"Olimex", "Olimex",
"OpenOCD", "OpenOCD",
"PA04", "PA04",
...@@ -520,6 +544,7 @@ ...@@ -520,6 +544,7 @@
"SWRS", "SWRS",
"SYSCLK", "SYSCLK",
"SYST", "SYST",
"Saleae",
"Schedulability", "Schedulability",
"Segway", "Segway",
"Selectnumber", "Selectnumber",
...@@ -620,6 +645,7 @@ ...@@ -620,6 +645,7 @@
"ahbmask", "ahbmask",
"ahbs", "ahbs",
"aktiveringstid", "aktiveringstid",
"analyzer",
"analyzing", "analyzing",
"anykind", "anykind",
"anymore", "anymore",
...@@ -716,7 +742,10 @@ ...@@ -716,7 +742,10 @@
"coremark", "coremark",
"cosinussatsen", "cosinussatsen",
"countsync", "countsync",
"cppdefine",
"cpputest",
"croutes", "croutes",
"crunner",
"cryptoram", "cryptoram",
"cstep", "cstep",
"ctrla", "ctrla",
...@@ -812,6 +841,7 @@ ...@@ -812,6 +841,7 @@
"falign", "falign",
"fancyhdr", "fancyhdr",
"fastboot", "fastboot",
"ffile",
"ffunction", "ffunction",
"fidx", "fidx",
"fifo", "fifo",
...@@ -829,6 +859,7 @@ ...@@ -829,6 +859,7 @@
"forskningspapper", "forskningspapper",
"freqm", "freqm",
"fstep", "fstep",
"ftdi",
"fugit", "fugit",
"fulfill", "fulfill",
"fulfills", "fulfills",
...@@ -853,6 +884,7 @@ ...@@ -853,6 +884,7 @@
"hashless", "hashless",
"heapless", "heapless",
"hetj", "hetj",
"hfvpath",
"hibcfg", "hibcfg",
"hprintln", "hprintln",
"hspi", "hspi",
...@@ -862,7 +894,9 @@ ...@@ -862,7 +894,9 @@
"hårdvaruknappar", "hårdvaruknappar",
"identifikationsnummer", "identifikationsnummer",
"idrom", "idrom",
"ifdef",
"iff", "iff",
"ihex",
"imageinfo", "imageinfo",
"impl", "impl",
"implementors", "implementors",
...@@ -913,6 +947,7 @@ ...@@ -913,6 +947,7 @@
"letterpaper", "letterpaper",
"letterspacing", "letterspacing",
"lfclk", "lfclk",
"lfrc",
"lightgray", "lightgray",
"liliumsoc", "liliumsoc",
"linkchecker", "linkchecker",
...@@ -991,6 +1026,7 @@ ...@@ -991,6 +1026,7 @@
"openocd", "openocd",
"osculp", "osculp",
"overdriven", "overdriven",
"palsrv",
"panic1", "panic1",
"parsable", "parsable",
"passersystem", "passersystem",
...@@ -1033,6 +1069,7 @@ ...@@ -1033,6 +1069,7 @@
"problemdiskussion", "problemdiskussion",
"problemdiskussionen", "problemdiskussionen",
"problemuppställning", "problemuppställning",
"proc",
"procdly", "procdly",
"programmatically", "programmatically",
"programverifikation", "programverifikation",
...@@ -1040,6 +1077,7 @@ ...@@ -1040,6 +1077,7 @@
"prototypframtagning", "prototypframtagning",
"proutes", "proutes",
"pushd", "pushd",
"pyhfv",
"quadcopter", "quadcopter",
"quadcopterplatform", "quadcopterplatform",
"raddr", "raddr",
...@@ -1058,6 +1096,7 @@ ...@@ -1058,6 +1096,7 @@
"repo", "repo",
"repower", "repower",
"repr", "repr",
"reqs",
"resched", "resched",
"resendings", "resendings",
"resetable", "resetable",
...@@ -1086,6 +1125,8 @@ ...@@ -1086,6 +1125,8 @@
"schedulability", "schedulability",
"schedulable", "schedulable",
"schemaläggningsmetoder", "schemaläggningsmetoder",
"scons",
"sconscript",
"sdslice", "sdslice",
"seL4", "seL4",
"seecfg", "seecfg",
...@@ -1143,6 +1184,7 @@ ...@@ -1143,6 +1184,7 @@
"syms", "syms",
"syncbusy", "syncbusy",
"sysclk", "sysclk",
"syspath",
"systemautomation", "systemautomation",
"systemintegration", "systemintegration",
"systemutveckling", "systemutveckling",
...@@ -1176,6 +1218,7 @@ ...@@ -1176,6 +1218,7 @@
"transp", "transp",
"trsize", "trsize",
"trybuild", "trybuild",
"tstr",
"tupled", "tupled",
"txbtie", "txbtie",
"txobj", "txobj",
...@@ -1194,6 +1237,7 @@ ...@@ -1194,6 +1237,7 @@
"undersökningsansats", "undersökningsansats",
"unhold", "unhold",
"uninit", "uninit",
"uninitialises",
"unlisten", "unlisten",
"unpark", "unpark",
"unrecord", "unrecord",
...@@ -1211,6 +1255,7 @@ ...@@ -1211,6 +1255,7 @@
"v2", "v2",
"videostreaming", "videostreaming",
"virtualenv", "virtualenv",
"vmem",
"vref", "vref",
"vscode", "vscode",
"wakeups", "wakeups",
......
...@@ -275,7 +275,7 @@ if exists('g:vscode') ...@@ -275,7 +275,7 @@ if exists('g:vscode')
else else
" ordinary neovim " ordinary neovim
" Grammatical checking " Grammatical checking
Plug 'rhysd/vim-grammarous' "Plug 'rhysd/vim-grammarous'
" Rust-lang support " Rust-lang support
Plug 'rust-lang/rust.vim' Plug 'rust-lang/rust.vim'
...@@ -507,8 +507,6 @@ set listchars=tab:>.,trail:.,extends:#,nbsp:. ...@@ -507,8 +507,6 @@ set listchars=tab:>.,trail:.,extends:#,nbsp:.
" Do :set paste and revert with one easy button: " Do :set paste and revert with one easy button:
set pastetoggle=<leader>pt set pastetoggle=<leader>pt
" Taglist toggle
"nnoremap <silent> <F8> :TlistToggle<CR>
" Tagbar toggle " Tagbar toggle
nmap <F8> :TagbarToggle<CR> nmap <F8> :TagbarToggle<CR>
nmap <leader>tb :TagbarToggle<CR> nmap <leader>tb :TagbarToggle<CR>
...@@ -946,7 +944,8 @@ nmap <silent> <leader>me <Plug>(coc-command)expandMacro ...@@ -946,7 +944,8 @@ nmap <silent> <leader>me <Plug>(coc-command)expandMacro
nmap <silent> <leader>gh :CocCommand clangd.switchSourceHeader<CR> nmap <silent> <leader>gh :CocCommand clangd.switchSourceHeader<CR>
nmap <silent> <leader>gH :CocCommand clangd.switchSourceHeader vsplit<CR> nmap <silent> <leader>gH :CocCommand clangd.switchSourceHeader vsplit<CR>
nmap <silent> <leader>gsi :CocCommand clangd.SymbolInfo<CR> nmap <silent> <leader>gsi :CocCommand clangd.symbolInfo<CR>
nmap <silent> <leader>gast :CocCommand clangd.ast<CR>
" From coc-completion-help 2022-08-01 " From coc-completion-help 2022-08-01
inoremap <expr> <cr> coc#pum#visible() ? coc#_select_confirm() : "\<CR>" inoremap <expr> <cr> coc#pum#visible() ? coc#_select_confirm() : "\<CR>"
...@@ -1260,30 +1259,18 @@ imap <c-x><c-l> <plug>(fzf-complete-line) ...@@ -1260,30 +1259,18 @@ imap <c-x><c-l> <plug>(fzf-complete-line)
if has('conceal') if has('conceal')
set conceallevel=2 concealcursor=niv set conceallevel=2 concealcursor=niv
endif endif
"
" " Allows for toggling conceal level easily
" Grammarous remaps " https://alok.github.io/2018/04/26/using-vim-s-conceal-to-make-languages-more-tolerable/
" function! ToggleConcealLevel()
"This above sample, when present in your .vimrc will create five handy additional normal-mode commands namely if &conceallevel == 0
"gn (next error), gp (previous error), gr (ignore the error), gf (fix automatically with suggested correction), setlocal conceallevel=2
"gR (ignore all errors with same rule). These are available only to the current buffer and only when else
":GrammarousCheck is active, and will disappear as soon as :GrammarousReset is used. setlocal conceallevel=0
let g:grammarous#hooks = {} endif
function! g:grammarous#hooks.on_check(errs) abort
nmap <buffer>gn <Plug>(grammarous-move-to-next-error)
nmap <buffer>gp <Plug>(grammarous-move-to-previous-error)
nmap <buffer>gr <Plug>(grammarous-move-to-info-window)r
nmap <buffer>gas f <Plug>(grammarous-move-to-info-window)f
nmap <buffer>gR <Plug>(grammarous-move-to-info-window)R
endfunction
function! g:grammarous#hooks.on_reset(errs) abort
nunmap <buffer>gn
nunmap <buffer>gp
nunmap <buffer>gr
nunmap <buffer>gf
nunmap <buffer>gR
endfunction endfunction
nnoremap <silent> <Leader>tc :call ToggleConcealLevel()<CR>
" For more convenient vimdiffing " For more convenient vimdiffing
if &diff if &diff
......