init.lua @ 481eefe1c72fcdc41298bd68a02577295832d37e

M after/queries/go/injections.scm

@@ -2,13 +2,13 @@ ;; extends
 
 ;; sql
 ((call_expression
-  (selector_expression
-    field: (field_identifier) @_field
-      (#any-of? @_field "Exec" "ExecContext" "Query" "QueryContext" "QueryRow" "QueryRowContext"))
-  (argument_list [(interpreted_string_literal)
-                  (raw_string_literal)] @injection.content))
-  (#offset! @injection.content 0 1 0 -1)
-  (#set! injection.language "sql"))
+   (selector_expression
+     field: (field_identifier) @_field
+     (#any-of? @_field "Exec" "ExecContext" "Query" "QueryContext" "QueryRow" "QueryRowContext"))
+   (argument_list [(interpreted_string_literal)
+                   (raw_string_literal)] @injection.content))
+ (#offset! @injection.content 0 1 0 -1)
+ (#set! injection.language "sql"))
 
 ([(raw_string_literal)
   (interpreted_string_literal)] @injection.content

M after/queries/lua/injections.scm

@@ -2,15 +2,15 @@ ;; extends
 
 ;; MiniTest
 ((function_call
-  name: (_) @_vimcmd_identifier
-  arguments: (arguments
-    (string
-      content: _ @injection.content)))
-  (#set! injection.language "lua")
-  (#any-of? @_vimcmd_identifier "child.lua" "c.lua"))
+   name: (_) @_vimcmd_identifier
+   arguments: (arguments
+                (string
+                  content: _ @injection.content)))
+ (#set! injection.language "lua")
+ (#any-of? @_vimcmd_identifier "child.lua" "c.lua"))
 
 ((function_call
-  name: (_) @_vimcmd_identifier
-  arguments: (arguments (string content: _ @injection.content)))
-  (#set! injection.language "vim")
-  (#any-of? @_vimcmd_identifier "child.cmd" "c.cmd"))
+   name: (_) @_vimcmd_identifier
+   arguments: (arguments (string content: _ @injection.content)))
+ (#set! injection.language "vim")
+ (#any-of? @_vimcmd_identifier "child.cmd" "c.cmd"))

D

@@ -1,15 +0,0 @@
-;; extends
-
-(image
-  ["!"] @markup.link
-  (#set! conceal "🖼️ "))
-
-(image
-  [
-    "["
-    "]"
-    "("
-    (link_destination)
-    ")"
-  ] @markup.link
-  (#set! conceal ""))

M filetype.lua

@@ -9,7 +9,6 @@ gotmpl = "gotmpl",
     org_archive = "org",
   },
   filename = {
-    [".gitignore"] = "conf",
     [".eslintrc"] = "jsonc",
     [".prettierrc"] = "jsonc",
     [".babelrc"] = "jsonc",

M lazy-lock.json

@@ -1,5 +1,5 @@
 {
-  "CopilotChat.nvim": { "branch": "main", "commit": "6db427a0f91d729265ffcbd2cd162d38d97879f2" },
+  "CopilotChat.nvim": { "branch": "main", "commit": "f84727fd79f726b7e848adf89108d66805638f06" },
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
@@ -8,17 +8,18 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
-  "copilot.lua": { "branch": "master", "commit": "4a557e74514fd5918e8aabb55b8cfd10535a9a33" },
+  "copilot.lua": { "branch": "master", "commit": "d296017e588215df3f7b5796d1172f0d690fa13c" },
   "curl.nvim": { "branch": "main", "commit": "fe07677a2a24bc8793b90fa2c0da626ea6c9e47d" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
   "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
   "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
-  "helpful.vim": { "branch": "master", "commit": "14d675370f1655e408e0cbf1d4d7f3cd7e7dfabe" },
+  "helpful.vim": { "branch": "master", "commit": "9e7dea5470c2b8794d076aedd8186fe2e889a88c" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
   "lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" },
-  "markview.nvim": { "branch": "main", "commit": "2192327840a4da1b4bd22495e02dbd4f12af9413" },
+  "markview.nvim": { "branch": "main", "commit": "556cac8bb8eeb461013ebe0d015e2c48d3527c36" },
   "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
   "mini.bufremove": { "branch": "main", "commit": "285bdac9596ee7375db50c0f76ed04336dcd2685" },
   "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
@@ -41,7 +42,7 @@ "org-bullets.nvim": { "branch": "main", "commit": "21437cfa99c70f2c18977bffd423f912a7b832ea" },
   "org-roam.nvim": { "branch": "main", "commit": "f92b54eff931982031d5e164482d5e781bb2cd31" },
   "orgmode": { "branch": "master", "commit": "dafb6aa6e2e09362e304a933974c563bab0b464f" },
   "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
-  "schemastore.nvim": { "branch": "main", "commit": "236438da47cafc39b15d2017a229a6613c581055" },
+  "schemastore.nvim": { "branch": "main", "commit": "735e53aa42423239e1f862e3356bdda56a2ba30e" },
   "snacks.nvim": { "branch": "main", "commit": "5eac729fa290248acfe10916d92a5ed5e5c0f9ed" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },

M lua/core/keymaps.lua

@@ -12,6 +12,7 @@ end
 
 -- general
 u.map("n", "<leader>q", "<cmd>quit!<cr>")
+u.map("n", "<leader>Q", "<cmd>tabclose!<cr>")
 u.map("n", "<leader>w", "<cmd>write!<cr>")
 u.map("n", "<C-s>", "<cmd>write!<cr>")
 u.map("i", "jk", "<esc>")
@@ -20,10 +21,6 @@ u.map("n", "<C-d>", "<C-d>zz")
 u.map("n", "<C-u>", "<C-u>zz")
 u.map("n", "[b", ":bp<cr>")
 u.map("n", "]b", ":bn<cr>")
-
--- quickfix
-u.map("n", "]q", "<cmd>cnext<cr>")
-u.map("n", "[q", "<cmd>cprev<cr>")
 
 -- macros
 u.map("n", "Q", "@qj")

M lua/core/lazy.lua

@@ -20,7 +20,7 @@ defaults = {
     lazy = true,
     version = "*", -- use only stable releases
   },
-  dev = {
+  dev = { ---@diagnostic disable-line:assign-type-mismatch
     path = "~/code",
     patterns = { "olexsmir" },
     fallback = true,

M lua/core/options.lua

@@ -5,7 +5,7 @@ update_in_insert = true,
   signs = {
     text = {
       [vim.diagnostic.severity.ERROR] = "",
-      [vim.diagnostic.severity.WARN] = "",
+      [vim.diagnostic.severity.WARN] = "",
       [vim.diagnostic.severity.HINT] = "",
       [vim.diagnostic.severity.INFO] = "",
     },
@@ -41,8 +41,8 @@ vim.o.splitbelow = true
 vim.o.splitright = true
 vim.o.pumheight = 8
 vim.o.numberwidth = 4
-vim.o.scrolloff = 8
-vim.o.sidescrolloff = 12
+vim.o.scrolloff = 14
+vim.o.sidescrolloff = 16
 vim.o.signcolumn = "yes"
 vim.o.hidden = true
 vim.o.title = true

M lua/plugins/completion.lua

@@ -15,11 +15,6 @@ for _, setup_fn in ipairs(opts.custom_setups) do
       setup_fn(cmp)
     end
 
-    cmp.setup.cmdline(":", {
-      mapping = cmp.mapping.preset.cmdline(),
-      sources = { { name = "path" }, { name = "cmdline" } },
-    })
-
     cmp.setup(opts)
   end,
   opts = function()
@@ -34,6 +29,15 @@ c.setup.filetype("ledger", {
             sources = {
               { name = "hledger" },
               { name = "buffer" },
+            },
+          })
+        end,
+        function(c)
+          c.setup.cmdline(":", {
+            mapping = c.mapping.preset.cmdline(),
+            sources = {
+              { name = "path" },
+              { name = "cmdline" },
             },
           })
         end,

M lua/plugins/core.lua

@@ -19,7 +19,6 @@ },
   {
     "oysandvik94/curl.nvim",
     version = false,
-    dev = true,
     cmd = { "CurlOpen", "CurlCollection" },
     ---@module "curl"
     ---@type curl_config

M lua/plugins/git.lua

@@ -83,6 +83,7 @@ "nvim-cmp",
     ---@module "cmp"
     ---@param opts cmp.ConfigSchema
     opts = function(_, opts)
+      ---@diagnostic disable-next-line:undefined-field
       table.insert(opts.custom_setups, function(cmp)
         cmp.setup.filetype({ "gitcommit", "NeogitCommitMessage" }, {
           sources = { { name = "buffer" }, { name = "luasnip" } },

M lua/plugins/gopher.lua

@@ -1,5 +1,3 @@
-local dev_deps = false
-
 ---@type LazySpec
 return {
   "olexsmir/gopher.nvim",
@@ -8,14 +6,10 @@ cmd = { "GoInstallDepsSync", "GoInstallDeps" },
   build = function()
     pcall(vim.cmd.GoInstallDeps)
   end,
-  dependencies = {
-    { "williamboman/mason.nvim", cond = dev_deps, config = true },
-  },
   ---@module "gopher"
   ---@type gopher.Config
   ---@diagnostic disable-next-line: missing-fields
   opts = {
-    use_mason = dev_deps,
     log_level = vim.log.levels.TRACE,
     gotests = {
       template = "testify",

M lua/plugins/lsp/attach.lua

@@ -10,7 +10,7 @@ error "couldn't get an lsp server"
     end
 
     if
-      client.supports_method(vim.lsp.protocol.Methods.textDocument_codeLens)
+      client:supports_method(vim.lsp.protocol.Methods.textDocument_codeLens)
     then
       vim.lsp.codelens.refresh { bufnr = bufnr }
     end

M lua/plugins/mini.lua

@@ -37,4 +37,16 @@ "echasnovski/mini.pairs",
     event = "InsertEnter",
     config = true,
   },
+  {
+    "folke/snacks.nvim",
+    lazy = false,
+    ---@module "snacks"
+    ---@type snacks.Config
+    opts = {
+      image = {
+        enabled = true,
+        doc = { inline = false },
+      },
+    },
+  },
 }

M lua/plugins/orgmode.lua

@@ -107,7 +107,7 @@ -- stylua: ignore
     org_todo_keywords = { "TODO(t)", "INB", "DOING(p)" , "|", "DONE(d)", "KILL(k)",},
     org_hide_emphasis_markers = true,
     org_startup_indented = true,
-    org_startup_folded = "content", -- "showeverything"
+    org_startup_folded = "overview",
     org_ellipsis = "\t\t[···]",
     org_priority_highest = "A",
     org_priority_lowest = "D",
@@ -131,7 +131,7 @@ org_capture_templates = {
       t = {
         description = "Task",
         template = "* TODO %?",
-        target = orgpath "todo",
+        target = orgpath "personal",
       },
       i = { description = "Inbox", template = "* %?" },
       w = {
@@ -146,7 +146,7 @@ description = "Personal",
         types = {
           {
             type = "tags_todo",
-            match = "-goals",
+            match = "-goals-prj",
             org_agenda_overriding_header = "Personal todos",
             org_agenda_files = { orgpath "todo", orgpath "personal" },
             org_agenda_sorting_strategy = { "priority-down", "todo-state-down" },

D

@@ -1,13 +0,0 @@
----@type LazySpec
-return {
-  "folke/snacks.nvim",
-  lazy = false,
-  ---@module "snacks"
-  ---@type snacks.Config
-  opts = {
-    image = {
-      enabled = true,
-      doc = { inline = false },
-    },
-  },
-}

M lua/plugins/treesitter.lua

@@ -18,7 +18,6 @@ ensure_installed = {
         "sql",
         "markdown",
         "markdown_inline",
-        "vim",
         "query",
       },
       ignore_install = { "org" },

M spell/en.utf-8.add

@@ -336,3 +336,9 @@ Leetcode
 OKRs
 bufnr
 fn
+Katatonia
+gopls
+OOP
+golangci-lint
+linters
+Lily58

M spell/uk.utf-8.add

@@ -10,3 +10,4 @@ заначка
 етері
 етер
 етери
+Анатолька