From 86ac63944aeb03f85579d3ed30cc8dd687e13cca Mon Sep 17 00:00:00 2001 From: Quentin Boyer Date: Fri, 5 Nov 2021 23:25:36 +0100 Subject: [PATCH] init.lua & null-ls --- home.nix | 25 +++++++++++++------------ nvim/init.lua | 40 +++++++++++++++++++--------------------- nvim/lua/lsp.lua | 16 +++++++++++++++- nvim/lua/plugins.lua | 2 ++ 4 files changed, 49 insertions(+), 34 deletions(-) diff --git a/home.nix b/home.nix index 6e823cf..1ffaa5d 100644 --- a/home.nix +++ b/home.nix @@ -56,19 +56,20 @@ in bintools httpie sqlx-cli - direnv - - /* (rsPlatform.buildRustPackage rec { - pname = "lists_cli"; - version = "0.1.0"; - src = fetchFromGitHub { - owner = "traxys"; - repo = "lists"; - rev = "2b5a1bb"; - sha256 = "0ma6j96p109sra78cr00bdkyb9c7a9mg6v2vhzy7dpnz2zmr1h93"; + direnv + (rsPlatform.buildRustPackage rec { + pname = "stylua"; + version = "0.11.0"; + src = fetchFromGitHub { + owner = "johnnymorganz"; + repo = "stylua"; + rev = "0caa9a2"; + sha256 = "1r6jr2ghha6wklm2bwrixmq0r4h5vrvaryrz11q6hpfwpicpdnn1"; }; - cargoSha256 = "18w9xirik80f91fd805xjqvifvpgdsna6y9vwgfq621b8v7xjrkv"; - }) */ + cargoSha256 = "0v2154qd4m8yqpv0v4ikhymd693p0bbf8vxf7h5bzb4d9vaxxb6m"; + }) + codespell + shellcheck ]; services = { diff --git a/nvim/init.lua b/nvim/init.lua index 94e0392..c746bf6 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -21,9 +21,9 @@ vim.g.tex_flavor = "latex" vim.o.completeopt = "menuone,noselect" -vim.g.indentLine_concealcursor = 'inc' +vim.g.indentLine_concealcursor = "inc" vim.g.indentLine_conceallevel = 2 -vim.g.indentLine_fileTypeExclude = {'markdown', 'json'} +vim.g.indentLine_fileTypeExclude = { "markdown", "json" } vim.g.grammalecte_cli_py = "/usr/bin/grammalecte-cli" latex_ignore = [[ @@ -31,8 +31,7 @@ latex_ignore = [[ typo_guillemets_typographiques_simples_doubles_fermants esp_milieu_ligne ]] -vim.g.grammalecte_disable_rules = - [[ apostrophe_typographique +vim.g.grammalecte_disable_rules = [[ apostrophe_typographique apostrophe_typographique_après_t espaces_début_ligne espaces_milieu_ligne espaces_fin_de_ligne @@ -47,29 +46,28 @@ vim.g.grammalecte_disable_rules = unit_nbsp_avant_unités3 typo_espace_manquant_après2 ]] .. latex_ignore -vim.g.languagetool_cmd = '/usr/bin/languagetool' +vim.g.languagetool_cmd = "/usr/bin/languagetool" vim.g.languagetool_lang = "fr" -vim.api.nvim_set_keymap('n', 'bp', 'Telescope buffers', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'ca', 'Telescope lsp_code_actions', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'gr', 'Telescope lsp_references', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'gW', 'Telescope lsp_workspace_symbols', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'gF', 'Telescope lsp_document_symbols', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'ft', 'Telescope file_browser', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'ge', 'Telescope lsp_document_diagnostics', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'mn', 'Telescope man_pages sections=1,3,5', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'fg', 'Telescope git_files', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'K ', 'lua vim.lsp.buf.hover()', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'ff', 'lua vim.lsp.buf.formatting()', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', '', 'Telescope spell_suggest', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'mk', 'Telescope keymaps', { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "bp", "Telescope buffers", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "ca", "Telescope lsp_code_actions", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "gr", "Telescope lsp_references", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "gW", "Telescope lsp_workspace_symbols", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "gF", "Telescope lsp_document_symbols", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "ft", "Telescope file_browser", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "ge", "Telescope lsp_document_diagnostics", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "mn", "Telescope man_pages sections=1,3,5", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "fg", "Telescope git_files", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "K ", "lua vim.lsp.buf.hover()", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "gd", "lua vim.lsp.buf.definition()", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "ff", "lua vim.lsp.buf.formatting()", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "", "Telescope spell_suggest", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "mk", "Telescope keymaps", { noremap = true, silent = true }) vim.o.omnifunc = "v:lua.vim.lsp.omnifunc" vim.o.updatetime = 300 -vim.cmd( -[[ +vim.cmd([[ command SpellFr setlocal spell spelllang=fr autocmd BufNewFile,BufRead *.nix set ft=nix diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua index a2cb3ee..07e77f1 100644 --- a/nvim/lua/lsp.lua +++ b/nvim/lua/lsp.lua @@ -1,4 +1,15 @@ -vim.lsp.set_log_level("debug") +vim.lsp.set_log_level("info") + +local null_ls = require("null-ls") +local sources = { + --null_ls.builtins.code_actions.gitsigns, + null_ls.builtins.formatting.stylua, + null_ls.builtins.formatting.trim_whitespace, + null_ls.builtins.diagnostics.shellcheck, + null_ls.builtins.diagnostics.codespell, +} + +null_ls.config({ sources = sources }) local lsp_status = require('lsp-status') lsp_status.register_progress() @@ -23,6 +34,9 @@ if not lspconfig.rsh_lsp then } end +lspconfig["null-ls"].setup{ + on_attach=lsp_status.on_attach, +} lspconfig.rust_analyzer.setup{ on_attach=lsp_status.on_attach, settings = { diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 2f990fa..88ae3c1 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -60,4 +60,6 @@ return require('packer').startup(function() use 'b3nj5m1n/kommentary' use 'onsails/lspkind-nvim' use 'editorconfig/editorconfig-vim' + + use 'jose-elias-alvarez/null-ls.nvim' end)