From a89408d1302e8d5c0216041a1e25a226696608e6 Mon Sep 17 00:00:00 2001 From: "Gabriel A. Giovanini" Date: Tue, 20 Aug 2024 10:20:11 +0200 Subject: feat: Sync --- Makefile | 2 +- init.lua | 4 +++- lua/gabrielgio/init.lua | 4 ++-- lua/gabrielgio/lazy.lua | 37 +++++++++++++++++++++++++++++++------ 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 4aba75d..fc3a512 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ FENNEL?=fennel SOURCES := $(shell find . -name '*.lua') install: - rm $(PREFIX)/lua/gabrielgio/* + -rm $(PREFIX)/lua/gabrielgio/* mkdir -p $(PREFIX)/lua/gabrielgio/ for name in $(SOURCES); do\ install -m644 $${name} $(PREFIX)/$${name}; \ diff --git a/init.lua b/init.lua index 24f4062..524e006 100644 --- a/init.lua +++ b/init.lua @@ -25,7 +25,8 @@ local pkgs = { "nvim-telescope/telescope-file-browser.nvim", -- telescope file browser "TimUntersberger/neogit", -- magit "echasnovski/mini.nvim", -- provides many things - "jose-elias-alvarez/null-ls.nvim", -- enriches lsp + "mhartington/formatter.nvim", -- provider formatter + "mfussenegger/nvim-lint", -- general linter "nvim-treesitter/nvim-treesitter-context", -- show context of where it is at the code "mbbill/undotree", -- keep track of undos "simrat39/symbols-outline.nvim", -- symbols tree (lsp aware) @@ -34,6 +35,7 @@ local pkgs = { "sainnhe/edge", -- light theme "ellisonleao/gruvbox.nvim", -- light theme "williamboman/mason.nvim", -- manages many things + "williamboman/mason-lspconfig.nvim", -- glue mason and lspconfig "neovim/nvim-lspconfig", -- lsp support } diff --git a/lua/gabrielgio/init.lua b/lua/gabrielgio/init.lua index 00a5ba3..1cd849a 100644 --- a/lua/gabrielgio/init.lua +++ b/lua/gabrielgio/init.lua @@ -3,9 +3,9 @@ local now, later = mini_deps.now, mini_deps.later now(function() require("gabrielgio.settable") end) now(function() require("gabrielgio.treesitter") end) +now(function() require("gabrielgio.lazy") end) +now(function() require("gabrielgio.lsp") end) -later(function() require("gabrielgio.lazy") end) -later(function() require("gabrielgio.lsp") end) later(function() require("gabrielgio.mini") end) later(function() require("gabrielgio.go") end) later(function() require("gabrielgio.telescope") end) diff --git a/lua/gabrielgio/lazy.lua b/lua/gabrielgio/lazy.lua index f5d07f7..50fd3a5 100644 --- a/lua/gabrielgio/lazy.lua +++ b/lua/gabrielgio/lazy.lua @@ -1,9 +1,34 @@ -- this file is an amalgamation of configurations that don't have its own -- config file and will be lazily loaded -local neogit = require("neogit") -local null_ls = require("null-ls") -local mason = require("mason") +require('formatter').setup() +require("mason").setup() +require("mason-lspconfig").setup { + ensure_installed = { + "gopls", + "zls", + "lua_ls", + "rust_analyzer", +-- "clangd", not working on alpine + "cssls", + "html", + "emmet_ls", + "pylsp", + "zls", + "tsserver" + }, +} + +local lint = require('lint') + +lint.linters_by_ft = { + markdown = {'vale'}, + go = {"golangcilint"}, + lua = {"luacheck"}, +} + +vim.api.nvim_create_autocmd({ "BufWritePost" }, { + callback = function() + lint.try_lint() + end, +}) -null_ls.setup({sources = {null_ls.builtins.diagnostics.golangci_lint}}) -neogit.setup() -mason.setup() -- cgit v1.2.3