anual lazy sync update

lua/custom/plugins/cmp.lua

@@ -60,6 +60,10 @@ return {
           luasnip.lsp_expand(args.body)
         end,
       },
+      preselect = cmp.PreselectMode.None,
+      completion = {
+        completeopt = "noselect,menuone,menu"
+      },
       sorting = {
         -- TODO: Would be cool to add stuff like "See variable names before method names" in rust, or something like that.
         comparators = {

lua/custom/plugins/dap_go.lua

@@ -0,0 +1,5 @@
+return {
+  "leoluz/nvim-dap-go",
+  main = "dap-go",
+  opts = {},
+}

lua/custom/plugins/gopher.lua

@@ -0,0 +1,10 @@
+return {
+  "olexsmir/gopher.nvim",
+  ft = "go",
+  config = function(_, opts)
+    require("gopher").setup(opts)
+  end,
+  build = function()
+    vim.cmd [[silent! GoInstallDeps]]
+  end
+}

lua/custom/plugins/md.lua

@@ -0,0 +1,7 @@
+return {
+  "iamcco/markdown-preview.nvim",
+  cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
+  ft = { "markdown" },
+  build = function() vim.fn["mkdp#util#install"]() end,
+}
+

lua/custom/plugins/neosolarized.lua

@@ -1,48 +1,47 @@
-return {}
+return {
--- return {
+  -- "svrana/neosolarized.nvim",
---   "svrana/neosolarized.nvim",
+  -- priority = 1000,
---   priority = 1000,
+  -- dependencies = { "tjdevries/colorbuddy.vim" },
---   dependencies = { "tjdevries/colorbuddy.vim" },
+  -- config = function()
---   config = function()
+  --   local status, n = pcall(require, "neosolarized")
---     local status, n = pcall(require, "neosolarized")
+  --   if (not status) then return end
---     if (not status) then return end
+  --
---
+  --   vim.o.termguicolors = true
---     vim.o.termguicolors = true
+  --
---
+  --   n.setup({
---     n.setup({
+  --     comment_italics = true,
---       comment_italics = true,
+  --   })
---     })
+  --
---
+  --   local cb = require('colorbuddy.init')
---     local cb = require('colorbuddy.init')
+  --   local Color = cb.Color
---     local Color = cb.Color
+  --   local colors = cb.colors
---     local colors = cb.colors
+  --   local Group = cb.Group
---     local Group = cb.Group
+  --   local groups = cb.groups
---     local groups = cb.groups
+  --   local styles = cb.styles
---     local styles = cb.styles
+  --
---
+  --   Color.new('white', '#ffffff')
---     Color.new('white', '#ffffff')
+  --   Color.new('black', '#000000')
---     Color.new('black', '#000000')
+  --   Group.new('CursorLine', colors.none, colors.base03, styles.NONE, colors.base1)
---     Group.new('CursorLine', colors.none, colors.base03, styles.NONE, colors.base1)
+  --   Group.new('CursorLineNr', colors.yellow, colors.black, styles.NONE, colors.base1)
---     Group.new('CursorLineNr', colors.yellow, colors.black, styles.NONE, colors.base1)
+  --   Group.new('Visual', colors.none, colors.base03, styles.reverse)
---     Group.new('Visual', colors.none, colors.base03, styles.reverse)
+  --
---
+  --   local cError = groups.Error.fg
---     local cError = groups.Error.fg
+  --   local cInfo = groups.Information.fg
---     local cInfo = groups.Information.fg
+  --   local cWarn = groups.Warning.fg
---     local cWarn = groups.Warning.fg
+  --   local cHint = groups.Hint.fg
---     local cHint = groups.Hint.fg
+  --
---
+  --   Group.new("DiagnosticVirtualTextError", cError, cError:dark():dark():dark():dark(), styles.NONE)
---     Group.new("DiagnosticVirtualTextError", cError, cError:dark():dark():dark():dark(), styles.NONE)
+  --   Group.new("DiagnosticVirtualTextInfo", cInfo, cInfo:dark():dark():dark(), styles.NONE)
---     Group.new("DiagnosticVirtualTextInfo", cInfo, cInfo:dark():dark():dark(), styles.NONE)
+  --   Group.new("DiagnosticVirtualTextWarn", cWarn, cWarn:dark():dark():dark(), styles.NONE)
---     Group.new("DiagnosticVirtualTextWarn", cWarn, cWarn:dark():dark():dark(), styles.NONE)
+  --   Group.new("DiagnosticVirtualTextHint", cHint, cHint:dark():dark():dark(), styles.NONE)
---     Group.new("DiagnosticVirtualTextHint", cHint, cHint:dark():dark():dark(), styles.NONE)
+  --   Group.new("DiagnosticUnderlineError", colors.none, colors.none, styles.undercurl, cError)
---     Group.new("DiagnosticUnderlineError", colors.none, colors.none, styles.undercurl, cError)
+  --   Group.new("DiagnosticUnderlineWarn", colors.none, colors.none, styles.undercurl, cWarn)
---     Group.new("DiagnosticUnderlineWarn", colors.none, colors.none, styles.undercurl, cWarn)
+  --   Group.new("DiagnosticUnderlineInfo", colors.none, colors.none, styles.undercurl, cInfo)
---     Group.new("DiagnosticUnderlineInfo", colors.none, colors.none, styles.undercurl, cInfo)
+  --   Group.new("DiagnosticUnderlineHint", colors.none, colors.none, styles.undercurl, cHint)
---     Group.new("DiagnosticUnderlineHint", colors.none, colors.none, styles.undercurl, cHint)
+  --   Group.new("Macro", groups.PreProc, colors.none, styles.italic + styles.bold)
---     Group.new("Macro", groups.PreProc, colors.none, styles.italic + styles.bold)
+  --   Group.link("Function", groups.Function, colors.none, styles.italic)
---     Group.link("Function", groups.Function, colors.none, styles.italic)
+  --   Group.new("Conditional", groups.Statement, colors.none, styles.italic)
---     Group.new("Conditional", groups.Statement, colors.none, styles.italic)
+  --   Group.new("Boolean", groups.Constant, colors.none, styles.bold)
---     Group.new("Boolean", groups.Constant, colors.none, styles.bold)
+  --   Group.new("HoverBorder", colors.yellow, colors.none, styles.NONE)
---     Group.new("HoverBorder", colors.yellow, colors.none, styles.NONE)
+  -- end
---   end
+}
--- }

lua/custom/plugins/null-ls.lua

@@ -6,7 +6,10 @@ return {
         require("null-ls").builtins.formatting.black.with({
           extra_args = { "--line-length=80" }
         }),
-        require("null-ls").builtins.formatting.prettierd
+        require("null-ls").builtins.formatting.prettierd,
+        require("null-ls").builtins.formatting.gofumpt,
+        require("null-ls").builtins.formatting.goimports_reviser,
+        require("null-ls").builtins.formatting.golines,
       }
     }
   end

lua/custom/plugins/zen.lua

@@ -1,11 +1,13 @@
 return {
   "folke/zen-mode.nvim",
   opts = {
-    tmux = { enabled = true },
+    plugins = {
-    kitty = {
+      tmux = { enabled = true },
-      enabled = true,
+      kitty = {
-      font = "+5",
+        enabled = true,
-    }
+        font = "+5",
+      }
+    },
   },
   config = function()
     vim.keymap.set("n", "<leader>z", "<cmd>ZenMode<CR>", { silent = true })

lua/jabuxas/remap.lua

@@ -28,6 +28,7 @@ keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
 
 keymap.set("n", "<leader>rr", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]], { desc = "replace current word" })
 keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true, desc = "chmod +x current file" })
