treewide: Reformat with nixfmt

This commit is contained in:
traxys 2024-05-05 19:39:35 +02:00
parent c6281260dc
commit 62f32bfc71
459 changed files with 28139 additions and 26377 deletions

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
empty = {
plugins.lsp.enable = true;
};
@ -74,12 +75,12 @@
ruff-lsp = {
enable = true;
extraOptions = {
init_options.settings.args = ["--config=/path/to/config.toml"];
init_options.settings.args = [ "--config=/path/to/config.toml" ];
};
};
pylsp = {
enable = true;
filetypes = ["python"];
filetypes = [ "python" ];
autostart = false;
};
# rootDir
@ -95,116 +96,116 @@
all-servers =
pkgs.lib.optionalAttrs
# This fails on darwin
# See https://github.com/NixOS/nix/issues/4119
(!pkgs.stdenv.isDarwin)
{
plugins.lsp = {
enable = true;
# This fails on darwin
# See https://github.com/NixOS/nix/issues/4119
(!pkgs.stdenv.isDarwin)
{
plugins.lsp = {
enable = true;
servers = {
ansiblels.enable = true;
ast-grep.enable = true;
astro.enable = true;
bashls.enable = true;
beancount.enable = true;
biome.enable = true;
ccls.enable = true;
clangd.enable = true;
clojure-lsp.enable = true;
cmake.enable = true;
csharp-ls.enable = true;
cssls.enable = true;
dagger.enable = true;
dartls.enable = true;
denols.enable = true;
dhall-lsp-server.enable = true;
digestif.enable = true;
docker-compose-language-service.enable = true;
dockerls.enable = true;
efm.enable = true;
elmls.enable = true;
emmet_ls.enable = true;
eslint.enable = true;
elixirls.enable = true;
fortls.enable = true;
# pkgs.fsautocomplete only supports linux platforms
fsautocomplete.enable = pkgs.stdenv.isLinux;
futhark-lsp.enable = true;
gleam.enable = true;
gopls.enable = true;
golangci-lint-ls.enable = true;
graphql.enable = true;
helm-ls.enable = true;
hls.enable = true;
html.enable = true;
htmx.enable = true;
java-language-server.enable = true;
jsonls.enable = true;
julials.enable = true;
kotlin-language-server.enable = true;
leanls.enable = true;
lemminx.enable = true;
lexical.enable = true;
ltex.enable = true;
lua-ls.enable = true;
marksman.enable = true;
metals.enable = true;
nginx-language-server.enable = true;
nil_ls.enable = true;
nimls.enable = true;
nixd.enable = true;
nushell.enable = true;
ocamllsp.enable = true;
ols.enable =
# ols is not supported on aarch64-linux
(pkgs.stdenv.hostPlatform.system != "aarch64-linux")
# As of 2024-01-04, ols is broken on darwin
servers = {
ansiblels.enable = true;
ast-grep.enable = true;
astro.enable = true;
bashls.enable = true;
beancount.enable = true;
biome.enable = true;
ccls.enable = true;
clangd.enable = true;
clojure-lsp.enable = true;
cmake.enable = true;
csharp-ls.enable = true;
cssls.enable = true;
dagger.enable = true;
dartls.enable = true;
denols.enable = true;
dhall-lsp-server.enable = true;
digestif.enable = true;
docker-compose-language-service.enable = true;
dockerls.enable = true;
efm.enable = true;
elmls.enable = true;
emmet_ls.enable = true;
eslint.enable = true;
elixirls.enable = true;
fortls.enable = true;
# pkgs.fsautocomplete only supports linux platforms
fsautocomplete.enable = pkgs.stdenv.isLinux;
futhark-lsp.enable = true;
gleam.enable = true;
gopls.enable = true;
golangci-lint-ls.enable = true;
graphql.enable = true;
helm-ls.enable = true;
hls.enable = true;
html.enable = true;
htmx.enable = true;
java-language-server.enable = true;
jsonls.enable = true;
julials.enable = true;
kotlin-language-server.enable = true;
leanls.enable = true;
lemminx.enable = true;
lexical.enable = true;
ltex.enable = true;
lua-ls.enable = true;
marksman.enable = true;
metals.enable = true;
nginx-language-server.enable = true;
nil_ls.enable = true;
nimls.enable = true;
nixd.enable = true;
nushell.enable = true;
ocamllsp.enable = true;
ols.enable =
# ols is not supported on aarch64-linux
(pkgs.stdenv.hostPlatform.system != "aarch64-linux")
# As of 2024-01-04, ols is broken on darwin
# TODO: re-enable this test when fixed
&& !pkgs.stdenv.isDarwin;
# As of 2024-03-05, omnisharp-roslyn is broken on darwin
# TODO: re-enable this test when fixed
&& !pkgs.stdenv.isDarwin;
# As of 2024-03-05, omnisharp-roslyn is broken on darwin
# TODO: re-enable this test when fixed
omnisharp.enable = !pkgs.stdenv.isDarwin;
perlpls.enable = true;
pest_ls.enable = true;
prismals.enable = true;
prolog-ls.enable = true;
purescriptls.enable = true;
pylsp.enable = true;
pylyzer.enable = true;
pyright.enable = true;
ruff.enable = true;
ruff-lsp.enable = true;
rust-analyzer = {
enable = true;
installCargo = true;
installRustc = true;
omnisharp.enable = !pkgs.stdenv.isDarwin;
perlpls.enable = true;
pest_ls.enable = true;
prismals.enable = true;
prolog-ls.enable = true;
purescriptls.enable = true;
pylsp.enable = true;
pylyzer.enable = true;
pyright.enable = true;
ruff.enable = true;
ruff-lsp.enable = true;
rust-analyzer = {
enable = true;
installCargo = true;
installRustc = true;
};
slint-lsp.enable = true;
solargraph.enable = true;
# As of 2024-03-11, sourcekit-lsp is broken on aarch64
# TODO: re-enable this test when fixed
sourcekit.enable = !pkgs.stdenv.isAarch64;
sqls.enable = true;
svelte.enable = true;
tailwindcss.enable = true;
taplo.enable = true;
templ.enable = true;
terraformls.enable = true;
texlab.enable = true;
tinymist.enable = true;
tsserver.enable = true;
typos-lsp.enable = true;
typst-lsp.enable = true;
# As of 2024-04-03, pkgs.vala-language-server is broken on linux
# TODO: re-enable this test when fixed
vala-ls.enable = !pkgs.stdenv.isLinux;
vhdl-ls.enable = true;
vls.enable = true;
vuels.enable = true;
yamlls.enable = true;
zls.enable = true;
};
slint-lsp.enable = true;
solargraph.enable = true;
# As of 2024-03-11, sourcekit-lsp is broken on aarch64
# TODO: re-enable this test when fixed
sourcekit.enable = !pkgs.stdenv.isAarch64;
sqls.enable = true;
svelte.enable = true;
tailwindcss.enable = true;
taplo.enable = true;
templ.enable = true;
terraformls.enable = true;
texlab.enable = true;
tinymist.enable = true;
tsserver.enable = true;
typos-lsp.enable = true;
typst-lsp.enable = true;
# As of 2024-04-03, pkgs.vala-language-server is broken on linux
# TODO: re-enable this test when fixed
vala-ls.enable = !pkgs.stdenv.isLinux;
vhdl-ls.enable = true;
vls.enable = true;
vuels.enable = true;
yamlls.enable = true;
zls.enable = true;
};
};
};
}

View file

@ -8,11 +8,19 @@
enable = true;
formattersByFt = {
lua = ["stylua"];
python = ["isort" "black"];
javascript = [["prettierd" "prettier"]];
"*" = ["codespell"];
"_" = ["trimWhitespace"];
lua = [ "stylua" ];
python = [
"isort"
"black"
];
javascript = [
[
"prettierd"
"prettier"
]
];
"*" = [ "codespell" ];
"_" = [ "trimWhitespace" ];
};
formatOnSave = {
lspFallback = true;
@ -26,7 +34,10 @@
formatters = {
myFormatter = {
command = "myCmd";
args = ["--stdin-from-filename" "$FILENAME"];
args = [
"--stdin-from-filename"
"$FILENAME"
];
rangeArgs = ''
function(ctx)
return { "--line-start", ctx.range.start[1], "--line-end", ctx.range["end"][1] }
@ -42,12 +53,15 @@
return vim.fs.basename(ctx.filename) ~= "README.md"
end;
'';
exitCodes = [0 1];
exitCodes = [
0
1
];
env = {
VAR = "value";
};
"inherit" = true;
prependArgs = ["--use-tabs"];
prependArgs = [ "--use-tabs" ];
};
otherFormatter = ''
function(bufnr)
@ -65,11 +79,19 @@
enable = true;
formattersByFt = {
lua = ["stylua"];
python = ["isort" "black"];
javascript = [["prettierd" "prettier"]];
"*" = ["codespell"];
"_" = ["trimWhitespace"];
lua = [ "stylua" ];
python = [
"isort"
"black"
];
javascript = [
[
"prettierd"
"prettier"
]
];
"*" = [ "codespell" ];
"_" = [ "trimWhitespace" ];
};
formatOnSave = ''
@ -100,11 +122,19 @@
enable = true;
formattersByFt = {
lua = ["stylua"];
python = ["isort" "black"];
javascript = [["prettierd" "prettier"]];
"*" = ["codespell"];
"_" = ["trimWhitespace"];
lua = [ "stylua" ];
python = [
"isort"
"black"
];
javascript = [
[
"prettierd"
"prettier"
]
];
"*" = [ "codespell" ];
"_" = [ "trimWhitespace" ];
};
formatAfterSave = ''

View file

@ -1,111 +1,104 @@
{ efmls-options, pkgs, ... }:
{
efmls-options,
pkgs,
...
}: {
empty = {
plugins.efmls-configs.enable = true;
};
all = {
plugins.efmls-configs = let
options = efmls-options.options.plugins.efmls-configs;
# toolOptions is an attrsets of the form:
# { <lang> = { linter = tools; formatter = tools; }; }
# Where tools is the option type representing the valid tools for this language
toolOptions = (builtins.head options.setup.type.getSubModules).options;
plugins.efmls-configs =
let
options = efmls-options.options.plugins.efmls-configs;
# toolOptions is an attrsets of the form:
# { <lang> = { linter = tools; formatter = tools; }; }
# Where tools is the option type representing the valid tools for this language
toolOptions = (builtins.head options.setup.type.getSubModules).options;
brokenTools =
[
#Broken as of 16 of November 2023
"phpstan"
]
++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
# As of 2024-01-04, cbfmt is broken on darwin
# TODO: re-enable this test when fixed
"cbfmt"
# As of 2024-01-04, texliveMedium is broken on darwin
# TODO: re-enable those tests when fixed
"chktex"
"latexindent"
]
++ pkgs.lib.optionals (pkgs.stdenv.hostPlatform.system == "x86_64-darwin") [
# As of 2024-01-04, dmd is broken on x86_64-darwin
# TODO: re-enable this test when fixed
"dmd"
# As of 2024-01-04, luaformat is broken on x86_64-darwin
# TODO: re-enable this test when fixed
"lua_format"
# As of 2024-03-27, pkgs.graalvm-ce (a dependency of pkgs.clj-kondo) is broken on x86_64-darwin
# TODO: re-enable this test when fixed
"clj_kondo"
];
unpackaged =
[
"blade_formatter"
"cspell"
"cljstyle"
"dartanalyzer"
"debride"
"deno_fmt"
"fecs"
"fixjson"
"forge_fmt"
"gersemi"
"js_standard"
"pint"
"prettier_eslint"
"prettier_standard"
"redpen"
"reek"
"rome"
"slim_lint"
"solhint"
"sorbet"
"swiftformat"
"swiftlint"
"xo"
]
++ (
pkgs.lib.optionals
pkgs.stdenv.isDarwin
["clazy"]
)
++ (
pkgs.lib.optionals
pkgs.stdenv.isAarch64
brokenTools =
[
#Broken as of 16 of November 2023
"phpstan"
]
++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
# As of 2024-01-04, cbfmt is broken on darwin
# TODO: re-enable this test when fixed
"cbfmt"
# As of 2024-01-04, texliveMedium is broken on darwin
# TODO: re-enable those tests when fixed
"chktex"
"latexindent"
]
++ pkgs.lib.optionals (pkgs.stdenv.hostPlatform.system == "x86_64-darwin") [
# As of 2024-01-04, dmd is broken on x86_64-darwin
# TODO: re-enable this test when fixed
"dmd"
# As of 2024-01-04, luaformat is broken on x86_64-darwin
# TODO: re-enable this test when fixed
"lua_format"
# As of 2024-03-27, pkgs.graalvm-ce (a dependency of pkgs.clj-kondo) is broken on x86_64-darwin
# TODO: re-enable this test when fixed
"clj_kondo"
];
unpackaged =
[
"blade_formatter"
"cspell"
"cljstyle"
"dartanalyzer"
"debride"
"deno_fmt"
"fecs"
"fixjson"
"forge_fmt"
"gersemi"
"js_standard"
"pint"
"prettier_eslint"
"prettier_standard"
"redpen"
"reek"
"rome"
"slim_lint"
"solhint"
"sorbet"
"swiftformat"
"swiftlint"
"xo"
]
++ (pkgs.lib.optionals pkgs.stdenv.isDarwin [ "clazy" ])
++ (pkgs.lib.optionals pkgs.stdenv.isAarch64 [
"dmd"
"smlfmt"
# As of 2024-03-11, swift-format is broken on aarch64
# TODO: re-enable this test when fixed
# "swift_format"
]
);
]);
# Fetch the valid enum members from the tool options
toolsFromOptions = opt: let
# tool options are a `either toolType (listOf toolType)`
# Look into `nestedTypes.left` to get a `toolType` option.
toolType = opt.type.nestedTypes.left;
# toolType is a `either (enum possible) helpers.nixvimTypes.rawLua
# Look into `nestedTypes.left` for the enum
possible = toolType.nestedTypes.left;
# possible is an enum, look into functor.payload for the variants
toolList = possible.functor.payload;
# Fetch the valid enum members from the tool options
toolsFromOptions =
opt:
let
# tool options are a `either toolType (listOf toolType)`
# Look into `nestedTypes.left` to get a `toolType` option.
toolType = opt.type.nestedTypes.left;
# toolType is a `either (enum possible) helpers.nixvimTypes.rawLua
# Look into `nestedTypes.left` for the enum
possible = toolType.nestedTypes.left;
# possible is an enum, look into functor.payload for the variants
toolList = possible.functor.payload;
in
builtins.filter (t: !builtins.elem t (brokenTools ++ unpackaged)) toolList;
in
builtins.filter (t: !builtins.elem t (brokenTools ++ unpackaged)) toolList;
in {
enable = true;
{
enable = true;
# Replace the { <lang> = { linter = tools; formatter = tools; } };
# With { <lang> = {
# linter = [<all valid linters for lang>];
# formatter = [<all valid formatters for lang>];
# };}
setup = builtins.mapAttrs (_: builtins.mapAttrs (_: toolsFromOptions)) toolOptions;
};
# Replace the { <lang> = { linter = tools; formatter = tools; } };
# With { <lang> = {
# linter = [<all valid linters for lang>];
# formatter = [<all valid formatters for lang>];
# };}
setup = builtins.mapAttrs (_: builtins.mapAttrs (_: toolsFromOptions)) toolOptions;
};
};
example = {
@ -128,12 +121,15 @@
# Only accepts known tools, or raw strings
html = {
formatter = ["prettier" {__raw = "djlint_fmt";}];
formatter = [
"prettier"
{ __raw = "djlint_fmt"; }
];
};
# Unknown filetype, accepts anything
htmldjango = {
formatter = [{__raw = "djlint_fmt";}];
formatter = [ { __raw = "djlint_fmt"; } ];
linter = "djlint";
};
};

View file

@ -19,7 +19,7 @@
return client and client.name or nil
end
'';
ignore = [];
ignore = [ ];
display = {
renderLimit = 16;
doneTtl = 3;
@ -89,7 +89,7 @@
};
logger = {
level = "warn";
floatPrecision = 0.01;
floatPrecision = 1.0e-2;
path.__raw = "string.format('%s/fidget.nvim.log', vim.fn.stdpath('cache'))";
};
};

View file

@ -13,9 +13,9 @@
retainInMemory = 1;
};
clang = {
extraArgs = [];
excludeArgs = ["-frounding-math"];
pathMappings = ["/remote/>/host/"];
extraArgs = [ ];
excludeArgs = [ "-frounding-math" ];
pathMappings = [ "/remote/>/host/" ];
resourceDir = "";
};
client = {
@ -36,8 +36,8 @@
threads = 0;
comments = 2;
multiVersion = 0;
multiVersionBlacklist = ["^/usr/include"];
initialBlacklist = ["."];
multiVersionBlacklist = [ "^/usr/include" ];
initialBlacklist = [ "." ];
onChange = false;
trackDependency = 2;
};

