added protobuf lsp and formatting :3

homes/modules/programs/neovim/lua/lsp/lsp.lua

@@ -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

homes/modules/programs/neovim/lua/plugins/format.lua

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

homes/modules/programs/neovim/nixcats.nix

@@ -59,24 +59,20 @@ in
               tree-sitter
             ];
             lang = {
-              lua = {
+              lua = [
-                lsp = [ lua-language-server ];
+                lua-language-server
-                format = [ stylua ];
+                stylua
-              };
+              ];
-              nix = {
+              nix = [
-                lsp = [
+                nil
-                  nil
+                nix-doc # TODO: i forgot what this is for
-                  nix-doc # TODO: i forgot what this is for
+                nixfmt
-                ];
+              ];
-                format = [ nixfmt ];
+              rust = [
-              };
+                cargo
-              rust = {
+                mpkgs.rust-analyzer
-                lsp = [
+                rustfmt
-                  cargo
+              ];
-                  mpkgs.rust-analyzer
-                ];
-                format = [ rustfmt ];
-              };
               zig = [
                 spkgs.zls # FIX: using spkgs version as zls is broken rn ;-;
               ];
@@ -86,15 +82,19 @@ in
               gleam = [
                 gleam
               ];
-              haskell = {
+              haskell = [
-                lsp = [ haskell-language-server ];
+                haskell-language-server
-                format = [ ormolu ];
+                ormolu
-              };
+              ];
               java = [
                 jdt-language-server
                 javaPackages.compiler.openjdk17
                 javaPackages.compiler.openjdk21
               ];
+              protobuf = [
+                protols
+                buf
+              ];
             };
           };
 
@@ -188,11 +188,7 @@ in
             };
           };
 
-          extraWrapperArgs = {
+          extraWrapperArgs = { };
-            test = [
-              ''--set CATTESTVAR2 "It worked again!"''
-            ];
-          };
           # 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 = {
+          extraPython3Packages = { };
-            test = _: [ ];
-          };
           # populates $LUA_PATH and $LUA_CPATH
-          extraLuaPackages = {
+          extraLuaPackages = { };
-            test = [ (_: [ ]) ];
-          };
         };
 
       # 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 = {
+                lua = true;
-                  lsp = true;
+                nix = true;
-                  format = true;
+                rust = true;
-                };
-                nix = {
-                  lsp = true;
-                  format = true;
-                };
-                rust = {
-                  lsp = true;
-                  format = true;
-                };
                 zig = true;
                 elixir = true;
                 gleam = true;
-                haskell = {
+                haskell = true;
-                  lsp = true;
-                  format = true;
-                };
                 java = true;
+                protobuf = true;
               };
             };
           };