aboutsummaryrefslogtreecommitdiff
path: root/.config/nvim/lua
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim/lua')
-rw-r--r--.config/nvim/lua/map.lua6
-rw-r--r--.config/nvim/lua/plugin/lsp.lua7
-rw-r--r--.config/nvim/lua/plugin/packer.lua4
-rw-r--r--.config/nvim/lua/plugin/setup.lua2
4 files changed, 13 insertions, 6 deletions
diff --git a/.config/nvim/lua/map.lua b/.config/nvim/lua/map.lua
index 94f57d2..6dcc1da 100644
--- a/.config/nvim/lua/map.lua
+++ b/.config/nvim/lua/map.lua
@@ -40,9 +40,11 @@ vim.keymap.set(nv, "G", "Gzz", {})
-- Make going to the end of a line as easy as going to the beginning
vim.keymap.set({"n", "v", "o"}, "+", "$", {})
--- Allow yanking to system clipboard
+-- Yanking and pasting
vim.keymap.set(nv, "<leader>y", "\"+y", {})
vim.keymap.set(nv, "<leader>p", "\"+p", {})
+vim.keymap.set("x", "p", "\"_dP", {})
+vim.keymap.set("x", "<leader>P", "p", {})
-- Commands
vim.keymap.set(nv, "<leader>c", "<CMD>set invhlsearch<CR>", {silent=true})
@@ -51,6 +53,8 @@ vim.keymap.set(nv, "<leader>t", function()
vim.cmd("split")
vim.cmd("term")
end, {silent=true})
+vim.keymap.set("n", "{", "<CMD>cp<CR>", {silent=true})
+vim.keymap.set("n", "}", "<CMD>cn<CR>", {silent=true})
-- Common typo with me
vim.api.nvim_create_user_command("W", "w", {bang=true})
diff --git a/.config/nvim/lua/plugin/lsp.lua b/.config/nvim/lua/plugin/lsp.lua
index 0c02c4f..fc4b869 100644
--- a/.config/nvim/lua/plugin/lsp.lua
+++ b/.config/nvim/lua/plugin/lsp.lua
@@ -30,11 +30,6 @@ cmp.setup {
})
}
-require("lsp-format").setup {}
-require("lspconfig").clangd.setup {
- on_attach = require("lsp-format").on_attach
-}
-
lsp.on_attach(function(client, buffer)
local opts = { buffer = buffer, remap = false }
@@ -51,3 +46,5 @@ lsp.setup()
vim.diagnostic.config {
virtual_text = true
}
+
+vim.g.zig_fmt_autosave = 0
diff --git a/.config/nvim/lua/plugin/packer.lua b/.config/nvim/lua/plugin/packer.lua
index f03cca2..eb980fc 100644
--- a/.config/nvim/lua/plugin/packer.lua
+++ b/.config/nvim/lua/plugin/packer.lua
@@ -1,6 +1,10 @@
return require("packer").startup(function(use)
use {"wbthomason/packer.nvim"}
+ use {"andweeb/presence.nvim"}
+
+ use {"hobby-engine/hobby-script-vim"}
+
use {
"nvim-telescope/telescope.nvim",
requires = {
diff --git a/.config/nvim/lua/plugin/setup.lua b/.config/nvim/lua/plugin/setup.lua
index 2eaeee8..c0db20d 100644
--- a/.config/nvim/lua/plugin/setup.lua
+++ b/.config/nvim/lua/plugin/setup.lua
@@ -10,6 +10,8 @@ require("oil").setup {
},
}
+require("presence").setup {}
+
vim.cmd.colorscheme("mine")
local colors = {