Update neovim config

2 files changed, 25 insertions, 65 deletions

diff --git a/.config/alacritty.toml b/.config/alacritty.toml
index b099eff..a72dfca 100644
--- a/.config/alacritty.toml
+++ b/.config/alacritty.toml
@@ -37,4 +37,3 @@ blue = "#8833FF"
 magenta = "#ff4499"
 cyan = "#22ccff"
 white = "#FFFFFF"
-
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index e993929..53de7f5 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -3,8 +3,6 @@
 vim.o.termguicolors = true
 vim.o.relativenumber = true
 vim.o.number = true
-vim.o.cursorline = true
-vim.o.cursorlineopt = "line"
 vim.o.cc = "80"
 vim.o.swapfile = false
 vim.o.splitright = true
@@ -12,82 +10,45 @@ vim.o.splitbelow = true
 vim.o.winborder = "bold"
 vim.o.signcolumn = "yes"
 vim.o.guicursor =
-  "n-v:block,i:ver25,r:hor100,i-r:blinkon100,i-r:blinkoff100,n-v:blinkon0"
-
-local tabwidth = 2
-vim.o.tabstop = tabwidth
-vim.o.softtabstop = tabwidth
-vim.o.shiftwidth = tabwidth
+  "n-v:block,i-c:ver25,r-cr:hor100,i-r-c:blinkon100,i-r-c:blinkoff100,n-v:blinkon0"
+vim.o.tabstop = 2
+vim.o.shiftwidth = 0
 vim.o.expandtab = true
+vim.o.completeopt = "menu,menuone,noselect"
+
+vim.g.mapleader = " "
 
-require("packer").startup(function(use)
-  use {"wbthomason/packer.nvim"}
-  use {"ibhagwan/fzf-lua"}
-  use {"stevearc/oil.nvim"}
-  use {"lewis6991/gitsigns.nvim"}
-  use {"williamboman/mason.nvim"}
-  use {"neovim/nvim-lspconfig"}
-  use {"nvim-treesitter/nvim-treesitter"}
-end)
+vim.pack.add({
+  {src="https://github.com/ibhagwan/fzf-lua"},
+  {src="https://github.com/williamboman/mason.nvim"},
+  {src="https://github.com/neovim/nvim-lspconfig"},
+  {src="https://github.com/nvim-treesitter/nvim-treesitter"},
+  {src="https://github.com/rgroli/other.nvim"},
+})
 
-require("gitsigns").setup({})
 require("mason").setup({})
-require("oil").setup({})
+require("other-nvim").setup({mappings={"c"}})
 require("fzf-lua").setup(require("fzf-lua.profiles.telescope"))
-require("nvim-treesitter.configs").setup({
-	ensure_installed = {"lua", "c"},
-	highlight = {enable = true}
+require("nvim-treesitter.configs").setup(
+  {ensure_installed = {"lua", "c"},
+	highlight = {enable=true}
 })
 
-vim.cmd.colorscheme("mine")
-
-vim.g.mapleader = " "
--- $ is actually so incredibly annoying and I hate it so much ugh
-vim.keymap.set({"n", "v", "o"}, "+", "$", {})
-vim.keymap.set({"n", "v"}, "<leader>s", ":noh<CR>", {silent=true})
-vim.keymap.set("n", "<leader>e", ":Oil<CR>", {})
-vim.keymap.set("n", "<C-o>", function() FzfLua.files({}) end, {})
+vim.keymap.set("n", "<leader>e", ":Ex<CR>", {})
+vim.keymap.set("n", "<leader>j", ":Other<CR>", {})
+vim.keymap.set("n", "<C-p>", function() FzfLua.files({}) end, {})
 vim.keymap.set("n", "<C-f>", function() FzfLua.grep() end, {})
-
-local function scroll(cmd)
-  return function()
-    return math.floor(vim.fn.winheight(0) / 4) .. cmd
-  end
-end
-vim.keymap.set("n", "<C-d>", scroll("<C-e>"), {expr=true, noremap=true})
-vim.keymap.set("n", "<C-u>", scroll("<C-y>"), {expr=true, noremap=true})
-
-require("lspconfig").lua_ls.setup {
-  settings = {
-    Lua = {
-      runtime = {
-        version = "LuaJIT"
-      },
-      ["diagnostics.disable"] = {
-        "lowercase-global",
-      }
-    }
-  }
-}
+vim.keymap.set("n", "gf", ":vert wincmd f<CR>", {silent=true})
 
 vim.lsp.enable({"lua_ls", "clangd"})
 vim.api.nvim_create_autocmd("LspAttach", {
-	callback = function(ev)
+  callback = function(ev)
     local client = vim.lsp.get_client_by_id(ev.data.client_id)
-
-    -- trigger autocomplete on every keystroke
-    local chars = {}
-    for i = 32, 126 do
-      table.insert(chars, string.char(i))
-    end
-    client.server_capabilities.completionProvider.triggerCharacters = chars
-
     if client:supports_method("textDocument/completion") then
-      vim.lsp.completion.enable(true, client.id, ev.buf, {autotrigger = true})
+      vim.lsp.completion.enable(true, client.id, ev.buf, {autotrigger=true})
     end
 	end,
 })
-vim.cmd("set completeopt+=menu,menuone,noinsert")
-vim.diagnostic.config({virtual_text = true})
-
+vim.diagnostic.config({virtual_text=true, severity_sort=true})
 
+vim.cmd.colorscheme("mine")