Merge pull request #25 from DeadlySquad13/dev

Regular main update:
- Lsp enhancements (code lens via glance, better tooltips and diagnostics).
- Easier cd management: after cd you can trigger actions that are usually used after cd.
- TextObjects fixes and enhancements.
- Movement fixes and enhancements.
- Aerojump for better searching.
- Marks.nvim keymappings.
- Venv name in statusline via swenv.
- Json and Yaml lsps.
- Quickfix and tab hydra modes and keymappings.
- Gitblame.
- Better folds, smart fold on file open.
- Replacement, search, search&replace and substitute keymappings organized.
- Zoxide integration.
- Docker, vim and vimdoc parsers.
- Firenvim integration returned.

Author: DeadlySquad13

after/ftplugin/cql/init.lua

@@ -0,0 +1,5 @@
+local options = {
+  commentstring = "// %s",
+}
+
+require('ds_omega.utils.setters').set_local_settings(options)

after/ftplugin/dot/init.lua

@@ -1,4 +1,4 @@
-local apply_bufferlocal_keymappings = require('config.Ui.which_key.utils').apply_bufferlocal_keymappings
+local apply_bufferlocal_keymappings = require('ds_omega.config.Ui.which_key.utils').apply_bufferlocal_keymappings
 
 apply_bufferlocal_keymappings('n', {
   ['<Cr>'] = { [[<Cmd>! dotPng %:r<Cr>]], 'Create png from name of the current file' }, -- Use kroki like in mermaid?

after/ftplugin/help/init.lua

@@ -0,0 +1,12 @@
+local apply_bufferlocal_keymappings = require('ds_omega.config.Ui.which_key.utils').apply_bufferlocal_keymappings
+
+-- Reference: https://vim.fandom.com/wiki/Learn_to_use_help
+apply_bufferlocal_keymappings('n', {
+    ['<Cr>'] = { '<C-]>', 'Jump to topic under cursor' },
+    ['<Bs>'] = { '<C-T>', 'Return to last topic' },
+    o = { [[/'\l\{2,\}'<Cr>]], 'To next option' },
+    O = { [[?'\l\{2,\}'<Cr>]], 'To previous option' },
+    -- Not sure how should it work but it selects everything.
+    -- s = { [[/\|\zs\S\+\ze\|<Cr>]], 'To the next subject' },
+    -- S = { [[?\|\zs\S\+\ze\|<Cr>]], 'To the previous subject' },
+}, { prefix = '' })

after/ftplugin/http/init.lua

@@ -0,0 +1,6 @@
+local apply_bufferlocal_keymappings = require('ds_omega.config.Ui.which_key.utils').apply_bufferlocal_keymappings
+
+apply_bufferlocal_keymappings('n', {
+    x = { '<Plug>RestNvim', 'Run rest.nvim under cursor' },
+    X = { '<Plug>RestNvimPreview', 'Preview cURL command' },
+})

after/ftplugin/javascript/init.lua

@@ -1,7 +1,7 @@
 local options = {
-  tabstop = 4,
-  softtabstop = 4,
-  shiftwidth = 4,
+    tabstop = 4,
+    softtabstop = 4,
+    shiftwidth = 4,
 }
 
 require('ds_omega.utils.setters').set_local_settings(options)

after/ftplugin/markdown/init.lua

@@ -1,2 +1,7 @@
 -- # Markdown mkdx mappings.
 --nmap <Plug> <Plug>(mkdx-wrap-link-n})
+local options = {
+    wrap = true
+}
+
+require('ds_omega.utils.setters').set_local_settings(options)

after/ftplugin/mermaid/init.lua

@@ -1,4 +1,4 @@
-local apply_bufferlocal_keymappings = require('config.Ui.which_key.utils').apply_bufferlocal_keymappings
+local apply_bufferlocal_keymappings = require('ds_omega.config.Ui.which_key.utils').apply_bufferlocal_keymappings
 
 apply_bufferlocal_keymappings('n', {
   ['<Cr>'] = { [[<Cmd>:!kroki convert % --type mermaid && kroki convert % --type mermaid --format png<Cr>]], 'Convert current file to svg and png' },

after/queries/typescript/highlights.scm

@@ -1,7 +1,9 @@
 ; extends
 
-(function
-  name: (identifier) @function)
+;   Adding more highlights to typescript. A lot of captures are already available
+; so we just need to assign highlight groups to them.
+(call_expression
+  function: (identifier) @function)
 (function_declaration
   name: (identifier) @function.declaration)
 (generator_function

ginit.vim

@@ -1,9 +1,10 @@
 " Settings: https://neovide.dev/configuration.html
 if exists('g:neovide')
-    set guifont=Iosevka:h10
+    set guifont=Iosevka:h14
 
-    let g:neovide_fullscreen = v:true
+    let g:neovide_fullscreen = v:false
     let g:neovide_remember_window_size = v:true
+    let g:neovide_floating_shadow=v:false
 
     let g:neovide_cursor_animation_length=0.05
     let g:neovide_cursor_trail_size = 0.1

init.vim

@@ -1,4 +1,5 @@
 if exists('g:fvim_loaded') || exists('g:neovide_loaded') || exists('g:nvy')
+  " FIX: made path generic.
   source ~\AppData\Local\nvim\ginit.vim
 endif
 
@@ -66,17 +67,6 @@ autocmd Filetype python setlocal omnifunc=v:lua.vim.lsp.omnifunc
 " let g:wordmotion_prefix = ','
 let g:wordmotion_nomap = 1
 
-" # Formatting.
-" * Easy Align.
-" - Start interactive EasyAlign in visual mode (e.g. vipga)
-xmap ga <Plug>(EasyAlign)
-
-" Start interactive EasyAlign for a motion/text object (e.g. gaip)
-nmap ga <Plug>(EasyAlign)
-
-" * Copy all file into system register (*).
-nnoremap f% gg"*yG
-
 " * Matching braces.
 packadd! matchit
 
@@ -89,19 +79,17 @@ let g:surround_{char2nr('-')} = "\1start: \1\r\2end: \2"
 let g:surround_{char2nr('la')} = "function() \r end"
 
 " * Keep visual mode after indent.
+" TODO: `>` overlaps with put commands => delay is added.
 vnoremap > >gv
 vnoremap < <gv
 
 " * Select just pasted text in last used mode [if you used linewise selection
 " - V, if characterwise - v,..].
+" FIX: `[ marks get rewritten during autosave.
 nnoremap <expr> gp '`[' . strpart(getregtype(), 0, 1) . '`]'
 
 " * Yanking.
 
-" * Open new file in vertical / horizontal split (similar to built-in <c-w>n).
-nnoremap <C-w>v :vnew<Cr>
-nnoremap <C-w>s :below new<Cr>
-
 " * Remaping line concatenation for use of j with modifier in non-vim apps.
 noremap <a-j> J
 
@@ -181,13 +169,6 @@ vnoremap <leader>de :!python3 -c 'import sys; from urllib import parse; print(pa
 nnoremap ]b :call searchpair('\[','','\]')<cr>
 nnoremap [b :call searchpair('\[','','\]','b')<cr>
 
-" Mappings.
-" Start interactive EasyAlign in visual mode (e.g. vip<Enter>)
-vmap <Enter> <Plug>(EasyAlign)
-
-" Start interactive EasyAlign for a motion/text object (e.g. gaip)
-nmap ga <Plug>(EasyAlign)
-
 " Abbreviations
 runtime abbreviations.vim