diff --git a/flake.nix b/flake.nix index 84609eb..28b5499 100644 --- a/flake.nix +++ b/flake.nix @@ -120,6 +120,13 @@ customHome = [ ./modules/gui/ghostty.nix ]; + custom = [ + { + nixpkgs.config.permittedInsecurePackages = [ + "dotnet-sdk-6.0.428" + ]; + } + ]; }; packages = eachSystem (system: let diff --git a/modules/cli/zsh/init.zsh b/modules/cli/zsh/init.zsh index e355798..a02e44a 100644 --- a/modules/cli/zsh/init.zsh +++ b/modules/cli/zsh/init.zsh @@ -164,7 +164,7 @@ touchp() { proxy() { echo "Proxying port $1 to http://proxy.sdg.moe" - ssh -NR "5000:localhost:$1" ssh.sdg.moe + ssh -NR "5000:localhost:$1" zoriya@ssh.sdg.moe } # disable space between right prompt and end of line diff --git a/nvim/default.nix b/nvim/default.nix index 4730a78..a66a65b 100644 --- a/nvim/default.nix +++ b/nvim/default.nix @@ -67,6 +67,7 @@ in nvim-lspconfig blink-cmp SchemaStore-nvim + roslyn-nvim ((mkPlugin ltex-extra "ltex-extra").overrideAttrs {doCheck = false;}) nvim-lint (conform-nvim.overrideAttrs { @@ -124,7 +125,7 @@ in haskell-language-server rust-analyzer clang-tools - omnisharp-roslyn + roslyn-ls pyright typescript-language-server nil diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 91a8cf6..5ed65ee 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -9,7 +9,6 @@ return { require("lspconfig").hls.setup({}) require("lspconfig").rust_analyzer.setup({}) require("lspconfig").clangd.setup({}) - require("lspconfig").omnisharp.setup({}) require("lspconfig").pyright.setup({}) require("lspconfig").nil_ls.setup({}) require("lspconfig").ts_ls.setup({}) @@ -76,4 +75,16 @@ return { require("ltex_extra").setup(plug.opts) end, }, + + { + "roslyn.nvim", + ft = { "cs", "vb" }, + opts = { + exe = "Microsoft.CodeAnalysis.LanguageServer", + broad_search = true, + }, + after = function(plug) + require("roslyn").setup(plug.opts) + end, + }, } diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index 891eb48..1d27dbf 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -61,6 +61,11 @@ vim.keymap.set({ "n", "x" }, "P", '"+P', { desc = "Past line from system -- Quickfix list vim.keymap.set("n", "q", "cclose", { desc = "Close quickfix" }) +vim.keymap.set("n", "grd", function() + vim.diagnostics.setqflist({ severity = { min = vim.diagnostics.severity.WARN } }) +end, { desc = "Open diagnostics" }) + +-- Center screen after navigating (those are builtin shortcuts) vim.keymap.set("n", "[q", "cprevzvzz", { desc = "Previous quickfix item" }) vim.keymap.set("n", "]q", "cnextzvzz", { desc = "Next quickfix item" }) vim.keymap.set("n", "[l", "lprevzvzz", { desc = "Previous loclist item" })