summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Magnusson <mathias@magnusson.space>2026-01-21 14:14:26 +0100
committerMathias Magnusson <mathias@magnusson.space>2026-01-21 14:14:26 +0100
commit547964c295c29077e0d7af2f901dda7c5cf963d1 (patch)
treec773ae6d8041799c48b70df3efe269b15c64a4b6
parentcd60510acf9cda0fc308a4b2fa59cfdf05e74416 (diff)
downloadymer-master.tar.gz
nvim: add some pluginsmaster
-rw-r--r--dot-config/nvim/init.lua54
-rw-r--r--dot-config/nvim/nvim-pack-lock.json24
2 files changed, 71 insertions, 7 deletions
diff --git a/dot-config/nvim/init.lua b/dot-config/nvim/init.lua
index 3fe7c82..d415d8b 100644
--- a/dot-config/nvim/init.lua
+++ b/dot-config/nvim/init.lua
@@ -32,6 +32,52 @@ vim.api.nvim_create_autocmd("TextYankPost", {
callback = function() vim.highlight.on_yank() end,
})
+-- Plugins
+vim.pack.add({
+ { name = "catppuccin", src = "https://github.com/catppuccin/nvim" },
+ "https://github.com/stevearc/oil.nvim",
+ "https://github.com/nvim-mini/mini.icons",
+ "https://github.com/nvim-treesitter/nvim-treesitter",
+ "https://github.com/neovim/nvim-lspconfig",
+})
+
+require "catppuccin".setup {
+ background = { light = "latte", dark = "mocha" },
+}
+vim.cmd.colorscheme("catppuccin")
+
+require "oil".setup {
+ columns = {
+ "icon",
+ "permissions",
+ "size",
+ "mtime",
+ },
+ delete_to_trash = true,
+}
+
+require "mini.icons".setup()
+local treesitter = require "nvim-treesitter"
+treesitter.setup()
+local treesitter_languages = { "typescript", "zig" }
+treesitter.install(treesitter_languages)
+
+vim.api.nvim_create_autocmd("FileType", {
+ pattern = treesitter_languages,
+ callback = function()
+ vim.treesitter.start()
+ vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+ end,
+})
+
+-- LSP
+vim.lsp.enable({ "ts_ls" })
+
+vim.diagnostic.config({
+ virtual_text = true,
+ virtual_lines = { current_line = true },
+})
+
vim.filetype.add({
filename = {
["compose.yaml"] = "yaml.docker-compose",
@@ -43,11 +89,6 @@ vim.filetype.add({
}
})
-vim.diagnostic.config({
- virtual_text = true,
- virtual_lines = { current_line = true },
-})
-
-- Keymaps
for _, mod in ipairs({
function(x) return x end,
@@ -62,7 +103,6 @@ for _, mod in ipairs({
end
vim.g.mapleader = " "
-vim.keymap.set("n", "gp", vim.cmd.bp)
-vim.keymap.set("n", "gn", vim.cmd.bn)
vim.keymap.set("n", "<leader>h", function() set.hls = not set.hls end)
vim.keymap.set("n", "<space>", "<nop>", { silent = true })
+vim.keymap.set("n", "-", vim.cmd.Oil)
diff --git a/dot-config/nvim/nvim-pack-lock.json b/dot-config/nvim/nvim-pack-lock.json
new file mode 100644
index 0000000..53004ca
--- /dev/null
+++ b/dot-config/nvim/nvim-pack-lock.json
@@ -0,0 +1,24 @@
+{
+ "plugins": {
+ "catppuccin": {
+ "rev": "beaf41a30c26fd7d6c386d383155cbd65dd554cd",
+ "src": "https://github.com/catppuccin/nvim"
+ },
+ "mini.icons": {
+ "rev": "efc85e42262cd0c9e1fdbf806c25cb0be6de115c",
+ "src": "https://github.com/nvim-mini/mini.icons"
+ },
+ "nvim-lspconfig": {
+ "rev": "92ee7d42320edfbb81f3cad851314ab197fa324a",
+ "src": "https://github.com/neovim/nvim-lspconfig"
+ },
+ "nvim-treesitter": {
+ "rev": "ec034813775d7e2974c7551c8c34499a828963f8",
+ "src": "https://github.com/nvim-treesitter/nvim-treesitter"
+ },
+ "oil.nvim": {
+ "rev": "f55b25e493a7df76371cfadd0ded5004cb9cd48a",
+ "src": "https://github.com/stevearc/oil.nvim"
+ }
+ }
+} \ No newline at end of file