Added shellcheck to linters

lazy-lock.json

@@ -1,31 +1,30 @@
 {
   "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
   "LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "fb7b9034285a5658c746faa12eff8c1c9d9b11b1" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "a0fad73139f98ea1d6e9d380374c16245e562f4f" },
   "aerial.nvim": { "branch": "master", "commit": "7a6a42791eb2b54a7115c7db4488981f93471770" },
-  "avante.nvim": { "branch": "main", "commit": "e89eb79abf5754645e20aa6074da10ed20bba33c" },
+  "avante.nvim": { "branch": "main", "commit": "e1e70be8ee34144d3ce4b0608e9b30aab3feb701" },
   "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
   "catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" },
   "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
-  "copilot.lua": { "branch": "master", "commit": "2d7511494245129aa6c2176f9c71cc2bc1360ed9" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
   "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
-  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" },
-  "grug-far.nvim": { "branch": "main", "commit": "794f03c97afc7f4b03fb6ec5111be507df1850cf" },
+  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
+  "gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" },
+  "grug-far.nvim": { "branch": "main", "commit": "1f7a722a9b9f0206a345377c13e62542f484398a" },
   "img-clip.nvim": { "branch": "main", "commit": "b6ddfb97b5600d99afe3452d707444afda658aca" },
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
   "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "80c0130c5f16b551865a69e832f1feadeedb5fbe" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "4823a251e7578a835bb979c37df390fca692ba39" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" },
   "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
   "mini.ai": { "branch": "main", "commit": "9eae720f2b20f6ad28cbfa0ddc524e10dc2c3201" },
   "mini.icons": { "branch": "main", "commit": "efc85e42262cd0c9e1fdbf806c25cb0be6de115c" },
-  "mini.pairs": { "branch": "main", "commit": "d5a29b6254dad07757832db505ea5aeab9aad43a" },
+  "mini.pairs": { "branch": "main", "commit": "4089aa6ea6423e02e1a8326a7a7a00159f6f5e04" },
   "neogit": { "branch": "master", "commit": "d8bf9102692250193b855acd9025a826f1af2729" },
   "neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" },
   "neotest-go": { "branch": "main", "commit": "59b50505053f9c45a9febb79e11a56206c3e3901" },
@@ -40,10 +39,10 @@
   "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
   "nvim-lint": { "branch": "master", "commit": "ca6ea12daf0a4d92dc24c5c9ae22a1f0418ade37" },
-  "nvim-lspconfig": { "branch": "master", "commit": "92ee7d42320edfbb81f3cad851314ab197fa324a" },
+  "nvim-lspconfig": { "branch": "master", "commit": "419b082102fa813739588dd82e19a8b6b2442855" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-remote-containers": { "branch": "master", "commit": "73c2cbc59b69b4026682aea6bab225831fb8eaa4" },
-  "nvim-treesitter": { "branch": "main", "commit": "e75c007f2747050c2c620dc862c77b8f242551a8" },
+  "nvim-treesitter": { "branch": "main", "commit": "88f1dfc211c3a2fb47f1451fd5edc972ec697e58" },
   "nvim-treesitter-textobjects": { "branch": "main", "commit": "4d55f63252e04c5212daed958e4e940915ff16ce" },
   "nvim-ts-autotag": { "branch": "main", "commit": "db15f2e0df2f5db916e511e3fffb682ef2f6354f" },
   "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
@@ -52,7 +51,7 @@
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "render-markdown.nvim": { "branch": "main", "commit": "c54380dd4d8d1738b9691a7c349ecad7967ac12e" },
   "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
-  "telescope.nvim": { "branch": "master", "commit": "0d8b6eaa0b5ae6bb3d9785f7a3ba4a4c6c1b1af2" },
+  "telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" },
   "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
   "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
   "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },

lua/config/autocmds.lua

@@ -73,7 +73,7 @@ autocmd("BufWritePre", {
 })
 
 -- Set specific options for certain filetypes
