diff options
| -rw-r--r-- | nvim/init.lua | 1 | ||||
| -rw-r--r-- | nvim/lazy-lock.json | 2 | ||||
| -rw-r--r-- | nvim/lua/config/lsp.lua | 2 | ||||
| -rw-r--r-- | nvim/lua/config/options.lua | 1 | ||||
| -rw-r--r-- | nvim/lua/plugins/oil-nvim.lua | 41 |
5 files changed, 23 insertions, 24 deletions
diff --git a/nvim/init.lua b/nvim/init.lua index 05dd72a..bb6eab5 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,6 +1,7 @@ require("config.lazy") require("config.keymap") require("config.lsp") +require("config.autocmd") require("mini.pairs").setup() require("mini.statusline").setup() require("mini.tabline").setup() diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index b180386..966a58f 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -19,7 +19,7 @@ "nvim-neoclip.lua": { "branch": "main", "commit": "831a97c7697736411a05ff8b91e8798ea4c2d6fb" }, "nvim-treesitter": { "branch": "main", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "oil-git-status.nvim": { "branch": "main", "commit": "a3e2ccb00cb8822115e28a9a1791eda051d940c9" }, + "oil-git.nvim": { "branch": "main", "commit": "c99db7b1dd8dd500c3ec530dc07000dfbeb6e080" }, "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "quicker.nvim": { "branch": "master", "commit": "2d3f3276eab9352c7b212821c218aca986929f62" }, diff --git a/nvim/lua/config/lsp.lua b/nvim/lua/config/lsp.lua index 36ebfa9..6c30fc8 100644 --- a/nvim/lua/config/lsp.lua +++ b/nvim/lua/config/lsp.lua @@ -1,4 +1,4 @@ -vim.lsp.enable({"rust_analyzer", "nil_ls", "denols"}) +vim.lsp.enable({"rust_analyzer", "nil_ls", "denols", "html", "cssls"}) vim.lsp.config("*", { onAttach = function(client, _) diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua index 39e1a48..b703960 100644 --- a/nvim/lua/config/options.lua +++ b/nvim/lua/config/options.lua @@ -18,3 +18,4 @@ vim.opt.signcolumn = "yes"; vim.opt.ignorecase = true; vim.opt.smartcase = true; vim.opt.autochdir = true; +vim.opt.colorcolumn = "80"; diff --git a/nvim/lua/plugins/oil-nvim.lua b/nvim/lua/plugins/oil-nvim.lua index 285b104..0f645c3 100644 --- a/nvim/lua/plugins/oil-nvim.lua +++ b/nvim/lua/plugins/oil-nvim.lua @@ -1,24 +1,21 @@ return { - { - 'stevearc/oil.nvim', - ---@module 'oil' - ---@type oil.SetupOpts - opts = { - vim.keymap.set("n", "<F2>", "<Cmd>Oil<CR>", { desc = "Open parent directory" }), - }, - -- Optional dependencies - -- dependencies = { { "nvim-mini/mini.icons", opts = {} } }, - dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons - -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations. - lazy = false, - }, - { - "refractalize/oil-git-status.nvim", - - dependencies = { - "stevearc/oil.nvim", - }, - - config = true, - }, + { + "stevearc/oil.nvim", + ---@module 'oil' + ---@type oil.SetupOpts + opts = { + vim.keymap.set("n", "<F2>", "<Cmd>Oil<CR>", { desc = "Open parent directory" }), + }, + -- Optional dependencies + -- dependencies = { { "nvim-mini/mini.icons", opts = {} } }, + dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons + -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations. + lazy = false, + }, + { + "malewicz1337/oil-git.nvim", + dependencies = { + "stevearc/oil.nvim", + }, + }, } |