+keymap.set("n", "<leader>q", "<cmd>!go run %<CR>", { desc = "go run current file" })
 
 keymap.set("t", "<leader><Esc>", [[<C-\><C-n>]], { desc = "exit insert mode on builtin terminal" })
 
@@ -46,3 +47,6 @@ keymap.set("n", "<left>", "<C-w><")
 keymap.set("n", "<right>", "<C-w>>")
 keymap.set("n", "<up>", "<C-w>+")
 keymap.set("n", "<down>", "<C-w>-")
+
+keymap.set("n", "<leader>gsj", "<cmd>GoTagAdd json <CR>", { desc = "Add json struct tags" })
+keymap.set("n", "<leader>gsy", "<cmd>GoTagAdd yaml <CR>", { desc = "Add yaml struct tags" })

lua/jabuxas/set.lua

@@ -5,9 +5,9 @@ vim.opt.nu = true
 vim.opt.relativenumber = true
 
 vim.opt.clipboard:append({ "unnamedplus" })
-vim.opt.tabstop = 2
+vim.opt.tabstop = 4
-vim.opt.softtabstop = 2
+vim.opt.softtabstop = 4
-vim.opt.shiftwidth = 2
+vim.opt.shiftwidth = 4
 vim.opt.expandtab = true
 
 vim.opt.smartindent = true
@@ -28,7 +28,10 @@ vim.opt.isfname:append("@-@")
 
 vim.opt.updatetime = 50
 
--- vim.opt.colorcolumn = "80"
+vim.opt.colorcolumn = "80"
+vim.cmd[[highlight ColorColumn ctermbg=235 guibg=#262626]]
+vim.api.nvim_create_autocmd({"WinLeave"}, {pattern = "*", callback = function() vim.opt.colorcolumn = "0" end,})
+vim.api.nvim_create_autocmd({"WinEnter"}, {pattern = "*", callback = function() vim.opt.colorcolumn = "80" end,})
 
 vim.g.mapleader = " "