-augroup("FileTypeSettings", { clear = true })
+augroup("FileTypeSettings", { clear = false })
 
 -- Go files: use tabs
 autocmd("FileType", {
@@ -127,16 +127,16 @@ autocmd("BufRead", {
 })
 
 -- SQL files
-autocmd("FileType", {
-  pattern = { "sql", "mysql", "plsql" },
-  callback = function()
-    local cmp = require("cmp")
-    cmp.setup.buffer({
-      sources = {
-        { name = "vim-dadbod" },
-        { name = "nvim_lsp" },
-        { name = "buffer" },
-      },
-    })
-  end,
-})
+-- autocmd("FileType", {
+--  pattern = { "sql", "mysql", "plsql" },
+--  callback = function()
+--    local cmp = require("cmp")
+--    cmp.setup.buffer({
+--      sources = {
+--        { name = "vim-dadbod" },
+--        { name = "nvim_lsp" },
+--        { name = "buffer" },
+  --    },
+  --  })
+ -- end,
+-- })

lua/config/keymaps.lua

@@ -1,6 +1,7 @@
 -- Custom keymaps
 local map = vim.keymap.set
 
+
 -- Terminal keymaps
 -- <leader>th - Open terminal in horizontal split
 map("n", "<leader>th", function()
@@ -19,8 +20,8 @@ map("t", "<Esc><Esc>", "<C-\\><C-n>", { desc = "Exit terminal mode" })
 
 -- Explorer keymaps (Snacks explorer)
 -- Ctrl+Shift+e - Toggle explorer
-map("n", "<C-S-e>", function() Snacks.explorer() end, { desc = "Toggle Explorer" })
-map("i", "<C-S-e>", function() Snacks.explorer() end, { desc = "Toggle Explorer" })
+map("n", "<C-e>", function() Snacks.explorer() end, { desc = "Toggle Explorer" })
+map("i", "<C-e>", function() Snacks.explorer() end, { desc = "Toggle Explorer" })
 
 -- Note: Ctrl+Shift+v and Ctrl+Shift+h for opening files in splits
 -- are configured in the snacks picker config (lua/plugins/editor.lua)
@@ -110,4 +111,4 @@ map("n", "<leader>xw", "<cmd>Trouble workspace_diagnostics<cr>")
 map("n", "<leader>xt", "<cmd>Trouble todo<cr>")
 
 -- Git Support
-map("n", "<leader>gg", "<cmd>Neogit<cr>", { desc = "Neogit"})
+map("n", "<leader>gg", "<cmd>Neogit<cr>", { desc = "Neogit" })

lua/config/lazy.lua

@@ -27,7 +27,7 @@ require("lazy").setup({
       "LazyVim/LazyVim",
       import = "lazyvim.plugins",
       opts = {
-        colorscheme = "tokyonight",
+        colorscheme = "catppuccin-mocha",
       },
     },
     -- Import LazyVim extras for languages
@@ -46,7 +46,7 @@ require("lazy").setup({
     lazy = false,
     version = false,
   },
-  install = { colorscheme = { "tokyonight", "habamax" } },
+  install = { colorscheme = { "tokyonight", "habamax", "catpuccin-mocha" } },
   checker = {
     enabled = true,
     notify = false,

lua/config/options.lua

@@ -17,7 +17,7 @@ opt.number = true             -- Show line numbers
 opt.relativenumber = true     -- Relative line numbers
 opt.signcolumn = "yes"        -- Always show sign column
 opt.termguicolors = true      -- True color support
-opt.wrap = true               -- Disable line wrap
+opt.wrap = false              -- Disable line wrap
 
 -- Indentation
 opt.expandtab = true   -- Use spaces instead of tabs
@@ -63,3 +63,7 @@ vim.diagnostic.config({
     border = "rounded",
   },
 })
+
+-- Python
+vim.g.lazyvim_python_lsp = "pyright"
+vim.g.lazyvim_python_ruff = "ruff"

lua/plugins/ai.lua

@@ -193,21 +193,21 @@ return {
       },
     },
   },
-  {
-    "zbirenbaum/copilot.lua",
-    cmd = "Copilot",
-    event = "InsertEnter",
-    opts = {
-      suggestion = {
-        enabled = true,
-        auto_trigger = true,
-        keymap = {
-          accept = "<C-l>",
-          next = "<C-n>",
-          prev = "<C-p>",
-        },
-      },
-      panel = { enabled = false },
-    },
-  }
+  -- {
+  --   "zbirenbaum/copilot.lua",
+  --   cmd = "Copilot",
+  --   event = "InsertEnter",
+  --   opts = {
+  --     suggestion = {
+  --       enabled = true,
+  --       auto_trigger = true,
+  --       keymap = {
+  --         accept = "<C-l>",
+  --         next = "<C-n>",
+  --         prev = "<C-p>",
+  --       },
+  --     },
+  --     panel = { enabled = false },
+  --   },
+  -- }
 }

lua/plugins/dadbod.lua

@@ -14,6 +14,7 @@ return {
     cmd = { "DBUI", "DBUIToggle", "DBUIAddConnection", "DBUIFindBuffer" },
     dependencies = {
       { "tpope/vim-dadbod", lazy = true },
+      { "kristijanhusak/vim-dadbod-completion", ft = { 'sql', 'mysql', 'plsql' }, lazy = true },
     },
     init = function()
       -- UI configuration
@@ -41,44 +42,21 @@ return {
     end,
   },
 
-  -- Autocompletion for dadbod
+  -- Completion
   {
-    "kristijanhusak/vim-dadbod-completion",
-    dependencies = {
-      "tpope/vim-dadbod",
-      "hrsh7th/nvim-cmp",
+    'saghen/blink.cmp',
+    opts = {
+      sources = {
+        default = { "lsp", "path", "snippets", "buffer" },
+        per_filetype = {
+          sql = { 'snippets', 'dadbod', 'buffer' },
         },
-    ft = { "sql", "mysql", "plsql" },
-    init = function()
-      -- Setup completion for SQL files
-      vim.api.nvim_create_autocmd("FileType", {
-        pattern = { "sql", "mysql", "plsql" },
-        callback = function()
-          local cmp = require("cmp")
-          local sources = cmp.get_config().sources or {}
+        -- add vim-dadbod-completion to your completion providers
+        providers = {
+          dadbod = { name = "Dadbod", module = "vim_dadbod_completion.blink"}
+        }
+      }
+    }
+  }
 
-          -- Add dadbod completion source
-          table.insert(sources, { name = "vim-dadbod-completion" })
-
-          cmp.setup.buffer({
-            sources = cmp.config.sources(sources),
-          })
-        end,
-      })
-    end,
-  },
-
-  -- Add dadbod-completion to nvim-cmp sources
-  {
-    "hrsh7th/nvim-cmp",
-    optional = true,
-    dependencies = {
-      "kristijanhusak/vim-dadbod-completion",
-      "nvim-cmp",
-    },
-    opts = function(_, opts)
-      opts.sources = opts.sources or {}
-      table.insert(opts.sources, { name = "vim-dadbod-completion" })
-    end,
-  },
 }

lua/plugins/editor.lua

@@ -156,4 +156,38 @@ return {
       },
     },
   },
