Neovim update

5 files changed, 28 insertions, 13 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 70bb252..183009e 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -2,4 +2,4 @@ require("opt")
 require("map")
 require("plugin")
 
-vim.cmd("colorscheme prismatic")
+vim.cmd("colorscheme monokai-pro-spectrum")
diff --git a/.config/nvim/lua/map.lua b/.config/nvim/lua/map.lua
index 2ae706b..2b3b1d0 100644
--- a/.config/nvim/lua/map.lua
+++ b/.config/nvim/lua/map.lua
@@ -44,9 +44,13 @@ vim.keymap.set(nv, "<C-.>", "<C-w>>", {})
 -- Make exiting insert mode in terminal mode easier
 vim.keymap.set("t", "<ESC>", "<C-\\><C-n>", {})
 
+-- Make it harder to accidentally undo
+vim.keymap.set(nv, "<C-u>", "u", {})
+vim.keymap.set(nv, "u", "<nop>", {})
+
 -- Center when moving around at high speeds
-vim.keymap.set(nv, "<C-u>", "<C-u>zz", {})
-vim.keymap.set(nv, "<C-d>", "<C-d>zz", {})
+vim.keymap.set(nv, "<A-k>", "<C-u>zz", {})
+vim.keymap.set(nv, "<A-j>", "<C-d>zz", {})
 vim.keymap.set(nv, "G", "Gzz", {})
 
 -- Delete line content. I didn't do ddO because that would extend comments if
@@ -57,11 +61,11 @@ vim.keymap.set("n", "dc", "cc<ESC>", {})
 vim.keymap.set({"n", "v", "o"}, "+", "$", {})
 
 -- Allow yanking to system clipboard
-vim.keymap.set(nv, "<leader>y", "\"+y", {})
-vim.keymap.set(nv, "<leader>p", "\"+p", {})
+vim.keymap.set(nv, "yc", "\"+y", {})
+vim.keymap.set(nv, "pc", "\"+p", {})
 
 -- Commands
-vim.keymap.set(nv, "<leader>c", "<CMD>noh<CR>", {silent=true})
+vim.keymap.set(nv, "<leader>c", "<CMD>set invhlsearch<CR>", {silent=true})
 vim.keymap.set(nv, "<leader>e", "<CMD>Ex<CR>", {silent=true})
 vim.keymap.set(nv, "<leader>t", function()
   vim.cmd("split")
diff --git a/.config/nvim/lua/plugin/lsp.lua b/.config/nvim/lua/plugin/lsp.lua
index 2e80d3f..8e9d66f 100644
--- a/.config/nvim/lua/plugin/lsp.lua
+++ b/.config/nvim/lua/plugin/lsp.lua
@@ -7,7 +7,6 @@ lspconfig.lua_ls.setup {}
 lspconfig.clangd.setup {}
 lspconfig.gdscript.setup {}
 
-
 require('mason').setup {}
 require('mason-lspconfig').setup {
   ensure_installed = {
@@ -31,7 +30,7 @@ cmp.setup {
   })
 }
 
-lsp.on_attach(function(_, buffer)
+lsp.on_attach(function(client, buffer)
   local opts = { buffer=buffer, remap=false }
 
   vim.keymap.set("n", "<leader>ld",  function() vim.lsp.buf.definition() end, opts)
diff --git a/.config/nvim/lua/plugin/packer.lua b/.config/nvim/lua/plugin/packer.lua
index f23e492..fefbdef 100644
--- a/.config/nvim/lua/plugin/packer.lua
+++ b/.config/nvim/lua/plugin/packer.lua
@@ -1,6 +1,6 @@
 return require("packer").startup(function(use)
   use {"wbthomason/packer.nvim"}
-  
+
   use {
     "nvim-telescope/telescope.nvim",
     requires = {
@@ -18,11 +18,16 @@ return require("packer").startup(function(use)
     }
   }
 
+  use {
+    "nvim-lualine/lualine.nvim",
+    requires = { "nvim-tree/nvim-web-devicons", opt = true }
+  }
+
   use {"lewis6991/gitsigns.nvim"}
   use {"tpope/vim-fugitive"}
   use {"numToStr/Comment.nvim"}
   use {"HiPhish/nvim-ts-rainbow2"}
-  
+
   use {
     "VonHeikemen/lsp-zero.nvim",
     requires = {
diff --git a/.config/nvim/lua/plugin/setup.lua b/.config/nvim/lua/plugin/setup.lua
index 3e58fca..a8fa995 100644
--- a/.config/nvim/lua/plugin/setup.lua
+++ b/.config/nvim/lua/plugin/setup.lua
@@ -2,6 +2,13 @@ require('gitsigns').setup {}
 
 require("Comment").setup {}
 
+require("lualine").setup {
+  options = {
+    component_separators = { left = "", right = ""  },
+    section_separators = { left = "", right = ""  },
+  },
+}
+
 require("nvim-autopairs").setup {
   fast_wrap = {
     map = "<M-e>",
@@ -37,9 +44,9 @@ require("nvim-treesitter.configs").setup {
 
 do
   local builtin = require("telescope.builtin")
-  vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
-  vim.keymap.set("n", "<leader>fg", builtin.git_files, {})
-  vim.keymap.set("n", "<leader>fs", function()
+  vim.keymap.set("n", "<C-p>", builtin.find_files, {})
+  vim.keymap.set("n", "<C-g>", builtin.git_files, {})
+  vim.keymap.set("n", "<C-o>", function()
   	builtin.grep_string({ search = vim.fn.input("grep>") })
   end)
 end