update

init.lua

@@ -186,10 +186,10 @@ vim.keymap.set('n', '<leader>bn', '<cmd>bnext<CR>', { desc = 'Next buffer' })
 vim.keymap.set('n', '<leader>bp', '<cmd>bprevious<CR>', { desc = 'Previous buffer' })
 
 -- Move lines up/down
-vim.keymap.set('n', '<A-j>', '<cmd>m .+1<CR>==', { desc = 'Move line down' })
+-- vim.keymap.set('n', '<A-j>', '<cmd>m .+1<CR>==', { desc = 'Move line down' })
-vim.keymap.set('n', '<A-k>', '<cmd>m .-2<CR>==', { desc = 'Move line up' })
+-- vim.keymap.set('n', '<A-k>', '<cmd>m .-2<CR>==', { desc = 'Move line up' })
-vim.keymap.set('v', '<A-j>', "<cmd>m '>+1<CR>gv=gv", { desc = 'Move selection down' })
+-- vim.keymap.set('v', '<A-j>', "<cmd>m '>+1<CR>gv=gv", { desc = 'Move selection down' })
-vim.keymap.set('v', '<A-k>', "<cmd>m '<-2<CR>gv=gv", { desc = 'Move selection up' })
+-- vim.keymap.set('v', '<A-k>', "<cmd>m '<-2<CR>gv=gv", { desc = 'Move selection up' })
 
 -- Better indenting in visual mode
 vim.keymap.set('v', '<', '<gv', { desc = 'Indent left and reselect' })

lazy-lock.json

@@ -1,48 +1,46 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
+  "LazyVim": { "branch": "main", "commit": "459a4c3b1059671e766a46c7cc223827dc67e3d0" },
-  "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
+  "LuaSnip": { "branch": "master", "commit": "642b0c595e11608b4c18219e93b88d7637af27bc" },
-  "conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" },
+  "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
-  "fidget.nvim": { "branch": "main", "commit": "3f5475949679953af6d78654db29b944fa826e6a" },
+  "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" },
-  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "fidget.nvim": { "branch": "main", "commit": "82404b196e73a00b1727a91903beef5ddc319d22" },
-  "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" },
+  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
+  "gitsigns.nvim": { "branch": "main", "commit": "2038c666bd9d8a0b7349a0b6ee00dc83104b9ecf" },
   "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
   "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
-  "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" },
+  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
-  "lazydev.nvim": { "branch": "main", "commit": "e28ce52fc7ff79fcb76f0e79ee6fb6182fca90b9" },
+  "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
-  "lazygit.nvim": { "branch": "main", "commit": "2305deed25bc61b866d5d39189e9105a45cf1cfb" },
+  "lazygit.nvim": { "branch": "main", "commit": "a04ad0dbc725134edbee3a5eea29290976695357" },
-  "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
+  "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "2304ff65ecc8cb2afc2484de3e2ed9a407edf0b9" },
+  "markview.nvim": { "branch": "main", "commit": "301e431c7b618235f5447d54465c70934bd33668" },
-  "mason-nvim-dap.nvim": { "branch": "main", "commit": "c971971f881d1be90252d281f384054d9d53e745" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "21c5b3ebeaa0412e28096bb0701434c51c1fbf76" },
-  "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" },
-  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
-  "mini.nvim": { "branch": "main", "commit": "8a7cf7eee8d89bd1b83f6d72f7f3b5598e7ae2cb" },
+  "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" },
-  "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" },
+  "miasma.nvim": { "branch": "main", "commit": "466456f08d1a114c983c0d24e8fc01339e3b0a27" },
-  "nvim-dap": { "branch": "master", "commit": "6782b097af2417a4c3e33849b0a26ae2188bd7ea" },
+  "mini.nvim": { "branch": "main", "commit": "ecb05c524a99490c95a8862eb5cb09b1e629ed42" },
+  "nvim-dap": { "branch": "master", "commit": "531771530d4f82ad2d21e436e3cc052d68d7aebb" },
   "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" },
-  "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
+  "nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" },
-  "nvim-jdtls": { "branch": "master", "commit": "380ac148f989e1291aac002dc959ecc68c5243d0" },
+  "nvim-jdtls": { "branch": "master", "commit": "6e9d953f0b82bccdb834cfde0e893f3119c22592" },
-  "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" },
+  "nvim-lint": { "branch": "master", "commit": "fd87a7ab27ee0ce1b15b56c1250fc4668fe8ac58" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" },
+  "nvim-lspconfig": { "branch": "master", "commit": "bfcc0171a43f22afa61d927ffe9fcb6cb85dc99e" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
+  "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "b311b30818951d01f7b4bf650521b868b3fece16" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
+  "nvim-web-devicons": { "branch": "master", "commit": "dfbfaa967a6f7ec50789bead7ef87e336c1fa63c" },
-  "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" },
+  "oklch-color-picker.nvim": { "branch": "master", "commit": "9b5db80d5f6af8fbc31bad29f69ad76f63154944" },
-  "oil-git-status.nvim": { "branch": "main", "commit": "4b5cf53842c17a09420919e655a6a559da3112d7" },
+  "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
-  "oil.nvim": { "branch": "master", "commit": "71948729cda5fc1b761d6ae60ff774b5525f1d50" },
-  "oklch-color-picker.nvim": { "branch": "master", "commit": "da958405624e31336cc76ca0075f4a255e6c448a" },
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "b25b749b9db64d375d782094e2b9dce53ad53a40" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
-  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
+  "telescope.nvim": { "branch": "master", "commit": "9377230aa5305d9e9aca4ed8dadf1070fb4aa9fc" },
-  "tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "1cb11cc658ee24a9826e3b909ca0b0f5e60597c7" },
+  "tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "e930d0a46031645040d5492595b46cdf6ab3514f" },
-  "todo-comments.nvim": { "branch": "main", "commit": "19d461ddd543e938eb22505fb03fa878800270b6" },
+  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
-  "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
+  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
-  "trouble.nvim": { "branch": "main", "commit": "c098362fe603d3922095e7db595961e020bdf2d0" },
+  "vim-tmux-navigator": { "branch": "master", "commit": "e41c431a0c7b7388ae7ba341f01a0d217eb3a432" },
-  "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" },
+  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
-  "which-key.nvim": { "branch": "main", "commit": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00" }
 }

lua/custom/plugins/markdown.lua

@@ -0,0 +1,5 @@
+return {
+  'OXY2DEV/markview.nvim',
+  lazy = false,
+  dependencies = { 'saghen/blink.cmp' },
+}

lua/custom/plugins/notify.lua

@@ -1,22 +0,0 @@
-return {
-  'rcarriga/nvim-notify',
-  event = 'VeryLazy',
-  config = function()
-    local notify = require 'notify'
-    notify.setup {
-      merge_duplicates = true,
-      background_colour = '#000000',
-      render = 'default',
-      timeout = 5000,
-      stages = 'fade',
-      icons = {
-        ERROR = '',
-        WARN = '',
-        INFO = '',
-        DEBUG = '',
-        TRACE = '✎',
-      },
-    }
-    vim.notify = notify
-  end,
-}

lua/custom/plugins/oil-gitsigns.lua

@@ -1,37 +0,0 @@
-return {
-  'refractalize/oil-git-status.nvim',
-  dependencies = {
-    'stevearc/oil.nvim',
-  },
-  config = function()
-    require('oil-git-status').setup {
-      show_ignored = true, -- show files that match gitignore with !!
-      symbols = { -- customize the symbols that appear in the git status columns
-        index = {
-          ['!'] = '!',
-          ['?'] = '?',
-          ['A'] = 'A',
-          ['C'] = 'C',
-          ['D'] = 'D',
-          ['M'] = 'M',
-          ['R'] = 'R',
-          ['T'] = 'T',
-          ['U'] = 'U',
-          [' '] = ' ',
-        },
-        working_tree = {
-          ['!'] = '!',
-          ['?'] = '?',
-          ['A'] = 'A',
-          ['C'] = 'C',
-          ['D'] = 'D',
-          ['M'] = 'M',
-          ['R'] = 'R',
-          ['T'] = 'T',
-          ['U'] = 'U',
-          [' '] = ' ',
-        },
-      },
-    }
-  end,
-}

lua/custom/plugins/oil.lua

@@ -1,67 +0,0 @@
-return {
-  'stevearc/oil.nvim',
-  lazy = false,
-  ---@module 'oil'
-  ---@type oil.SetupOpts
-  dependencies = { 'nvim-tree/nvim-web-devicons' },
-  config = function()
-    local oil = require 'oil'
-
-    oil.setup {
-      -- default_file_explorer = true,
-      delete_to_trash = true,
-      skip_confirm_for_simple_edits = true,
-
-      columns = { 'icon' },
-      keymaps = {
-        ['g?'] = { 'actions.show_help', mode = 'n' },
-        ['gs'] = { 'actions.change_sort', mode = 'n' },
-        ['<C-Space>'] = { 'actions.select' },
-        ['<C-l>'] = { 'actions.select' },
-        ['<C-h>'] = { 'actions.parent' },
-        ['<C-c>'] = { 'actions.close', mode = 'n' },
-        ['<Esc>'] = { 'actions.close', mode = 'n' },
-        ['<M-v>'] = { 'actions.select', opts = { vertical = true } },
-        ['<M-h>'] = { 'actions.select', opts = { horizontal = true } },
-        ['<M-t>'] = { 'actions.select', opts = { tab = true } },
-        ['<C-s>'] = false,
-      },
-      view_options = {
-        show_hidden = true,
-        natural_order = 'fast',
-        is_always_hidden = function(name, _)
-          return name == '..' or name == '.git'
-        end,
-      },
-      win_options = {
-        signcolumn = 'yes:2',
-        wrap = true,
-      },
-      preview_win = {
-        disable_preview = function(filename)
-          return filename:match '^%.'
-        end,
-      },
-      sort = {
-        { 'name', 'asc' },
-      },
-      buf_options = {
-        buflisted = false,
-        bufhidden = 'delete', -- Delete the buffer immediately when hidden
-      },
-      cleanup_delay_ms = 0, -- Or set to false to disable auto-cleanup entirely if you prefer
-    }
-
-    vim.keymap.set('n', '-', oil.toggle_float, { desc = 'Open parent directory' })
-
-    -- Always show preview
-    vim.api.nvim_create_autocmd('User', {
-      pattern = 'OilEnter',
-      callback = vim.schedule_wrap(function(args)
-        if vim.api.nvim_get_current_buf() == args.data.buf and oil.get_cursor_entry() then
-          oil.open_preview()
-        end
-      end),
-    })
-  end,
-}