View file

@ -9,7 +9,10 @@
settings = {
eval = {
target = {
args = ["foo" "bar"];
args = [
"foo"
"bar"
];
installable = "";
};
depth = 0;
@ -21,7 +24,11 @@
options = {
enable = true;
target = {
args = ["yes" "no" "maybe"];
args = [
"yes"
"no"
"maybe"
];
installable = "";
};
};

View file

@ -16,20 +16,20 @@
flake8 = {
config = null;
enabled = true;
exclude = [];
exclude = [ ];
executable = "flake8";
filename = null;
hangClosing = null;
ignore = [];
ignore = [ ];
maxComplexity = null;
maxLineLength = null;
indentSize = null;
perFileIgnores = [];
perFileIgnores = [ ];
select = null;
};
jedi = {
auto_import_modules = ["numpy"];
extra_paths = [];
auto_import_modules = [ "numpy" ];
extra_paths = [ ];
environment = null;
};
jedi_completion = {
@ -40,7 +40,12 @@
fuzzy = false;
eager = false;
resolve_at_most = 25;
cache_for = ["pandas" "numpy" "tensorflow" "matplotlib"];
cache_for = [
"pandas"
"numpy"
"tensorflow"
"matplotlib"
];
};
jedi_definition = {
enabled = true;
@ -68,14 +73,14 @@
};
preload = {
enabled = true;
modules = [];
modules = [ ];
};
pycodestyle = {
enabled = true;
exclude = [];
filename = [];
exclude = [ ];
filename = [ ];
ropeFolder = null;
ignore = [];
ignore = [ ];
hangClosing = true;
maxLineLength = 80;
indentSize = 4;
@ -83,9 +88,9 @@
pydocstyle = {
enabled = false;
convention = null;
addIgnore = [];
addSelect = [];
ignore = [];
addIgnore = [ ];
addSelect = [ ];
ignore = [ ];
select = null;
match = "(?!test_).*\\.py";
matchDir = "[^\\.].*";
@ -95,7 +100,7 @@
};
pylint = {
enabled = true;
args = [];
args = [ ];
executable = null;
};
rope_autoimport = {
@ -115,9 +120,9 @@
live_mode = true;
dmypy = false;
strict = false;
overrides = [true];
overrides = [ true ];
dmypy_status_file = ".dmypy.json";
config_sub_paths = [];
config_sub_paths = [ ];
report_progress = false;
};
black = {
@ -135,18 +140,27 @@
ruff = {
enabled = true;
config = "/foo/bar/pyproject.toml";
exclude = ["foo" "bar"];
exclude = [
"foo"
"bar"
];
executable = "/foo/bar/ruff";
ignore = ["E42" "E720"];
extendIgnore = ["E12"];
ignore = [
"E42"
"E720"
];
extendIgnore = [ "E12" ];
lineLength = 123;
perFileIgnores = {
"__init__.py" = ["E402"];
"path/to/file.py" = ["E402"];
"__init__.py" = [ "E402" ];
"path/to/file.py" = [ "E402" ];
};
select = ["E01" "E56"];
extendSelect = ["E68"];
format = ["E90"];
select = [
"E01"
"E56"
];
extendSelect = [ "E68" ];
format = [ "E90" ];
};
};
rope = {

View file

@ -22,8 +22,11 @@
setup = {
gopls = {
exclude = ["gopls"];
order = ["gopls" "efm"];
exclude = [ "gopls" ];
order = [
"gopls"
"efm"
];
sync = true;
force = true;

View file

@ -15,8 +15,14 @@
collapse = "";
codeAction = "💡";
actionfix = "";
lines = ["" "" "" "" ""];
kind = {};
lines = [
""
""
""
""
""
];
kind = { };
impSign = "󰳛 ";
};
hover = {
@ -42,7 +48,10 @@
execAction = "o";
quit = "q";
toggleOrJump = "<CR>";
quitInShow = ["q" "<ESC>"];
quitInShow = [
"q"
"<ESC>"
];
};
};
codeAction = {
@ -76,7 +85,7 @@
default = "ref+imp";
layout = "float";
silent = false;
filter = {};
filter = { };
keys = {
shuttle = "[w";
toggleOrOpen = "o";

View file

@ -45,7 +45,7 @@
];
};
hiddenFalsePositives = {
"en-US" = [":/path/to/externalFile.txt"];
"en-US" = [ ":/path/to/externalFile.txt" ];
};
fields = {
maintitle = false;

View file

@ -29,7 +29,7 @@
enabled = false;
text = "💡";
hl = "LightBulbFloatWin";
win_opts = {};
win_opts = { };
};
status_text = {
enabled = false;
@ -47,12 +47,15 @@
autocmd = {
enabled = false;
updatetime = 200;
pattern = ["*"];
events = ["CursorHold" "CursorHoldI"];
pattern = [ "*" ];
events = [
"CursorHold"
"CursorHoldI"
];
};
ignore = {
clients = [];
ft = [];
clients = [ ];
ft = [ ];
actions_without_kind = false;
};
};

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
defaults = {
plugins.lsp = {
enable = true;

View file

@ -30,28 +30,42 @@
close = "q";
cancel = "<esc>";
refresh = "r";
jump = ["<cr>" "<tab>"];
open_split = ["<c-x>"];
open_vsplit = ["<c-v>"];
open_tab = ["<c-t>"];
jump_close = ["o"];
jump = [
"<cr>"
"<tab>"
];
open_split = [ "<c-x>" ];
open_vsplit = [ "<c-v>" ];
open_tab = [ "<c-t>" ];
jump_close = [ "o" ];
toggle_mode = "m";
toggle_preview = "P";
hover = "K";
preview = "p";
close_folds = ["zM" "zm"];
open_folds = ["zR" "zr"];
toggle_fold = ["zA" "za"];
close_folds = [
"zM"
"zm"
];
open_folds = [
"zR"
"zr"
];
toggle_fold = [
"zA"
"za"
];
previous = "k";
next = "j";
};
indent_lines = true;
win_config = {border = "single";};
win_config = {
border = "single";
};
auto_open = false;
auto_close = false;
auto_preview = true;
auto_fold = false;
auto_jump = ["lsp_definitions"];
auto_jump = [ "lsp_definitions" ];
signs = {
error = "";
warning = "";

View file

@ -10,7 +10,10 @@
keymaps = {
ai = "gw";
search = {
mode = ["n" "x"];
mode = [
"n"
"x"
];
options.desc = "Search diagnostic with Google";
};
};