nvim: include more formatters and lsps

nix/programs/coding.nix

@@ -22,6 +22,13 @@
     # cpp
     bear
 
+    #sql
+    nodePackages.sql-formatter
+    sqls
+
+    #assembly
+    asm-lsp
+
     #yaml
     yamlfmt
     yamllint
@@ -29,12 +36,17 @@
 
     #markdown
     marksman
+    mdformat
+
+    #bash
+    nodePackages.bash-language-server
+    shfmt
 
     #html
     html-tidy
 
     #json
-    jsonfmt
+    jq
 
     #css
     tailwindcss

nix/programs/common.nix

@@ -101,6 +101,8 @@ in
   home.sessionVariables =
     {
       FLAKE = "home/dasshie/gits/dotFiles/nix";
+      # don't ask... marksman somehow requires this
+      DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1;
     };
 
   sops = {

nix/programs/default.nix

@@ -1,7 +1,6 @@
 { inputs, pkgs, mod, ... }:
 let
   base_imports = [
-    inputs.hyprlock.homeManagerModules.default
     inputs.anyrun.homeManagerModules.default
     inputs.ironbar.homeManagerModules.default
     inputs.oxicalc.homeManagerModules.default
@@ -26,8 +25,6 @@ in
   home-manager.useUserPackages = true;
 
   home-manager.users.dashie = {
-    #home-manager overlap -> use flake instead
-    disabledModules = [ "programs/hyprlock.nix" ];
     imports = [
       {
         _module = { args = { inherit inputs; }; };

nix/programs/hyprland/hyprlock.nix

@@ -5,8 +5,7 @@
 }:
 {
   programs.hyprlock.enable = true;
-  programs.hyprlock = {
-
+  programs.hyprlock.settings = {
     backgrounds = [
       {
         monitor = "";
@@ -32,6 +31,5 @@
         halign = "center";
       }
     ];
-
   };
 }

nix/programs/nvim/default.nix

@@ -134,7 +134,6 @@
             { import = "lazyvim.plugins.extras.lang.markdown" },
             { import = "lazyvim.plugins.extras.lang.cmake" },
             { import = "lazyvim.plugins.extras.lang.omnisharp" },
-            { import = "lazyvim.plugins.extras.lang.json" },
             { import = "lazyvim.plugins.extras.lang.tex" },
             { import = "lazyvim.plugins.extras.util.dot" },
             { import = "lazyvim.plugins.extras.dap.core" },

nix/programs/nvim/lua/plugins/lsp.lua

@@ -11,9 +11,6 @@ return {
 		"neovim/nvim-lspconfig",
 		---@class PluginLspOpts
 		opts = {
-			-- inlay_hints = {
-			--   enabled = true,
-			-- },
 			format_notify = false,
 			-- LSP Server Settings
 			---@type lspconfig.options
@@ -66,7 +63,49 @@ return {
 				},
 				omnisharp = {
 					mason = false,
-					cmd = { "OmniSharp" },
+					handlers = {
+						["textDocument/definition"] = function(...)
+							return require("omnisharp_extended").handler(...)
+						end,
+					},
+					keys = {
+						{
+							"<leader>oe",
+							function()
+								require("omnisharp_extended").telescope_lsp_definitions()
+							end,
+							desc = "Goto Definition",
+						},
+					},
+					cmd = {
+						-- no comment
+						"OmniSharp",
+						"-z",
+						"--hostPID",
+						tostring(vim.fn.getpid()),
+						"DotNet:enablePackageRestore=false",
+						"--encoding",
+						"utf-8",
+						"--languageserver",
+						"FormattingOptions:EnableEditorConfigSupport=true",
+						"FormattingOptions:OrganizeImports=true",
+						"RoslynExtensionsOptions:EnableAnalyzersSupport=true",
+						"RoslynExtensionsOptions:EnableImportCompletion=true",
+						-- inlay hints are bugged until next release.....
+						-- "RoslynExtensionsOptions:InlayHintsOptions:EnableForParameters=true",
+						-- "RoslynExtensionsOptions:InlayHintsOptions:ForLiteralParameters=true",
+						-- "RoslynExtensionsOptions:InlayHintsOptions:ForIndexerParameters=true",
+						-- "RoslynExtensionsOptions:InlayHintsOptions:ForObjectCreationParameters=true",
+						-- "RoslynExtensionsOptions:InlayHintsOptions:ForOtherParameters=true",
+						-- "RoslynExtensionsOptions:InlayHintsOptions:SuppressForParametersThatDifferOnlyBySuffix=false",
+						-- "RoslynExtensionsOptions:InlayHintsOptions:SuppressForParametersThatMatchMethodIntent=false",
+						-- "RoslynExtensionsOptions:InlayHintsOptions:SuppressForParametersThatMatchArgumentName=false",
+						-- "RoslynExtensionsOptions:InlayHintsOptions:EnableForTypes=true",
+						-- "RoslynExtensionsOptions:InlayHintsOptions:ForImplicitVariableTypes=true",
+						-- "RoslynExtensionsOptions:InlayHintsOptions:ForLambdaParameterTypes=true",
+						-- "RoslynExtensionsOptions:InlayHintsOptions:ForImplicitObjectCreation=true",
+						"Sdk:IncludePrereleases=true",
+					},
 				},
 				typst_lsp = {
 					settings = {
@@ -106,7 +145,7 @@ return {
 					},
 					mason = false,
 				},
-				sqlls = {
+				sqls = {
 					mason = false,
 				},
 				lemminx = {
@@ -118,9 +157,12 @@ return {
 				yamlls = {
 					mason = false,
 				},
+				zls = {
+					mason = false,
+				},
 				cssls = {
 					mason = false,
-					cmd = { "css-languageserver", '--stdio' },
+					cmd = { "css-languageserver", "--stdio" },
 				},
 				lua_ls = {
 					mason = false,
@@ -167,6 +209,11 @@ return {
 				lua = { "stylua" },
 				sh = { "shfmt" },
 				cs = { "dotnet-csharpier" },
+				markdown = { "mdformat" },
+				sql = { "sql-formatter" },
+				-- json doesn't work?
+				json = { "jq" },
+				yaml = { "yamlfmt" },
 			},
 		},
 	},

nix/programs/nvim/lua/plugins/plugins.lua

@@ -280,4 +280,5 @@ return {
 		},
 	},
 	{ "akinsho/git-conflict.nvim", version = "*", config = true },
+	{ "Hoffs/omnisharp-extended-lsp.nvim" },
 }