added protobuf lsp and formatting :3

This commit is contained in:
foxora 2026-02-25 16:25:40 +00:00
parent c98db7bc0b
commit d66145df58
4 changed files with 39 additions and 55 deletions

0
homes/aurora/profile.png Normal file
View file

View file

@ -84,6 +84,10 @@ servers.jdtls = {
},
}
servers.protols = {
settings = {},
}
-- Taken from nixCats example:
-- If you were to comment out this autocommand
-- and instead pass the on attach function directly to

View file

@ -11,10 +11,11 @@ return {
conform.setup({
formatters_by_ft = {
lua = nixCats("lang.lua.format") and { "stylua" } or nil,
nix = nixCats("lang.nix.format") and { "nixfmt" } or nil,
rust = nixCats("lang.rust.format") and { "rustfmt", lsp_format = "fallback" } or nil,
haskell = nixCats("lang.haskell.format") and { "ormolu" } or nil,
lua = nixCats("lang.lua") and { "stylua" } or nil,
nix = nixCats("lang.nix") and { "nixfmt" } or nil,
rust = nixCats("lang.rust") and { "rustfmt", lsp_format = "fallback" } or nil,
haskell = nixCats("lang.haskell") and { "ormolu" } or nil,
proto = nixCats("lang.protobuf") and { "buf" } or nil,
},
format_on_save = {
timeout_ms = 500,

View file

@ -59,24 +59,20 @@ in
tree-sitter
];
lang = {
lua = {
lsp = [ lua-language-server ];
format = [ stylua ];
};
nix = {
lsp = [
nil
nix-doc # TODO: i forgot what this is for
];
format = [ nixfmt ];
};
rust = {
lsp = [
cargo
mpkgs.rust-analyzer
];
format = [ rustfmt ];
};
lua = [
lua-language-server
stylua
];
nix = [
nil
nix-doc # TODO: i forgot what this is for
nixfmt
];
rust = [
cargo
mpkgs.rust-analyzer
rustfmt
];
zig = [
spkgs.zls # FIX: using spkgs version as zls is broken rn ;-;
];
@ -86,15 +82,19 @@ in
gleam = [
gleam
];
haskell = {
lsp = [ haskell-language-server ];
format = [ ormolu ];
};
haskell = [
haskell-language-server
ormolu
];
java = [
jdt-language-server
javaPackages.compiler.openjdk17
javaPackages.compiler.openjdk21
];
protobuf = [
protols
buf
];
};
};
@ -188,11 +188,7 @@ in
};
};
extraWrapperArgs = {
test = [
''--set CATTESTVAR2 "It worked again!"''
];
};
extraWrapperArgs = { };
# lists of the functions you would have passed to
# python.withPackages or lua.withPackages
@ -200,13 +196,9 @@ in
# in your lua config via
# vim.g.python3_host_prog
# or run from nvim terminal via :!<packagename>-python3
extraPython3Packages = {
test = _: [ ];
};
extraPython3Packages = { };
# populates $LUA_PATH and $LUA_CPATH
extraLuaPackages = {
test = [ (_: [ ]) ];
};
extraLuaPackages = { };
};
# see :help nixCats.flake.outputs.packageDefinitions
@ -223,12 +215,10 @@ in
# IMPORTANT:
# your alias may not conflict with your other packages.
aliases = [
"auroravim"
"auravim"
"foxyvim"
"avix"
"fvix"
"auim"
];
};
# and a set of categories that you want
@ -247,26 +237,15 @@ in
comment = true;
lang = {
lua = {
lsp = true;
format = true;
};
nix = {
lsp = true;
format = true;
};
rust = {
lsp = true;
format = true;
};
lua = true;
nix = true;
rust = true;
zig = true;
elixir = true;
gleam = true;
haskell = {
lsp = true;
format = true;
};
haskell = true;
java = true;
protobuf = true;
};
};
};