up

1 files changed, 25 insertions, 12 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index a714b79..de56e0e 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -10,12 +10,15 @@ vim.o.swapfile = false
 vim.g.mapleader = " "
 vim.o.clipboard = "unnamedplus"
 vim.o.undofile = true
-vim.o.cursorline = false
+vim.o.cursorline = true
+vim.o.cursorlineopt = "number"
 vim.o.title = true
+vim.opt.shortmess:append "sI"
 
 -- packages
 vim.pack.add({
   { src = "https://github.com/sainnhe/everforest" },
+  { src = "https://github.com/mason-org/mason.nvim", },
   { src = "https://github.com/nvim-lualine/lualine.nvim" },
   { src = "https://github.com/lewis6991/gitsigns.nvim" },
   { src = "https://github.com/cappyzawa/trim.nvim" },
@@ -32,6 +35,8 @@ vim.pack.add({
   { src = "https://github.com/numToStr/Comment.nvim" },
 })
 
+require("mason").setup()
+
 -- telescope
 local telescope = require("telescope")
 telescope.setup({
@@ -70,7 +75,8 @@ vim.keymap.set({ "n" }, "<leader>g", builtin.live_grep, { desc = "Telescope live
 -- lsp
 vim.lsp.enable({
   "lua_ls", "clangd", "rust_analyzer", "bashls",
-  "html", "cssls", "jsonls", "yamlls"
+  "html", "cssls", "jsonls", "helm_ls", "yamlls",
+  "docker_language_server"
 })
 
 vim.diagnostic.config({
@@ -83,12 +89,12 @@ vim.diagnostic.config({
       [vim.diagnostic.severity.ERROR] = '',
       [vim.diagnostic.severity.WARN] = '',
     },
-    linehl = {
-      [vim.diagnostic.severity.ERROR] = 'ErrorMsg',
-    },
-    numhl = {
-      [vim.diagnostic.severity.WARN] = 'WarningMsg',
-    },
+    -- linehl = {
+    --   [vim.diagnostic.severity.ERROR] = 'ErrorMsg',
+    -- },
+    -- numhl = {
+    --   [vim.diagnostic.severity.WARN] = 'WarningMsg',
+    -- },
   },
   underline = true,
   update_in_insert = true,
@@ -118,6 +124,7 @@ require("nvim-treesitter.configs").setup({
     "yaml",
     "toml",
     "ron",
+    "helm"
   },
   highlight = { enable = true },
   indent = { enable = true },
@@ -132,8 +139,8 @@ cmp.setup({
     end,
   },
   window = {
-    -- completion = cmp.config.window.bordered(),
-    -- documentation = cmp.config.window.bordered(),
+    completion = cmp.config.window.bordered(),
+    documentation = cmp.config.window.bordered(),
   },
   mapping = cmp.mapping.preset.insert({
     ['<C-b>'] = cmp.mapping.scroll_docs(-4),
@@ -150,7 +157,13 @@ cmp.setup({
   })
 })
 
+vim.filetype.add({
+  pattern = {
+    [".*/templates/.*%.yaml"] = "helm",
+    [".*/templates/.*%.yml"] = "helm",
+  },
+})
+
 -- theme
--- vim.g.everforest_enable_italic = true
--- vim.g.everforest_transparent_background = true
+vim.g.everforest_transparent_background = true
 vim.cmd("colorscheme everforest")