diff options
| author | Benjamin Chausse <benjamin@chausse.xyz> | 2024-09-08 01:28:22 -0400 |
|---|---|---|
| committer | Benjamin Chausse <benjamin@chausse.xyz> | 2024-09-08 01:28:22 -0400 |
| commit | fea8c12adb35076cc6bae11cc345f0270ec45110 (patch) | |
| tree | ed2ec226fe93513ad41616346fc7199fa6450076 /lua | |
| parent | 167b84d94a0ea1986ae391ccfba162b382b0d33b (diff) | |
| parent | 9973585a15e2769ebc8dfe81e7c35c5965064171 (diff) | |
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/core/init.lua | 16 | ||||
| -rw-r--r-- | lua/plugins/fugitive.lua | 6 | ||||
| -rw-r--r-- | lua/plugins/oil.lua | 34 |
3 files changed, 44 insertions, 12 deletions
diff --git a/lua/core/init.lua b/lua/core/init.lua index 05a3bb5..3b28e6a 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -23,7 +23,7 @@ vim.api.nvim_set_keymap("t", "<Esc>", "<C-\\><C-n>", {}) -- terminal mode Esc vim.keymap.set("v", "<s-j>", ":m '>+1<cr>gv=gv") vim.keymap.set("v", "<s-k>", ":m '<-2<cr>gv=gv") --- Netrw preferences when not using lf +-- Netrw preferences vim.g.netrw_liststyle = 3 vim.g.netrw_banner = 0 vim.g.netrw_bufsettings = "noma nomod nu nobl nowrap ro" @@ -65,8 +65,11 @@ end cd_to_git_root() -- Quickly compile and preview files -vim.keymap.set("n", "<leader>pc", "<cmd>make<cr>") -- P.roject C.ompile -vim.keymap.set("n", "<leader>pp", "<cmd>!opout %<cr>") -- P.roject P.review +vim.keymap.set("n", "<leader>mm", "<cmd>make<cr>") -- M.ake +vim.keymap.set("n", "<leader>ma", "<cmd>make<cr>") -- M.ake A.ll +vim.keymap.set("n", "<leader>mc", "<cmd>make<cr>") -- M.ake C.lean +vim.keymap.set("n", "<leader>mo", "<cmd>!opout %<cr>") -- M.ake O.pen + -- Make sure I don't accidentally delete with 'S' when not using an LSP: vim.keymap.set("n", "S", "<nop>") -- Stop hurting my pinky with <C-w>: @@ -74,10 +77,3 @@ vim.keymap.set("n", "<leader>w", "<C-w>") -- Quickly navigate between Tabs vim.keymap.set("n", "<Bslash>", "<cmd>tabnext<cr>") vim.keymap.set("n", "<C-\\>", "<cmd>tabnew<cr>") - --- TEST --- vim.api.nvim_create_autocmd("InsertLeave", { --- callback = function() --- print("hello") --- end, --- }) diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua index e52a4c6..56c525a 100644 --- a/lua/plugins/fugitive.lua +++ b/lua/plugins/fugitive.lua @@ -13,8 +13,10 @@ return { { "<leader>gp", "<cmd>G pull<CR>" }, -- G.it P.ull { "<leader>gf", "<cmd>G fetch<CR>" }, -- G.it F.etch { "<leader>ds", "<cmd>Gvdiffsplit!<CR>" }, -- G.it D.iff S.plit - { "<leader>dh", "<cmd>diffget //2<CR>" }, - { "<leader>dl", "<cmd>diffget //3<CR>" }, + { "<leader>dh", "<cmd>diffget //2 | diffupdate<CR>" }, + { "<leader>dl", "<cmd>diffget //3 | diffupdate<CR>" }, + { "<leader>de", "<cmd>only<CR>" }, -- D.iff E.xit + -- NOTE: dp (no leader) is already set to diffput | diffupdate by default }, }, { diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua new file mode 100644 index 0000000..0a912b7 --- /dev/null +++ b/lua/plugins/oil.lua @@ -0,0 +1,34 @@ +return { + "stevearc/oil.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + require("oil").setup({ + columns = { "icon" }, + keymaps = { + ["<C-h>"] = false, + ["<M-h>"] = "actions.select_split", + }, + view_options = { + show_hidden = true, + }, + }) + end, + keys = { + + { -- Floating Oil window + "<leader>-", + function() + require("oil").toggle_float() + end, + mode = "n", + desc = "Toggle floating Oil window", + }, + + { -- Open parent directory + "-", + "<cmd>Oil<CR>", + mode = "n", + desc = "Open parent directory", + }, + }, +} |