init.lua & null-ls

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 = {

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', '<cmd>Telescope buffers<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', 'ca', '<cmd>Telescope lsp_code_actions<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', 'gr', '<cmd>Telescope lsp_references<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', 'gW', '<cmd>Telescope lsp_workspace_symbols<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', 'gF', '<cmd>Telescope lsp_document_symbols<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', 'ft', '<cmd>Telescope file_browser<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', 'ge', '<cmd>Telescope lsp_document_diagnostics<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', 'mn', '<cmd>Telescope man_pages sections=1,3,5<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', 'fg', '<cmd>Telescope git_files<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', 'K ', '<cmd>lua vim.lsp.buf.hover()<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', 'ff', '<cmd>lua vim.lsp.buf.formatting()<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', '<C-s>', '<cmd>Telescope spell_suggest<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', 'mk', '<cmd>Telescope keymaps<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "bp", "<cmd>Telescope buffers<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "ca", "<cmd>Telescope lsp_code_actions<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "gr", "<cmd>Telescope lsp_references<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "gW", "<cmd>Telescope lsp_workspace_symbols<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "gF", "<cmd>Telescope lsp_document_symbols<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "ft", "<cmd>Telescope file_browser<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "ge", "<cmd>Telescope lsp_document_diagnostics<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "mn", "<cmd>Telescope man_pages sections=1,3,5<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "fg", "<cmd>Telescope git_files<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "K ", "<cmd>lua vim.lsp.buf.hover()<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "ff", "<cmd>lua vim.lsp.buf.formatting()<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "<C-s>", "<cmd>Telescope spell_suggest<CR>", { noremap = true, silent = true })
+vim.api.nvim_set_keymap("n", "mk", "<cmd>Telescope keymaps<CR>", { 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

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 = {

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)