this is painful
parent
d482861676
commit
0c76bba78d
|
@ -0,0 +1,7 @@
|
||||||
|
require('compare-remotes').setup({
|
||||||
|
remotes = {
|
||||||
|
['origin'] = '.',
|
||||||
|
['upstream'] = '../fwk2'
|
||||||
|
},
|
||||||
|
project_file_schemes = {"oil"},
|
||||||
|
})
|
|
@ -0,0 +1,194 @@
|
||||||
|
require("oil").setup({
|
||||||
|
-- Oil will take over directory buffers (e.g. `vim .` or `:e src/`)
|
||||||
|
-- Set to false if you want some other plugin (e.g. netrw) to open when you edit directories.
|
||||||
|
default_file_explorer = true,
|
||||||
|
-- Id is automatically added at the beginning, and name at the end
|
||||||
|
-- See :help oil-columns
|
||||||
|
columns = {
|
||||||
|
"icon",
|
||||||
|
-- "permissions",
|
||||||
|
-- "size",
|
||||||
|
-- "mtime",
|
||||||
|
},
|
||||||
|
-- Buffer-local options to use for oil buffers
|
||||||
|
buf_options = {
|
||||||
|
buflisted = false,
|
||||||
|
bufhidden = "hide",
|
||||||
|
},
|
||||||
|
-- Window-local options to use for oil buffers
|
||||||
|
win_options = {
|
||||||
|
wrap = false,
|
||||||
|
signcolumn = "no",
|
||||||
|
cursorcolumn = false,
|
||||||
|
foldcolumn = "0",
|
||||||
|
spell = false,
|
||||||
|
list = false,
|
||||||
|
conceallevel = 3,
|
||||||
|
concealcursor = "nvic",
|
||||||
|
},
|
||||||
|
-- Send deleted files to the trash instead of permanently deleting them (:help oil-trash)
|
||||||
|
delete_to_trash = true,
|
||||||
|
-- Skip the confirmation popup for simple operations (:help oil.skip_confirm_for_simple_edits)
|
||||||
|
skip_confirm_for_simple_edits = true,
|
||||||
|
-- Selecting a new/moved/renamed file or directory will prompt you to save changes first
|
||||||
|
-- (:help prompt_save_on_select_new_entry)
|
||||||
|
prompt_save_on_select_new_entry = true,
|
||||||
|
-- Oil will automatically delete hidden buffers after this delay
|
||||||
|
-- You can set the delay to false to disable cleanup entirely
|
||||||
|
-- Note that the cleanup process only starts when none of the oil buffers are currently displayed
|
||||||
|
cleanup_delay_ms = 2000,
|
||||||
|
lsp_file_methods = {
|
||||||
|
-- Enable or disable LSP file operations
|
||||||
|
enabled = true,
|
||||||
|
-- Time to wait for LSP file operations to complete before skipping
|
||||||
|
timeout_ms = 1000,
|
||||||
|
-- Set to true to autosave buffers that are updated with LSP willRenameFiles
|
||||||
|
-- Set to "unmodified" to only save unmodified buffers
|
||||||
|
autosave_changes = false,
|
||||||
|
},
|
||||||
|
-- Constrain the cursor to the editable parts of the oil buffer
|
||||||
|
-- Set to `false` to disable, or "name" to keep it on the file names
|
||||||
|
constrain_cursor = "editable",
|
||||||
|
-- Set to true to watch the filesystem for changes and reload oil
|
||||||
|
watch_for_changes = false,
|
||||||
|
-- Keymaps in oil buffer. Can be any value that `vim.keymap.set` accepts OR a table of keymap
|
||||||
|
-- options with a `callback` (e.g. { callback = function() ... end, desc = "", mode = "n" })
|
||||||
|
-- Additionally, if it is a string that matches "actions.<name>",
|
||||||
|
-- it will use the mapping at require("oil.actions").<name>
|
||||||
|
-- Set to `false` to remove a keymap
|
||||||
|
-- See :help oil-actions for a list of all available actions
|
||||||
|
keymaps = {
|
||||||
|
["g?"] = "actions.show_help",
|
||||||
|
["<CR>"] = "actions.select",
|
||||||
|
["<C-s>"] = { "actions.select", opts = { vertical = true }, desc = "Open the entry in a vertical split" },
|
||||||
|
["<C-h>"] = { "actions.select", opts = { horizontal = true }, desc = "Open the entry in a horizontal split" },
|
||||||
|
["<C-t>"] = { "actions.select", opts = { tab = true }, desc = "Open the entry in new tab" },
|
||||||
|
["<C-p>"] = "actions.preview",
|
||||||
|
["<C-c>"] = "actions.close",
|
||||||
|
["<C-l>"] = "actions.refresh",
|
||||||
|
["-"] = "actions.parent",
|
||||||
|
["_"] = "actions.open_cwd",
|
||||||
|
["`"] = "actions.cd",
|
||||||
|
["~"] = { "actions.cd", opts = { scope = "tab" }, desc = ":tcd to the current oil directory", mode = "n" },
|
||||||
|
["gs"] = "actions.change_sort",
|
||||||
|
["gx"] = "actions.open_external",
|
||||||
|
["g."] = "actions.toggle_hidden",
|
||||||
|
["g\\"] = "actions.toggle_trash",
|
||||||
|
},
|
||||||
|
-- Set to false to disable all of the above keymaps
|
||||||
|
use_default_keymaps = true,
|
||||||
|
view_options = {
|
||||||
|
-- Show files and directories that start with "."
|
||||||
|
show_hidden = true,
|
||||||
|
-- This function defines what is considered a "hidden" file
|
||||||
|
is_hidden_file = function(name, bufnr)
|
||||||
|
local m = name:match("^%.")
|
||||||
|
return m ~= nil
|
||||||
|
end,
|
||||||
|
-- This function defines what will never be shown, even when `show_hidden` is set
|
||||||
|
is_always_hidden = function(name, bufnr)
|
||||||
|
return false
|
||||||
|
end,
|
||||||
|
-- Sort file names with numbers in a more intuitive order for humans.
|
||||||
|
-- Can be "fast", true, or false. "fast" will turn it off for large directories.
|
||||||
|
natural_order = "fast",
|
||||||
|
-- Sort file and directory names case insensitive
|
||||||
|
case_insensitive = false,
|
||||||
|
sort = {
|
||||||
|
-- sort order can be "asc" or "desc"
|
||||||
|
-- see :help oil-columns to see which columns are sortable
|
||||||
|
{ "type", "asc" },
|
||||||
|
{ "name", "asc" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
-- Extra arguments to pass to SCP when moving/copying files over SSH
|
||||||
|
extra_scp_args = {},
|
||||||
|
-- EXPERIMENTAL support for performing file operations with git
|
||||||
|
git = {
|
||||||
|
-- Return true to automatically git add/mv/rm files
|
||||||
|
add = function(path)
|
||||||
|
return false
|
||||||
|
end,
|
||||||
|
mv = function(src_path, dest_path)
|
||||||
|
return false
|
||||||
|
end,
|
||||||
|
rm = function(path)
|
||||||
|
return false
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
-- Configuration for the floating window in oil.open_float
|
||||||
|
float = {
|
||||||
|
-- Padding around the floating window
|
||||||
|
padding = 2,
|
||||||
|
max_width = 0,
|
||||||
|
max_height = 0,
|
||||||
|
border = "rounded",
|
||||||
|
win_options = {
|
||||||
|
winblend = 0,
|
||||||
|
},
|
||||||
|
-- optionally override the oil buffers window title with custom function: fun(winid: integer): string
|
||||||
|
get_win_title = nil,
|
||||||
|
-- preview_split: Split direction: "auto", "left", "right", "above", "below".
|
||||||
|
preview_split = "auto",
|
||||||
|
-- This is the config that will be passed to nvim_open_win.
|
||||||
|
-- Change values here to customize the layout
|
||||||
|
override = function(conf)
|
||||||
|
return conf
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
-- Configuration for the file preview window
|
||||||
|
preview_win = {
|
||||||
|
-- Whether the preview window is automatically updated when the cursor is moved
|
||||||
|
update_on_cursor_moved = true,
|
||||||
|
-- Maximum file size in megabytes to preview
|
||||||
|
max_file_size_mb = 100,
|
||||||
|
-- Window-local options to use for preview window buffers
|
||||||
|
win_options = {},
|
||||||
|
},
|
||||||
|
-- Configuration for the floating action confirmation window
|
||||||
|
confirmation = {
|
||||||
|
-- Width dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%)
|
||||||
|
-- min_width and max_width can be a single value or a list of mixed integer/float types.
|
||||||
|
-- max_width = {100, 0.8} means "the lesser of 100 columns or 80% of total"
|
||||||
|
max_width = 0.9,
|
||||||
|
-- min_width = {40, 0.4} means "the greater of 40 columns or 40% of total"
|
||||||
|
min_width = { 40, 0.4 },
|
||||||
|
-- optionally define an integer/float for the exact width of the preview window
|
||||||
|
width = nil,
|
||||||
|
-- Height dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%)
|
||||||
|
-- min_height and max_height can be a single value or a list of mixed integer/float types.
|
||||||
|
-- max_height = {80, 0.9} means "the lesser of 80 columns or 90% of total"
|
||||||
|
max_height = 0.9,
|
||||||
|
-- min_height = {5, 0.1} means "the greater of 5 columns or 10% of total"
|
||||||
|
min_height = { 5, 0.1 },
|
||||||
|
-- optionally define an integer/float for the exact height of the preview window
|
||||||
|
height = nil,
|
||||||
|
border = "rounded",
|
||||||
|
win_options = {
|
||||||
|
winblend = 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
-- Configuration for the floating progress window
|
||||||
|
progress = {
|
||||||
|
max_width = 0.9,
|
||||||
|
min_width = { 40, 0.4 },
|
||||||
|
width = nil,
|
||||||
|
max_height = { 10, 0.9 },
|
||||||
|
min_height = { 5, 0.1 },
|
||||||
|
height = nil,
|
||||||
|
border = "rounded",
|
||||||
|
minimized_border = "none",
|
||||||
|
win_options = {
|
||||||
|
winblend = 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
-- Configuration for the floating SSH window
|
||||||
|
ssh = {
|
||||||
|
border = "rounded",
|
||||||
|
},
|
||||||
|
-- Configuration for the floating keymaps help window
|
||||||
|
keymaps_help = {
|
||||||
|
border = "rounded",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
|
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
|
||||||
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
|
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
|
||||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||||
|
"compare-remotes.nvim": { "branch": "main", "commit": "501f6dba3c916204a3bf586d7b4b789a64157aad" },
|
||||||
"copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" },
|
"copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" },
|
||||||
"dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
|
"dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
|
||||||
"harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
|
"harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
|
||||||
|
@ -16,6 +17,7 @@
|
||||||
"lsp-zero.nvim": { "branch": "v3.x", "commit": "ab2a3413646fedd77aa0eab4214a6473e62f6a64" },
|
"lsp-zero.nvim": { "branch": "v3.x", "commit": "ab2a3413646fedd77aa0eab4214a6473e62f6a64" },
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
||||||
|
"mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" },
|
||||||
"mini.nvim": { "branch": "main", "commit": "b07157c51e52a1b004ec7959f9618e9bc24686d3" },
|
"mini.nvim": { "branch": "main", "commit": "b07157c51e52a1b004ec7959f9618e9bc24686d3" },
|
||||||
"neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
|
"neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
|
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
|
||||||
|
@ -23,6 +25,7 @@
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "f012c1b176f0e3c71f40eb309bdec0316689462e" },
|
"nvim-lspconfig": { "branch": "master", "commit": "f012c1b176f0e3c71f40eb309bdec0316689462e" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "37427012d1c77c544356bfff0c9acc88fd3256bc" },
|
"nvim-treesitter": { "branch": "master", "commit": "37427012d1c77c544356bfff0c9acc88fd3256bc" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "e87554285f581047b1bf236794b0eb812b444b87" },
|
"nvim-web-devicons": { "branch": "master", "commit": "e87554285f581047b1bf236794b0eb812b444b87" },
|
||||||
|
"oil.nvim": { "branch": "master", "commit": "8ea40b5506115b6d355e304dd9ee5089f7d78601" },
|
||||||
"playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
|
"playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
||||||
"render-markdown.nvim": { "branch": "main", "commit": "7f0143e9adf7140c8e3fa33a5bdf193d7a8f0429" },
|
"render-markdown.nvim": { "branch": "main", "commit": "7f0143e9adf7140c8e3fa33a5bdf193d7a8f0429" },
|
||||||
|
|
|
@ -15,7 +15,17 @@ vim.opt.rtp:prepend(lazypath)
|
||||||
return require('lazy').setup({
|
return require('lazy').setup({
|
||||||
-- Highlight todo, notes, etc in comments
|
-- Highlight todo, notes, etc in comments
|
||||||
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
|
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
|
||||||
|
|
||||||
|
{
|
||||||
|
'stevearc/oil.nvim',
|
||||||
|
---@module 'oil'
|
||||||
|
---@type oil.SetupOpts
|
||||||
|
opts = {},
|
||||||
|
-- Optional dependencies
|
||||||
|
dependencies = { { "echasnovski/mini.icons", opts = {} } },
|
||||||
|
-- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if prefer nvim-web-devicons
|
||||||
|
},
|
||||||
|
"aaron-p1/compare-remotes.nvim",
|
||||||
{ -- Collection of various small independent plugins/modules
|
{ -- Collection of various small independent plugins/modules
|
||||||
'echasnovski/mini.nvim',
|
'echasnovski/mini.nvim',
|
||||||
config = function()
|
config = function()
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
vim.g.mapleader = " "
|
vim.g.mapleader = " "
|
||||||
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
|
vim.keymap.set("n", "<leader>pv", '<cmd>Oil<CR>')
|
||||||
vim.keymap.set("n", "<C-n>", ":Neotree right filesystem toggle<CR>")
|
vim.keymap.set("n", "<C-n>", ":Neotree right filesystem toggle<CR>")
|
||||||
|
|
||||||
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
|
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
|
||||||
|
@ -190,7 +190,7 @@ vim.keymap.set('n', '<leader>cd', function()
|
||||||
vim.cmd('cd ' .. config_dir)
|
vim.cmd('cd ' .. config_dir)
|
||||||
|
|
||||||
-- Open file explorer in the config directory
|
-- Open file explorer in the config directory
|
||||||
vim.cmd('Ex ' .. config_dir)
|
vim.cmd('Oil ' .. config_dir)
|
||||||
end, { desc = 'Jump to Neovim config directory' })
|
end, { desc = 'Jump to Neovim config directory' })
|
||||||
|
|
||||||
vim.keymap.set('n', '<A-z>', ToggleZen, { desc = 'Zen Mode' })
|
vim.keymap.set('n', '<A-z>', ToggleZen, { desc = 'Zen Mode' })
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
-- Define a custom shortcut that runs when Neovim starts
|
-- Define a custom shortcut that runs when Neovim starts
|
||||||
vim.api.nvim_create_autocmd("UIEnter", {
|
vim.api.nvim_create_autocmd("UIEnter", {
|
||||||
callback = function()
|
callback = function()
|
||||||
vim.cmd("vsplit | Explore")
|
vim.cmd("vsplit")
|
||||||
vim.cmd("wincmd l")
|
vim.cmd("wincmd l")
|
||||||
vim.cmd("Explore")
|
|
||||||
vim.cmd("ShowkeysToggle")
|
vim.cmd("ShowkeysToggle")
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue