diff --git a/lua/config/keybindings.lua b/lua/config/keybindings.lua index 7e4c741..2aa693c 100644 --- a/lua/config/keybindings.lua +++ b/lua/config/keybindings.lua @@ -3,24 +3,7 @@ vim.g.mapleader = " " vim.g.maplocalleader = ";" -- source current file -vim.keymap.set("n", " ", ":update :source", { desc = "Source current lua file" }) +vim.keymap.set("n", " ", ":update :source") -- format -vim.keymap.set("n", "lf", vim.lsp.buf.format, { desc = "Format buffer with available lsp" }) - --- setup mini.pick -vim.keymap.set("n", "ff", ":Pick files", { desc = "Search file in directory" }) -vim.keymap.set("n", "fh", ":Pick help", { desc = "Searcch neovim help" }) - --- move lines up or down -vim.keymap.set("n", "", ":m .+1==", { desc = "Move line down" }) -vim.keymap.set("n", "", ":m .-2==", { desc = "Move line up" }) -vim.keymap.set("v", "", ":m '>+1gv=gv", { desc = "Move selection down" }) -vim.keymap.set("v", "", ":m '<-2gv=gv", { desc = "Move selection up" }) - --- better indenting in visual mode -vim.keymap.set("v", "<", "", ">gv", { desc = "Indent right and reselect" }) - --- file exploring -vim.keymap.set("n", "e", ":Oil", { desc = "Open oil file explorer" }) +vim.keymap.set("n", "lf", vim.lsp.buf.format) diff --git a/lua/config/pack.lua b/lua/config/pack.lua index e4e5443..a24bd02 100644 --- a/lua/config/pack.lua +++ b/lua/config/pack.lua @@ -1,14 +1,5 @@ vim.pack.add({ - -- Colorscheme {src = "https://github.com/ellisonleao/gruvbox.nvim"}, - -- Treesitter parsers {src = "https://github.com/nvim-treesitter/nvim-treesitter"}, - -- Preconfigured lsp's {src = "https://github.com/neovim/nvim-lspconfig"}, - -- Nice file manager - {src = "https://github.com/stevearc/oil.nvim"}, - -- Amazing neovim bundle of plugins that are super nice - {src = "https://github.com/nvim-mini/mini.nvim"}, - -- Fix the annoying neovim+lua errors - {src = "https://github.com/folke/lazydev.nvim"}, }) diff --git a/lua/config/settings.lua b/lua/config/settings.lua index d901684..3fdff37 100644 --- a/lua/config/settings.lua +++ b/lua/config/settings.lua @@ -2,12 +2,6 @@ vim.opt.number = true vim.opt.relativenumber = true --- highlight cursorline -vim.opt.cursorline = true - --- highlight column 80 -vim.opt.colorcolumn = "80" - -- make splits open on bottom and right vim.opt.splitbelow = true vim.opt.splitright = true @@ -15,17 +9,13 @@ vim.opt.splitright = true -- disable line wrapping vim.opt.wrap = false --- setup tabs and indenting +-- setup tabs nicelly vim.opt.expandtab = true -vim.opt.smartindent = true -vim.opt.autoindent = true vim.opt.tabstop = 2 vim.opt.shiftwidth = 2 -vim.opt.softtabstop = 2 -- setup a nice scrolloff value vim.opt.scrolloff = 20 -vim.opt.sidescrolloff = 10 -- make virtual edit work for blocks vim.opt.virtualedit = "block" @@ -33,63 +23,8 @@ vim.opt.virtualedit = "block" -- make :s and others open a split vim.opt.inccommand = "split" --- search settings +-- ignore case vim.opt.ignorecase = true -vim.opt.smartcase = true --- matching bracket settings -vim.opt.showmatch = true -vim.opt.matchtime = 2 - --- commandline settings -vim.opt.cmdheight = 1 -vim.opt.showmode = false - --- popup settings -vim.opt.pumheight = 10 -vim.opt.pumblend = 10 -vim.opt.winblend = 0 - --- concealing settings -vim.opt.conceallevel = 0 -vim.opt.concealcursor = "" - --- redraw lazilly -vim.opt.lazyredraw = true - --- lower syntax highlighing for performance -vim.opt.synmaxcol = 300 - --- better completion options -vim.opt.completeopt = "menuone,noinsert,noselect" - --- enable signcolumn -vim.opt.signcolumn = "yes" - --- enable rounded borders -vim.opt.winborder = "rounded" - --- better file handling -vim.opt.backup = false -vim.opt.writebackup = false +-- disable neovim swap files vim.opt.swapfile = false -vim.opt.undofile = true -vim.opt.undodir = vim.fn.expand("~/.local/state/nvim/undo") -vim.opt.autoread = true -vim.opt.autowrite = true - --- durations for completion and other stuff -vim.opt.updatetime = 300 -vim.opt.timeoutlen = 500 -vim.opt.ttimeoutlen = 0 - --- change some behaviour settings -vim.opt.hidden = true -vim.opt.errorbells = false -vim.opt.backspace = "indent,eol,start" -vim.opt.autochdir = false -vim.opt.iskeyword:append("-") -- treat dash as part of the word -vim.opt.path:append("**") -- include subdirectories in search -vim.opt.selection = "exclusive" -vim.opt.modifiable = true -vim.opt.encoding = "UTF8" diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 20726e2..abb6c71 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -1,5 +1,3 @@ require("plugins.colorscheme") require("plugins.treesitter") require("plugins.lsp") -require("plugins.oil") -require("plugins.mini") diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index cfa3ff9..c004a86 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -2,6 +2,3 @@ vim.lsp.enable({ "nixd", "lua_ls", }) - --- fix stupid lua error with neovim -require("lazydev").setup() diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua deleted file mode 100644 index 71dcae0..0000000 --- a/lua/plugins/mini.lua +++ /dev/null @@ -1 +0,0 @@ -require("mini.pick").setup() diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua deleted file mode 100644 index ee12680..0000000 --- a/lua/plugins/oil.lua +++ /dev/null @@ -1 +0,0 @@ -require("oil").setup() diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json index 5292179..b6d8b78 100644 --- a/nvim-pack-lock.json +++ b/nvim-pack-lock.json @@ -4,14 +4,6 @@ "rev": "5e0a460", "src": "https://github.com/ellisonleao/gruvbox.nvim" }, - "lazydev.nvim": { - "rev": "e28ce52", - "src": "https://github.com/folke/lazydev.nvim" - }, - "mini.nvim": { - "rev": "14145d3", - "src": "https://github.com/nvim-mini/mini.nvim" - }, "nvim-lspconfig": { "rev": "ac98db2", "src": "https://github.com/neovim/nvim-lspconfig" @@ -19,10 +11,6 @@ "nvim-treesitter": { "rev": "42fc28ba", "src": "https://github.com/nvim-treesitter/nvim-treesitter" - }, - "oil.nvim": { - "rev": "7e1cd77", - "src": "https://github.com/stevearc/oil.nvim" } } } \ No newline at end of file