lua/kickstart/plugins/autopairs.lua

@@ -1,5 +0,0 @@
-return {
-  'windwp/nvim-autopairs',
-  event = 'InsertEnter',
-  opts = {},
-}

lua/kickstart/plugins/lsp/main-lsp.lua

@@ -152,6 +152,9 @@ return {
       vue_ls = {},
       eslint = {},
       yamlls = {},
+      qmlls = {
+        capabilities = capabilities,
+      },
       html = {
         filetypes = { 'html', 'htmldjango', 'htmldjango-template', 'htmljinja', 'htmlmin' },
       },

lua/kickstart/plugins/mini.lua

@@ -5,6 +5,62 @@ return {
     require('mini.ai').setup { n_lines = 500 }
     require('mini.surround').setup()
     require('mini.move').setup()
+    require('mini.pairs').setup()
+    require('mini.bracketed').setup()
+    require('mini.notify').setup {
+      window = {
+        winblend = 0,
+      },
+    }
+    local MiniFiles = require 'mini.files'
+    MiniFiles.setup {
+      mappings = {
+        go_out = '<C-h>',
+        go_in = '<C-l>',
+        go_in_plus = '<C-l>',
+        synchronize = '<C-s>',
+      },
+      windows = {
+        preview = true,
+        width_preview = 100,
+      },
+    }
+
+    local minifiles_toggle = function(dir)
+      if not MiniFiles.close() then
+        MiniFiles.open(dir)
+      end
+    end
+
+    local open_file_in_minifiles = function()
+      minifiles_toggle(vim.fn.expand '%:p')
+    end
+
+    local set_cwd = function()
+      local path = (MiniFiles.get_fs_entry() or {}).path
+      if path == nil then
+        return vim.notify 'Cursor is not on valid entry'
+      end
+      vim.fn.chdir(vim.fs.dirname(path))
+    end
+
+    -- Yank in register full path of entry under cursor
+    local yank_path = function()
+      if MiniFiles.get_explorer_state().target_window ~= nil then
+        local path = (MiniFiles.get_fs_entry() or {}).path
+        if path == nil then
+          return vim.notify 'Cursor is not on valid entry'
+        end
+        vim.fn.setreg(vim.v.register, path)
+      end
+    end
+
+    vim.keymap.set('n', '<leader>re', minifiles_toggle, { desc = 'Open Explorer in root' })
+    vim.keymap.set('n', '<leader>e', open_file_in_minifiles, { desc = 'Open Explorer in current file' })
+    vim.keymap.set('n', '<leader>cwd', set_cwd, { desc = 'Set cwd' })
+    vim.keymap.set('n', '<leader>yp', yank_path, { desc = 'Yank path' })
+    vim.keymap.set('n', '<Enter>', MiniFiles.go_in, { desc = 'Open file' })
+
     local statusline = require 'mini.statusline'
     -- set use_icons to true if you have a Nerd Font
     statusline.setup { use_icons = vim.g.have_nerd_font }

lua/kickstart/plugins/treesitter.lua

@@ -33,7 +33,7 @@ return { -- Highlight, edit, and navigate code
       'jsonc',
       'markdown',
       'markdown_inline',
-      'python',
+      -- 'python',
       'rust',
       'toml',
       'yaml',
@@ -42,14 +42,25 @@ return { -- Highlight, edit, and navigate code
     auto_install = true,
     highlight = {
       enable = true,
-      disable = { 'python' }, -- list of language that will be disabled
+      disable = {}, -- list of language that will be disabled
       -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
       --  If you are experiencing weird indenting issues, add the language to
       --  the list of additional_vim_regex_highlighting and disabled languages for indent.
       additional_vim_regex_highlighting = { 'ruby' },
     },
     indent = { enable = true, disable = { 'ruby' } },
-    textobjects = { select = { enable = true, lookahead = true } },
+    textobjects = {
+      select = {
+        enable = true,
+        lookahead = true,
+        keymaps = {
+          ['af'] = '@function.outer',
+          ['if'] = '@function.inner',
+          ['ac'] = '@class.outer',
+          ['ic'] = '@class.inner',
+        },
+      },
+    },
   },
   -- There are additional nvim-treesitter modules that you can use textobjectsto in
   -- eract