From 0912f5dc12cde4f925a0669aa6c1cbdb189b503d Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 2 Dec 2022 07:47:54 +0000 Subject: misc config changes --- users/seth/programs/git.nix | 1 + users/seth/programs/neovim/default.nix | 3 +++ users/seth/programs/neovim/lua/lua/getchoo/lsp/config/sources.lua | 5 +++++ 3 files changed, 9 insertions(+) (limited to 'users/seth') diff --git a/users/seth/programs/git.nix b/users/seth/programs/git.nix index 6164432..93f6e23 100644 --- a/users/seth/programs/git.nix +++ b/users/seth/programs/git.nix @@ -5,6 +5,7 @@ enable = true; extraConfig = { init = { defaultBranch = "main"; }; + safe = { directory = "/etc/nixos"; }; }; signing = { key = "D31BD0D494BBEE86"; diff --git a/users/seth/programs/neovim/default.nix b/users/seth/programs/neovim/default.nix index 94e30cb..977122a 100644 --- a/users/seth/programs/neovim/default.nix +++ b/users/seth/programs/neovim/default.nix @@ -4,9 +4,11 @@ programs.neovim = { enable = true; extraPackages = with pkgs; [ + alejandra black clang codespell + deadnix nodePackages.alex nodePackages.bash-language-server nodePackages.prettier @@ -14,6 +16,7 @@ python310Packages.flake8 rust-analyzer rustfmt + statix stylua sumneko-lua-language-server ]; diff --git a/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/sources.lua b/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/sources.lua index 1898870..c8c67d1 100644 --- a/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/sources.lua +++ b/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/sources.lua @@ -1,13 +1,18 @@ local null_ls = require("null-ls") +local code_actions = null_ls.builtins.code_actions local diagnostics = null_ls.builtins.diagnostics local formatting = null_ls.builtins.formatting local M = { lsp_servers = { "rust_analyzer", "pyright", "bashls" }, null_ls = { + code_actions.statix, diagnostics.alex, diagnostics.codespell, + diagnostics.statix, + diagnostics.deadnix, diagnostics.flake8, + formatting.alejandra, formatting.black, formatting.codespell, formatting.prettier, -- cgit v1.2.3