+
+  -- Help comment and uncomment lines
+  {
+    'numToStr/Comment.nvim',
+    opts = {
+      padding = true,
+      
+      -- LHS of toggle mappings in NORMAL mode
+      toggler = {
+        line = 'gcc',
+        block = 'gbc',
+      },
+
+      -- LHS of operator-pending mappings in NORMAL and VISUAL
+      opleader = {
+        line = "gc",
+        block = "gb",
+      },
+
+      -- LHS of extra mappings
+      extra = {
+        -- Add comment on the line above
+        above = 'gcO',
+          -- Add comment on the line below
+        below = 'gco',
+          -- Add comment at the end of line
+        eol = 'gcA',
+      },
+      mappings = {
+        basic = true,
+        extra = true,
+      },
+    },
+  },
 }

lua/plugins/lsp.lua

@@ -33,10 +33,16 @@ return {
         "yaml-language-server",       -- YAML
         "marksman",                   -- Markdown
         "sqlls",                      -- SQL
+        "pyright",                    --Python
+        "ruff",                       --Python
+        "docker-language-server",     -- Docker
+        "zls",                         -- Zig
         -- Linters
         "golangci-lint",
         "eslint_d",
         "markdownlint",
+        "hadolint",
+        "shellcheck",
         -- Formatters
         "gofumpt",
         "goimports",
@@ -57,7 +63,7 @@ return {
         -- Go
         gopls = {
           -- Root detection: find go.work first, then go.mod, then git root
-          root_dir = make_root_detector({ "go.work", "go.mod" }),
+          -- root_dir = make_root_detector({ "go.work", "go.mod" }),
           settings = {
             gopls = {
               gofumpt = true,
@@ -189,6 +195,10 @@ return {
         sqlls = {
           root_dir = make_root_detector({ ".sqllsrc.json", "sqlls.json", ".git" }),
         },
+
+        -- Docker
+        dockerls = {},
+        docker_compose_language_server = {},
       },
     },
   },
@@ -214,6 +224,7 @@ return {
         "yaml",
         "markdown",
         "markdown_inline",
+        "ninja",
         "sql",
         "make",
         "vim",
@@ -223,6 +234,7 @@ return {
         "diff",
         "gitcommit",
         "git_rebase",
+        "dockerfile",
       },
       highlight = { enable = true },
       indent = { enable = true },

lua/plugins/neotest.lua

@@ -12,6 +12,14 @@ return {
     },
     config = function()
       require("neotest").setup({
+        log_level = vim.log.levels.WARN,
+        discovery = {
+          enabled = true,
+          concurrent = 0,
+        },
+        running = {
+          concurrent = true,
+        },
         adapters = {
           require("neotest-go")({
             experimental = {
@@ -29,4 +37,3 @@ return {
     end,
   },
 }
-

lua/plugins/zig.lua

@@ -0,0 +1,5 @@
+return {
+  'https://codeberg.org/ziglang/zig.vim',
+  lazy = true,
+  ft = { "zig" },
+}