Updated non-necessary lsps and formatters

This commit is contained in:
Fred Drake
2024-10-03 21:14:18 -04:00
parent 66d63960cf
commit ced6c4d36e
+26 -21
View File
@@ -1,11 +1,16 @@
let selectOpts = "{behavior = cmp.SelectBehavior.Select}"; let
in { pkgs, ... }: { selectOpts = "{behavior = cmp.SelectBehavior.Select}";
in
{ pkgs, ... }:
{
plugins = { plugins = {
cmp = { cmp = {
enable = true; enable = true;
settings = { settings = {
autoEnableSources = true; autoEnableSources = true;
performance = { debounce = 150; }; performance = {
debounce = 150;
};
sources = [ sources = [
{ name = "path"; } { name = "path"; }
{ {
@@ -19,10 +24,13 @@ in { pkgs, ... }: {
{ name = "supermaven"; } { name = "supermaven"; }
]; ];
snippet.expand = snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
"function(args) require('luasnip').lsp_expand(args.body) end";
formatting = { formatting = {
fields = [ "menu" "abbr" "kind" ]; fields = [
"menu"
"abbr"
"kind"
];
format = '' format = ''
function(entry, item) function(entry, item)
local menu_icon = { local menu_icon = {
@@ -111,8 +119,7 @@ in { pkgs, ... }: {
window = { window = {
completion = { completion = {
border = "rounded"; border = "rounded";
winhighlight = winhighlight = "Normal:Normal,FloatBorder:Normal,CursorLine:Visual,Search:None";
"Normal:Normal,FloatBorder:Normal,CursorLine:Visual,Search:None";
zindex = 1001; zindex = 1001;
scrolloff = 0; scrolloff = 0;
colOffset = 0; colOffset = 0;
@@ -121,8 +128,7 @@ in { pkgs, ... }: {
}; };
documentation = { documentation = {
border = "rounded"; border = "rounded";
winhighlight = winhighlight = "Normal:Normal,FloatBorder:Normal,CursorLine:Visual,Search:None";
"Normal:Normal,FloatBorder:Normal,CursorLine:Visual,Search:None";
zindex = 1001; zindex = 1001;
maxHeight = 20; maxHeight = 20;
}; };
@@ -137,18 +143,16 @@ in { pkgs, ... }: {
none-ls = { none-ls = {
enable = true; enable = true;
sources.formatting = { sources.formatting = {
black.enable = true; alejandra.enable = true;
hclfmt.enable = true; hclfmt.enable = true;
just.enable = true; just.enable = true;
nixfmt = {
enable = true;
package = pkgs.nixfmt-rfc-style;
};
opentofu_fmt.enable = true; opentofu_fmt.enable = true;
prettier.enable = true; prettier.enable = true;
# rubyfmt is broken on darwin-based systems # rubyfmt is broken on darwin-based systems
rubyfmt.enable = (pkgs.stdenv.hostPlatform.system != "x86_64-darwin" rubyfmt.enable = (
&& pkgs.stdenv.hostPlatform.system != "aarch64-darwin"); pkgs.stdenv.hostPlatform.system != "x86_64-darwin"
&& pkgs.stdenv.hostPlatform.system != "aarch64-darwin"
);
sqlformat.enable = true; sqlformat.enable = true;
stylua.enable = true; stylua.enable = true;
yamlfmt.enable = true; yamlfmt.enable = true;
@@ -174,10 +178,10 @@ in { pkgs, ... }: {
javascript = [ "prettier" ]; javascript = [ "prettier" ];
javascriptreact = [ "prettier" ]; javascriptreact = [ "prettier" ];
json = [ "prettier" ]; json = [ "prettier" ];
just = [ "just" ];
lua = [ "stylua" ]; lua = [ "stylua" ];
markdown = [ "prettier" ]; markdown = [ "prettier" ];
nix = [ "nixfmt" ]; nix = [ "alejandra" ];
python = [ "black" ];
ruby = [ "rubyfmt" ]; ruby = [ "rubyfmt" ];
terraform = [ "tofu_fmt" ]; terraform = [ "tofu_fmt" ];
tf = [ "tofu_fmt" ]; tf = [ "tofu_fmt" ];
@@ -244,14 +248,15 @@ in { pkgs, ... }: {
marksman.enable = true; marksman.enable = true;
nil-ls.enable = true; nil-ls.enable = true;
nixd.enable = true; nixd.enable = true;
omnisharp.enable = true;
yamlls.enable = true; yamlls.enable = true;
}; };
}; };
trouble = { trouble = {
enable = true; enable = true;
settings = { use_diagnostic_signs = true; }; settings = {
use_diagnostic_signs = true;
};
}; };
}; };