diff --git a/lua/plugin/neo-tree.lua b/lua/plugin/neo-tree.lua deleted file mode 100644 index 8719510..0000000 --- a/lua/plugin/neo-tree.lua +++ /dev/null @@ -1,12 +0,0 @@ -local neotree = require("neo-tree") - -neotree.setup({ - buffers = { - follow_current_file = { - enabled = true, - }, - }, - window = { - position = "right", - }, -}) diff --git a/lua/plugin/oil.lua b/lua/plugin/oil.lua new file mode 100644 index 0000000..b7e43fe --- /dev/null +++ b/lua/plugin/oil.lua @@ -0,0 +1,8 @@ +require("oil").setup { + view_options = { + -- Show files and directories that start with "." + show_hidden = true, + + } +} + diff --git a/lua/plugins.lua b/lua/plugins.lua index 8bd1445..c6b8579 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -45,7 +45,11 @@ require("lazy").setup({ -- formatter { 'stevearc/conform.nvim', - opts = {}, + opts = { + formatters_by_ft = { + htmlangular = { "prettier" }, + }, + }, }, -- Autocompletion { 'hrsh7th/nvim-cmp' }, -- Required @@ -56,14 +60,15 @@ require("lazy").setup({ } }, { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended - "MunifTanjim/nui.nvim", - }, - lazy = true, + 'stevearc/oil.nvim', + ---@module 'oil' + ---@type oil.SetupOpts + opts = {}, + -- Optional dependencies + dependencies = { { "echasnovski/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, }, { "ThePrimeagen/harpoon", @@ -83,7 +88,6 @@ require("lazy").setup({ ft = { "markdown" }, build = function() vim.fn["mkdp#util#install"]() end, }, - { 'github/copilot.vim' }, { 'mhinz/vim-startify' }, }, opts) diff --git a/lua/remap.lua b/lua/remap.lua index 7b9ae2e..f65c9a1 100644 --- a/lua/remap.lua +++ b/lua/remap.lua @@ -1,5 +1,4 @@ -vim.keymap.set("n", ";;", ":Neotree toggle") -vim.keymap.set("n", "kk", ":Neotree reveal") +vim.keymap.set("n", "kk", "Oil", { desc = "Open parent directory" }) -- jk to escape vim.keymap.set("i", "jk", "") diff --git a/lua/set.lua b/lua/set.lua index 2da4ab7..4f4aacc 100644 --- a/lua/set.lua +++ b/lua/set.lua @@ -32,3 +32,16 @@ vim.opt.updatetime = 50 -- use system clipboard vim.opt.clipboard = "unnamedplus" + +vim.g.clipboard = { + name = "win32yank-wsl", + copy = { + ["+"] = "win32yank.exe -i --crlf", + ["*"] = "win32yank.exe -i --crlf" + }, + paste = { + ["+"] = "win32yank.exe -o --crlf", + ["*"] = "win32yank.exe -o --crlf" + }, + cache_enable = 0, +}