Resolved merge conflicts

lazy-lock.json

@@ -38,5 +38,6 @@
   "vim-monokai-tasty": { "branch": "master", "commit": "247324e0170e19de0018e7c8e437f83b6f0ef6fc" },
   "vim-speeddating": { "branch": "master", "commit": "5a36fd29df63ea3f65562bd2bb837be48a5ec90b" },
   "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
-  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }
+  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
+  "vim-visual-multi": { "branch": "master", "commit": "aec289a9fdabaa0ee6087d044d75b32e12084344" }
 }

lua/markdownpreview.lua

@@ -0,0 +1,23 @@
+-- default config:
+require("peek").setup({
+	auto_load = true, -- whether to automatically load preview when
+	-- entering another markdown buffer
+	close_on_bdelete = true, -- close preview window on buffer delete
+
+	syntax = true, -- enable syntax highlighting, affects performance
+
+	theme = "dark", -- 'dark' or 'light'
+
+	update_on_change = true,
+
+	app = "webview", -- 'webview', 'browser', string or a table of strings
+	-- explained below
+
+	filetype = { "markdown" }, -- list of filetypes to recognize as markdown
+
+	-- relevant if update_on_change is true
+	throttle_at = 200000, -- start throttling when file exceeds this
+	-- amount of bytes in size
+	throttle_time = "auto", -- minimum amount of time in milliseconds
+	-- that has to pass before starting new render
+})

lua/plugins.lua

@@ -54,4 +54,5 @@ return {
 	"neovim/nvim-lspconfig",
 	"mfussenegger/nvim-dap",
 	"mhartington/formatter.nvim",
+	"mg979/vim-visual-multi",
 }

spell/en.utf-8.add

@@ -133,3 +133,4 @@ viml
 config
 confformat
 plugbench
+jedec

viml/plugconfig.vim

@@ -22,7 +22,7 @@ function! Build()
     let l:filetype = &filetype
 
     if l:filetype == 'c' || l:filetype == 'cpp' || l:filetype == 'h' || l:filetype == 'hpp'
-        execute 'make'
+        execute '!make'
     elseif l:filetype == 'py' || l:filetype == 'python'
         execute '!python3 %'
     elseif l:filetype == 'tex'
@@ -30,11 +30,13 @@ function! Build()
     elseif l:filetype == 'rs'
         execute 'cargo run'
     elseif l:filetype == 'S'
-        execute 'make'
+        execute '!make'
     elseif l:filetype == 'verilog'
-        execute 'verilator --binary %'
+        execute '!verilator --binary %'
     elseif l:filetype == 'rust'
-        execute 'cargo run'
+        execute '!cargo run'
+    elseif l:filetype == 'markdown'
+        execute '!okular %&'
     else
         echo "Unsupported file type: " . l:filetype
     endif
@@ -43,4 +45,3 @@ endfunction
 nnoremap <C-b> :call Build()<CR>
 nnoremap <M-w> :bdelete<CR>
 nnoremap <C-y> :b#<CR>
-