Fix nix warnings
This commit is contained in:
parent
e36e2a78fa
commit
7603474dc4
@ -12,14 +12,13 @@
|
|||||||
jj-flake.url = "github:martinvonz/jj";
|
jj-flake.url = "github:martinvonz/jj";
|
||||||
};
|
};
|
||||||
outputs = {
|
outputs = {
|
||||||
self,
|
|
||||||
nixpkgs,
|
|
||||||
sile-flake,
|
sile-flake,
|
||||||
runwhen-flake,
|
runwhen-flake,
|
||||||
durnitisp-flake,
|
durnitisp-flake,
|
||||||
rust-overlay-flake,
|
rust-overlay-flake,
|
||||||
jj-flake,
|
jj-flake,
|
||||||
agenix-flake,
|
agenix-flake,
|
||||||
|
... # We don't use the self or nixpkgs args here so we just glob it.
|
||||||
}: {
|
}: {
|
||||||
systemModule = system: let
|
systemModule = system: let
|
||||||
runwhen = runwhen-flake.defaultPackage."${system}";
|
runwhen = runwhen-flake.defaultPackage."${system}";
|
||||||
@ -44,6 +43,7 @@
|
|||||||
environment.variables = {
|
environment.variables = {
|
||||||
EDITOR="nvim";
|
EDITOR="nvim";
|
||||||
PAGER="less -R";
|
PAGER="less -R";
|
||||||
|
OMNISHARP_BIN = "${pkgs.omnisharp-roslyn}/bin/run";
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.etc."nvim.lua" = {
|
environment.etc."nvim.lua" = {
|
||||||
@ -127,6 +127,7 @@
|
|||||||
rnix-lsp
|
rnix-lsp
|
||||||
nil
|
nil
|
||||||
alloy6
|
alloy6
|
||||||
|
omnisharp-roslyn
|
||||||
(tlaplus.override {
|
(tlaplus.override {
|
||||||
adoptopenjdk-bin = jdk;
|
adoptopenjdk-bin = jdk;
|
||||||
})
|
})
|
||||||
|
@ -9,8 +9,14 @@ local lsconfig = require("lspconfig")
|
|||||||
-- Nix language server support
|
-- Nix language server support
|
||||||
lsconfig.nil_ls.setup{}
|
lsconfig.nil_ls.setup{}
|
||||||
|
|
||||||
-- This needs a path to the omnisharp dll provided
|
local vim_pid = vim.fn.pid()
|
||||||
lsconfig.omnisharp.setup {}
|
|
||||||
|
-- This needs a path to the omnisharp dll provided. We depend on the OMNISHARP_BIN environment variable being set to make this work.
|
||||||
|
lsconfig.omnisharp.setup {
|
||||||
|
cmd = {
|
||||||
|
omnisharp_bin = { vim.env.OMNISHARP_BIN, '--languageserver', '--hostPID', to_string(vim_pid) },
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
-- Java language server support
|
-- Java language server support
|
||||||
lsconfig.java_language_server.setup{}
|
lsconfig.java_language_server.setup{}
|
||||||
@ -37,7 +43,6 @@ vim.api.nvim_create_autocmd('LspAttach', {
|
|||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
-- LSP Diagnostics Options Setup
|
-- LSP Diagnostics Options Setup
|
||||||
local sign = function(opts)
|
local sign = function(opts)
|
||||||
vim.fn.sign_define(opts.name, {
|
vim.fn.sign_define(opts.name, {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user