diff --git a/lua/options/keybind.lua b/lua/options/keybind.lua index f1e1cc6..d1aba33 100755 --- a/lua/options/keybind.lua +++ b/lua/options/keybind.lua @@ -1,7 +1,5 @@ vim.g.mapleader = " " - - local map = vim.api.nvim_set_keymap local cmap = vim.keymap.set @@ -9,12 +7,12 @@ local options = { noremap = true } local cmd_options = { noremap = true, silent = true } -map("n", "tt", "lua require('FTerm').toggle()", options) - -- slef explanitory map("n", "tw", "lua MiniTrailspace.trim()", options) -map("n", "fm", "NvimTreeToggle", options) +vim.keymap.set("n", "f", function() + require("oil").open() +end) -- remap keys so that they dont skip camelCase map("n", "w", "CamelCaseMotion_w", cmd_options) @@ -46,10 +44,10 @@ cmap({ "n", "v" }, "d", [["_d]]) -- quickfix stuff -- -- -map("n", "", "cnextzz", options) -map("n", "", "cprevzz", options) -map("n", "k", "lnextzz", options) -map("n", "j", "lprevzz", options) +-- map("n", "", "cnextzz", options) +-- map("n", "", "cprevzz", options) +-- map("n", "k", "lnextzz", options) +-- map("n", "j", "lprevzz", options) -- search and replace every instance of word under cursor diff --git a/lua/options/opts.lua b/lua/options/opts.lua index 2b4ef44..c68d6fe 100755 --- a/lua/options/opts.lua +++ b/lua/options/opts.lua @@ -21,8 +21,6 @@ o.compatible = false -- disable compatibility with old vi o.showmatch = true -- show matches while searching for text o.hlsearch = true -- highlight text that has been searched o.incsearch = true -- incramentally search -o.tabstop = 16 -o.softtabstop = 4 o.shiftwidth = 4 o.autoindent = true o.wildmode = "longest,list" @@ -34,7 +32,8 @@ o.cursorline = true o.splitbelow = true o.autochdir = true o.signcolumn="yes:1" -o.shell = "/bin/bash" +o.shell = "/bin/zsh" +o.splitright = false vim.api.nvim_command("filetype off") vim.api.nvim_command("let &runtimepath.=',~/.vim/bundle/neoterm'") diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 35c37ec..97ab96c 100755 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -1,13 +1,14 @@ require("plugins.lazy") +require("plugins.harpoon") require("plugins.treesitter") require("plugins.lsp-zero") require("plugins.devicons") require("plugins.lualine") require("plugins.hlblocks") require("plugins.gitsigns") -require("plugins.nvimtree") -require("plugins.bufferline") +-- require("plugins.nvimtree") +-- require("plugins.bufferline") require("plugins.wilder") require("plugins.mini") -require("plugins.harpoon") -require("plugins.fterm") +require("plugins.oil") +-- require("plugins.fterm") diff --git a/lua/plugins/keybind.lua b/lua/plugins/keybind.lua deleted file mode 100644 index 6d8849d..0000000 --- a/lua/plugins/keybind.lua +++ /dev/null @@ -1,59 +0,0 @@ -vim.g.mapleader = " " -vim.opt.laststatus=2 - -vim.keymap.set('i', '', [[pumvisible() ? "\" : "\"]], { expr = true }) -vim.keymap.set('i', '', [[pumvisible() ? "\" : "\"]], { expr = true }) - - -local map = vim.api.nvim_set_keymap -local cmap = vim.keymap.set - -local options = { noremap = true } -local cmd_options = { noremap = true, silent = true } - - -map("n", "tt", "lua require('FTerm').toggle()", options) - --- slef explanitory -map("n", "tw", "lua MiniTrailspace.trim()", options) -map("n", "fm", "NvimTreeToggle", options) - - --- remap keys so that they dont skip camelCase -map("n", "w", "CamelCaseMotion_w", cmd_options) -map("n", "b", "CamelCaseMotion_b", cmd_options) -map("n", "e", "CamelCaseMotion_e", cmd_options) -map("n", "ge", "CamelCaseMotion_ge", cmd_options) - - --- this little guy helps you move text, really helpful -map("v", "J", ":m '>+1gv=gv", options) -map("v", "K", ":m '<-2gv=gv", options) - - --- Cursor always stays on center -map("n", "J", "mzJ`z", options) -map("n", "", "zz", options) -map("n", "", "zz", options) -map("n", "n", "nzzzv", options) -map("n", "N", "Nzzzv", options) - - - --- paste text but DONT copy the overridden text -cmap("x", "p", [["_dP]]) -cmap("x", "p", [["+dP]]) --- delete text but DONT copy to clipboard -cmap({ "n", "v" }, "d", [["_d]]) - --- quickfix stuff --- --- -map("n", "", "cnextzz", options) -map("n", "", "cprevzz", options) -map("n", "k", "lnextzz", options) -map("n", "j", "lprevzz", options) - - --- search and replace every instance of word under cursor -cmap("n", "s", [[:%s/\<\>//gI]]) diff --git a/lua/plugins/lazy.lua b/lua/plugins/lazy.lua index 93291cb..8f0710b 100755 --- a/lua/plugins/lazy.lua +++ b/lua/plugins/lazy.lua @@ -15,130 +15,86 @@ end vim.opt.rtp:prepend(lazypath) - - - require("lazy").setup({ - -- colorscheme - "EdenEast/nightfox.nvim", + 'EdenEast/nightfox.nvim', 'luckasRanarison/tree-sitter-hypr', 'lambdalisue/nerdfont.vim', 'gelguy/wilder.nvim', - -- it's annoying that w skips the whole word, so let's fix it - "bkad/camelcasemotion", + 'bkad/camelcasemotion', + 'lewis6991/gitsigns.nvim', - "lewis6991/gitsigns.nvim", - - -- for faster file navigation { - "nvim-tree/nvim-tree.lua", - version = "*", - lazy = false, - dependencies = { - "nvim-tree/nvim-web-devicons", - }, + 'stevearc/oil.nvim', + dependencies = { + "nvim-tree/nvim-web-devicons" + }, }, - - -- Surround text with quotes etc { - "kylechui/nvim-surround", - version = "*", -- Use for stability; omit to use `main` branch for the latest features + 'kylechui/nvim-surround', + version = '*', -- Use for stability; omit to use `main` branch for the latest features config = function() - require("nvim-surround").setup() + require('nvim-surround').setup() end }, - { - 'numToStr/FTerm.nvim' - }, - - -- highlight current scope - { - - "shellRaining/hlchunk.nvim", - event = { "UIEnter" }, - + 'shellRaining/hlchunk.nvim', + event = { + 'UIEnter' + }, }, { - "ThePrimeagen/harpoon", - branch = "harpoon2", + 'ThePrimeagen/harpoon', + branch = 'harpoon2', dependencies = { - "nvim-lua/plenary.nvim" + 'nvim-lua/plenary.nvim' } }, - -- better status line than stock one { - "nvim-lualine/lualine.nvim", + 'nvim-lualine/lualine.nvim', dependencies = { - "nvim-tree/nvim-web-devicons", + 'nvim-tree/nvim-web-devicons', opt = true } }, - -- need that syntax highlight amirite { - "nvim-treesitter/nvim-treesitter", - build = ":TSUpdate" - }, - - -- using lazy.nvim - { - "akinsho/bufferline.nvim", - version = "*", - dependencies = 'nvim-tree/nvim-web-devicons', - config = function () - vim.opt.termguicolors = true - require("bufferline").setup{} - end + 'nvim-treesitter/nvim-treesitter', + build = ':TSUpdate' }, { - "williamboman/mason.nvim" - }, - - {"neovim/nvim-lspconfig"}, -- Required - {"williamboman/mason.nvim"}, -- Optional - {"williamboman/mason-lspconfig.nvim"}, - - -- this is pure magic, i love this guy - { - "VonHeikemen/lsp-zero.nvim", + 'VonHeikemen/lsp-zero.nvim', branch = 'v3.x', dependencies = { -- LSP Support - {"neovim/nvim-lspconfig"}, -- Required - { "williamboman/mason.nvim"}, -- Optional - {"williamboman/mason-lspconfig.nvim"}, -- Optional + {'neovim/nvim-lspconfig'}, -- Required + {'williamboman/mason.nvim'}, -- Optional + {'williamboman/mason-lspconfig.nvim'}, -- Optional -- Autocompletion - {"hrsh7th/nvim-cmp"}, -- Required - {"hrsh7th/cmp-nvim-lsp"}, -- Required - {"L3MON4D3/LuaSnip"}, -- Required + {'hrsh7th/nvim-cmp'}, -- Required + {'hrsh7th/cmp-nvim-lsp'}, -- Required + {'L3MON4D3/LuaSnip'}, -- Required } }, { - 'echasnovski/mini.nvim', version = false + 'echasnovski/mini.nvim', + version = false }, }) - - - - vim.opt.laststatus=2 vim.keymap.set('i', '', [[pumvisible() ? "\" : "\"]], { expr = true }) vim.keymap.set('i', '', [[pumvisible() ? "\" : "\"]], { expr = true }) - - diff --git a/lua/plugins/lsp-zero.lua b/lua/plugins/lsp-zero.lua index 603255f..740a26b 100755 --- a/lua/plugins/lsp-zero.lua +++ b/lua/plugins/lsp-zero.lua @@ -11,20 +11,19 @@ end) require('lspconfig').lua_ls.setup(lsp.nvim_lua_ls()) -require'lspconfig'.pylsp.setup{ - settings = { - pylsp = { - plugins = { - pycodestyle = { - ignore = {'W391', 'E303', 'E226'}, - maxLineLength = 120 +require('lspconfig').pylsp.setup{ + settings = { + pylsp = { + plugins = { + pycodestyle = { + ignore = {'W391', 'E303', 'E226'}, + maxLineLength = 120 + } + } } - } } - } } - lsp.setup() -- You need to setup `cmp` after lsp-zero diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua new file mode 100644 index 0000000..1e1aaca --- /dev/null +++ b/lua/plugins/oil.lua @@ -0,0 +1,177 @@ +require("oil").setup({ + -- Oil will take over directory buffers (e.g. `vim .` or `:e src/`) + -- Set to false if you still want to use netrw. + 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 = false, + -- Skip the confirmation popup for simple operations (:help oil.skip_confirm_for_simple_edits) + skip_confirm_for_simple_edits = false, + -- 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 = { + -- 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 + experimental_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.", + -- it will use the mapping at require("oil.actions"). + -- Set to `false` to remove a keymap + -- See :help oil-actions for a list of all available actions + keymaps = { + ["g?"] = "actions.show_help", + [""] = "actions.select", + [""] = "actions.select_vsplit", + [""] = "actions.select_split", + [""] = "actions.select_tab", + [""] = "actions.preview", + [""] = "actions.close", + [""] = "actions.refresh", + ["-"] = "actions.parent", + ["_"] = "actions.open_cwd", + ["`"] = "actions.cd", + ["~"] = "actions.tcd", + ["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 = false, + -- This function defines what is considered a "hidden" file + is_hidden_file = function(name, bufnr) + return vim.startswith(name, ".") + 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 in a more intuitive order for humans. Is less performant, + -- so you may want to set to false if you work with large directories. + natural_order = true, + 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, + }, + -- 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 actions floating preview window + preview = { + -- 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, + }, + -- Whether the preview window is automatically updated when the cursor is moved + update_on_cursor_moved = true, + }, + -- 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", + }, +})