.config/nvim/lazy-lock.json

@@ -3,38 +3,37 @@
   "avante.nvim": { "branch": "main", "commit": "f57f541959797bbca76e6e77efeb8b572e0bea2f" },
   "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "catppuccin": { "branch": "main", "commit": "8edd468af4d63212b84d69b2ddb5ffc9023ef5eb" },
+  "catppuccin": { "branch": "main", "commit": "426dbebe06b5c69fd846ceb17b42e12f890aedf1" },
-  "conform.nvim": { "branch": "master", "commit": "18aeab3d63d350dcf44d64c462cc489a3412af40" },
+  "conform.nvim": { "branch": "master", "commit": "dca1a190aa85f9065979ef35802fb77131911106" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "dotenv.nvim": { "branch": "main", "commit": "7d516e9293c6e3ac21830fb10a4e8674c02747c6" },
   "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
   "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
   "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
   "gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" },
-  "grug-far.nvim": { "branch": "main", "commit": "5506c2f59dc9ab2ed6c233585412b24d31d51521" },
+  "grug-far.nvim": { "branch": "main", "commit": "21790e59dd0109a92a70cb874dd002af186314f5" },
-  "hybrid-theme": { "branch": "main", "commit": "e09de613941e761e2dd75901a65d54979f369877" },
   "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
   "just-runner.nvim": { "branch": "main", "commit": "f29d405aa828900df242600720a2b0e57261489f" },
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
   "lualine.nvim": { "branch": "master", "commit": "131a558e13f9f28b15cd235557150ccb23f89286" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "7b01e2974a47d489bb92f47a41e4c0088ea8f86e" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "0c2823e0418f3d9230ff8b201c976e84de1cb401" },
-  "mason.nvim": { "branch": "main", "commit": "bb639d4bf385a4d89f478b83af4d770be05ab7eb" },
+  "mason.nvim": { "branch": "main", "commit": "cb8445f8ce85d957416c106b780efd51c6298f89" },
-  "mini.ai": { "branch": "main", "commit": "4ce4c35e411ea329a15d4b15e9c89c2a3089e437" },
+  "mini.ai": { "branch": "main", "commit": "7e10ce8468c0fce4f527ae2c0e5c484f7667f73d" },
-  "mini.files": { "branch": "main", "commit": "423d6b5afb7a94e658950d470957f830d43dd41e" },
+  "mini.files": { "branch": "main", "commit": "3e247eb12ca8c05622ceb8745f9004f761b22ef8" },
-  "mini.icons": { "branch": "main", "commit": "520995f1d75da0e4cc901ee95080b1ff2bc46b94" },
+  "mini.icons": { "branch": "main", "commit": "bac6317300e205335df425296570d84322730067" },
-  "mini.pairs": { "branch": "main", "commit": "30cf2f01c4aaa2033db67376b9924fa2442c05d6" },
+  "mini.pairs": { "branch": "main", "commit": "42387c7fe68fc0b6e95eaf37f1bb76e7bffaa0d9" },
   "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-lint": { "branch": "master", "commit": "d48f3a76189d03b2239f6df1b2f7e3fa8353743b" },
+  "nvim-lint": { "branch": "master", "commit": "eab58b48eb11d7745c11c505e0f3057165902461" },
-  "nvim-lspconfig": { "branch": "master", "commit": "a4ed4e761c400849e8c9f8bda33e5083f890268c" },
+  "nvim-lspconfig": { "branch": "master", "commit": "31026a13eefb20681124706a79fc1df6bf11ab27" },
   "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
   "nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" },
   "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" },
   "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
   "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
   "render-markdown.nvim": { "branch": "main", "commit": "629eb9533ec989d9d5c6cab8f3ad5372422c24e0" },
-  "snacks.nvim": { "branch": "main", "commit": "0770753c88228f7f15449c6a5b242e3f7cd0d71c" },
+  "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
   "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
   "tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" },
   "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },

.config/nvim/lua/plugins/avante-ai.lua

@@ -6,8 +6,7 @@ return {
   ---@type avante.Config
   opts = {
     instructions_file = "avante.md",
-    mode = "agentic",
+    provider = "deepseek/coder",
-    provider = "z.ai/glm-4.6",
     providers = {
       ["deepseek/coder"] = {
         __inherited_from = "openai",
@@ -28,29 +27,6 @@ return {
         model = "glm-4.6",
       },
     },
-    behaviour = {
-      auto_suggestions = false,
-      enable_fastapply = false,
-      auto_set_highlight_group = true,
-      auto_set_keymaps = true,
-      auto_apply_diff_after_generation = false,
-      support_paste_from_clipboard = false,
-      minimize_diff = true, -- Whether to remove unchanged lines when applying a code block
-      enable_token_counting = true, -- Whether to enable token counting. Default to true.
-      auto_add_current_file = true, -- Whether to automatically add the current file when opening a new chat. Default to true.
-      auto_approve_tool_permissions = false,
-      -- Examples:
-      -- auto_approve_tool_permissions = false,                -- Show permission prompts for all tools
-      -- auto_approve_tool_permissions = {"bash", "str_replace"}, -- Auto-approve specific tools only
-      ---@type "popup" | "inline_buttons"
-      confirmation_ui_style = "inline_buttons",
-      --- Whether to automatically open files and navigate to lines when ACP agent makes edits
-      ---@type boolean
-      acp_follow_agent_locations = true,
-    },
-    windows = {},
-    acp_providers = {},
-    rules = {},
   },
   dependencies = {
     "nvim-lua/plenary.nvim",

.config/nvim/lua/plugins/colorscheme.lua

@@ -12,40 +12,39 @@
 --   },
 -- }
 
--- Local development:
--- return {
---   dir = "/home/chodak/src/git/nvim-hybrid-theme",
---   name = "hybrid-theme",
---   lazy = false,
---   priority = 1000,
---   config = function()
---     require("hybrid-theme").setup({
---       theme = "dark",
---       transparent = false,
---       background_variant = "flat",
---       italics = {
---         comments = true,
---         keywords = false,
---         functions = false,
---         strings = false,
---         variables = false,
---       },
---     })
---     require("hybrid-theme").colorscheme()
---   end,
--- }
-
 return {
-  {
+  dir = "/home/chodak/src/git/nvim-hybrid-theme",
-    "chodak166/nvim-hybrid-theme",
+  name = "hybrid-theme",
-    name = "hybrid-theme",
+  lazy = false,
-    lazy = false,
+  priority = 1000,
-    priority = 1000,
+  config = function()
-    config = function()
+    require("hybrid-theme").setup({
-      require("hybrid-theme").setup({
+      theme = "dark",
-        background_variant = "semi_flat",
+      transparent = false,
-      })
+      background_variant = "flat",
-      require("hybrid-theme").colorscheme()
+      italics = {
-    end,
+        comments = true,
-  },
+        keywords = false,
+        functions = false,
+        strings = false,
+        variables = false,
+      },
+    })
+    require("hybrid-theme").colorscheme()
+  end,
 }
+
+-- return {
+--   {
+--     "chodak166/nvim-hybrid-theme",
+--     name = "hybrid-theme",
+--     lazy = false,
+--     priority = 1000,
+--     config = function()
+--       require("hybrid-theme").setup({
+--         background_variant = "semi_flat",
+--       })
+--       require("hybrid-theme").colorscheme()
+--     end,
+--   },
+-- }

.config/nvim/lua/plugins/indent-blankline.lua

@@ -4,7 +4,6 @@ return {
   opts = {
     indent = {
       highlight = {
-        "IblIndent",
         "IblIndent1",
         "IblIndent2",
         "IblIndent3",
@@ -16,12 +15,3 @@ return {
     scope = { enabled = false },
   },
 }
-
--- return {
---   "lukas-reineke/indent-blankline.nvim",
---   main = "ibl",
---   opts = {
---     scope = { enabled = false },
---     -- indent.highlight removed → defaults to {"IblIndent"}
---   },
--- }

.config/nvim/lua/plugins/zz_disabled.lua

@@ -1,10 +1,5 @@
--- NOTE: this file is not being tracked by default.
+-- NOTE: this file is in .gitignore to keep some plugins disabled by default
--- To add more plugins disabled by default,
+-- Force the change after adding more disabled plugins
--- tell Git to stop ignoring local changes:
---   config update-index --no-skip-worktree .config/nvim/lua/plugins/zz_disabled.lua
--- skip again:
---   config update-index --skip-worktree .config/nvim/lua/plugins/zz_disabled.lua
-
 return {
   { "yetone/avante.nvim", enabled = false },
 }

.dotfiles.d/init/init-dotfiles.sh

@@ -5,5 +5,4 @@ git clone --separate-git-dir=$HOME/.dotfiles.git http://git.nixlab.in/chodak166/
 rm -r ~/dotfiles-tmp/
 alias config='/usr/bin/git --git-dir=$HOME/.dotfiles.git/ --work-tree=$HOME'
 config config status.showUntrackedFiles no
-config update-index --skip-worktree .config/nvim/lua/plugins/zz_disabled.lua 2>/dev/null
 config checkout .

.gitignore

@@ -1,3 +1 @@
-*.old
+zz_disabled.lua
-*.orig
-*.bak