diff --git a/lazy-lock.json b/lazy-lock.json index d816eaa..2023c81 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -4,8 +4,8 @@ "LuaSnip": { "branch": "master", "commit": "99a94cc35ec99bf06263d0346128e908a204575c" }, "alpha-nvim": { "branch": "main", "commit": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65" }, "ccc.nvim": { "branch": "main", "commit": "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6" }, - "clangd_extensions.nvim": { "branch": "main", "commit": "84ed5417b6119dca77c4f96da1fd73e316b85781" }, - "cmake-tools.nvim": { "branch": "master", "commit": "b490713bc661613a14f01d2d01a1c44382e1c5c3" }, + "clangd_extensions.nvim": { "branch": "main", "commit": "5c8a7d6311ae6b0ed1e1fc66569fe67278a418fc" }, + "cmake-tools.nvim": { "branch": "master", "commit": "b19d166dc01e047c6dfdeb2da5df50eb4985ad64" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, @@ -38,20 +38,20 @@ "noice.nvim": { "branch": "main", "commit": "894db25ec726d32047799d4d0a982b701bec453b" }, "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" }, - "nvim": { "branch": "main", "commit": "371430f32f2637d2dd5796399b3982d4cada61d8" }, + "nvim": { "branch": "main", "commit": "490078b1593c6609e6a50ad5001e7902ea601824" }, "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" }, - "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, + "nvim-cmp": { "branch": "main", "commit": "3b9f28061a67b19cadc13946de981426a6425e4a" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, "nvim-dap": { "branch": "master", "commit": "1c63f37f95cd4fb54512898168138d9a75d1516a" }, "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, - "nvim-lspconfig": { "branch": "master", "commit": "7c73a4dc44c3d62ee79ab9f03ba313251c0388d4" }, + "nvim-lspconfig": { "branch": "master", "commit": "a981d4447b92c54a4d464eb1a76b799bc3f9a771" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, "nvim-tree.lua": { "branch": "master", "commit": "904f95cd9db31d1800998fa428e78e418a50181d" }, - "nvim-treesitter": { "branch": "master", "commit": "80cee52d445363c8bd08eacca17be31e3837f4d0" }, + "nvim-treesitter": { "branch": "master", "commit": "15129f6d70a4d7adc380abe57a64af93478f72e5" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "e9062e2dfb9854e6a927370f2d720de354c88524" }, "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" }, "nvim-ufo": { "branch": "main", "commit": "5be5b800b4f3512bca128f345e9c98574b5637c0" }, - "nvim-web-devicons": { "branch": "master", "commit": "eb8f80f30fd5e9a6176dee5c46661ebd7437ac46" }, + "nvim-web-devicons": { "branch": "master", "commit": "ab899311f8ae00a47eae8e0879506cead8eb1561" }, "obsidian.nvim": { "branch": "main", "commit": "8f1c896c4f084facddb235696a0dcc940411f3d5" }, "oil.nvim": { "branch": "master", "commit": "0e5fca35cdc743cf3a448cea1a6251cf25cebafa" }, "onedark.nvim": { "branch": "master", "commit": "09b71d84bd2524438e48c0aa5b54d855cc72af32" }, @@ -69,11 +69,11 @@ "tagbar": { "branch": "master", "commit": "be563539754b7af22bbe842ef217d4463f73468c" }, "telescope-color-names.nvim": { "branch": "main", "commit": "95b372b9a8ba0fc7cf6a67be637ee37453f322da" }, "telescope-emoji.nvim": { "branch": "master", "commit": "86248d97be84a1ce83f0541500ef9edc99ea2aa1" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "251fdb32d21321fec7bd3c39a3a8bc87b04145d4" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "1acb245b01294715684ed1322b6031cefd6c5132" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, "telescope-media-files.nvim": { "branch": "master", "commit": "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" }, - "telescope.nvim": { "branch": "master", "commit": "dc192faceb2db64231ead71539761e055df66d73" }, + "telescope.nvim": { "branch": "master", "commit": "2d92125620417fbea82ec30303823e3cd69e90e8" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "toggleterm.nvim": { "branch": "main", "commit": "12cba0a1967b4f3f31903484dec72a6100dcf515" }, "tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" }, diff --git a/lua/plugins/indent-blankline.lua b/lua/plugins/indent-blankline.lua index 70d1832..8d9a543 100644 --- a/lua/plugins/indent-blankline.lua +++ b/lua/plugins/indent-blankline.lua @@ -2,82 +2,32 @@ return { { "lukas-reineke/indent-blankline.nvim", config = function() - local g = vim.g - local opt = vim.opt - local cmd = vim.cmd - g.indent_blankline_buftype_exclude = { "terminal", "nofile" } - g.indent_blankline_filetype_exclude = { - "help", - "startify", - "dashboard", - "packer", - "neogitstatus", - "NvimTree", - "Trouble", - } - g.indentLine_enabled = 1 - g.indent_blankline_char = "▎" - g.indent_blankline_show_trailing_blankline_indent = false - g.indent_blankline_show_first_indent_level = true - g.indent_blankline_use_treesitter = true - g.indent_blankline_show_current_context = true - g.indent_blankline_context_patterns = { - "class", - "return", - "function", - "method", - "^if", - "^while", - "jsx_element", - "^for", - "^object", - "^table", - "block", - "arguments", - "if_statement", - "else_clause", - "jsx_element", - "jsx_self_closing_element", - "try_statement", - "catch_clause", - "import_statement", - "operation_type", - } - vim.wo.colorcolumn = "99999" - cmd([[highlight IndentBlanklineIndent1 guifg=#C678DD gui=nocombine]]) - cmd([[highlight IndentBlanklineIndent2 guifg=#E5C07B gui=nocombine]]) - cmd([[highlight IndentBlanklineIndent3 guifg=#98C379 gui=nocombine]]) - cmd([[highlight IndentBlanklineIndent4 guifg=#56B6C2 gui=nocombine]]) - cmd([[highlight IndentBlanklineIndent5 guifg=#61AFEF gui=nocombine]]) - cmd([[highlight IndentBlanklineIndent6 guifg=#E06C75 gui=nocombine]]) - opt.list = true - opt.listchars:append("space:⋅") - opt.listchars:append("eol:↴") + vim.opt.list = true + vim.opt.listchars:append("space:⋅") + vim.opt.listchars:append("eol:↴") + + require("indent_blankline").setup({ + char = "▎", + show_trailing_blankline_indent = true, + show_first_indent_level = true, + use_treesitter = true, + show_end_of_line = true, + space_char_blankline = " ", + show_current_context = true, + show_current_context_start = false, + buftype_exclude = { "terminal", "nofile" }, + filetype_exclude = { + "NvimTree", + "Trouble", + "alpha", + "dashboard", + "help", + "lazy", + "neogitstatus", + "packer", + "startify", + }, + }) end, - opts = { - char = "▏", - show_trailing_blankline_indent = false, - show_first_indent_level = true, - use_treesitter = true, - show_end_of_line = true, - space_char_blankline = " ", - show_current_context = true, - show_current_context_start = true, - char_highlight_list = { - "IndentBlanklineIndent1", - "IndentBlanklineIndent2", - "IndentBlanklineIndent3", - "IndentBlanklineIndent4", - "IndentBlanklineIndent5", - "IndentBlanklineIndent6", - }, - buftype_exclude = { "terminal", "nofile" }, - filetype_exclude = { - "help", - "lazy", - "NvimTree", - "alpha", - }, - }, }, } diff --git a/lua/solo/autocommands.lua b/lua/solo/autocommands.lua index 60c61d7..8ed0903 100644 --- a/lua/solo/autocommands.lua +++ b/lua/solo/autocommands.lua @@ -47,7 +47,7 @@ vim.api.nvim_create_autocmd({ "InsertEnter" }, { end, }) --- Disable `expandtab` (don't replace tab with spaces) for lua files +-- Disable `expandtab` (don't replace tab with spaces) vim.api.nvim_create_autocmd({ "FileType" }, { pattern = { "lua" }, callback = function() @@ -92,3 +92,12 @@ vim.api.nvim_create_autocmd({ "BufWritePost" }, { -- require("lazy").sync() -- end, -- }) + +-- Set vertical column for all files +vim.api.nvim_create_autocmd({ "FileType" }, { + group = vim.api.nvim_create_augroup("SetColorColumn", { clear = true }), + pattern = { "*" }, + callback = function() + vim.cmd.setlocal("colorcolumn=120") + end, +})