Updating nix channels, requires responding to deprecations
This commit is contained in:
parent
d76b16ddc7
commit
7a7e3d56b2
3 changed files with 7 additions and 4 deletions
|
|
@ -124,12 +124,13 @@ with builtins;
|
|||
config = ''
|
||||
lua << EOF
|
||||
${readFile (
|
||||
pkgs.substituteAll {
|
||||
src = ./nvim-lspconfig.lua;
|
||||
pkgs.replaceVars ./nvim-lspconfig.lua {
|
||||
# since both of these are used for actually configuring the system,
|
||||
# we'll probably always want them around.
|
||||
lua_ls = pkgs.sumneko-lua-language-server;
|
||||
nixd = pkgs.nixd;
|
||||
ts_server = pkgs.nodePackages.typescript-language-server;
|
||||
diagnostic_server = pkgs.nodePackages.diagnostic-languageserver;
|
||||
}
|
||||
) }
|
||||
EOF
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ vim.api.nvim_create_autocmd("BufWritePre", {
|
|||
})
|
||||
|
||||
nvim_lsp.diagnosticls.setup {
|
||||
cmd = { "@diagnostic_server@/bin/diagnostic-languageserver", '--stdio' },
|
||||
filetypes = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'css', 'scss', 'markdown', 'pandoc',
|
||||
'prisma' },
|
||||
init_options = {
|
||||
|
|
@ -150,6 +151,7 @@ capabilitiesWithoutFomatting.textDocument.rangeFormatting = false
|
|||
capabilitiesWithoutFomatting.textDocument.range_formatting = false
|
||||
|
||||
nvim_lsp.ts_ls.setup {
|
||||
cmd = { "@ts_server@/bin/typescript-language-server", '--stdio' },
|
||||
init_options = {
|
||||
hostInfo = "neovim",
|
||||
maxTsServerMemory = "8192",
|
||||
|
|
|
|||
|
|
@ -104,14 +104,14 @@ in
|
|||
../../home/programs/alacritty
|
||||
];
|
||||
|
||||
# Auto upgrade nix package and the daemon service.
|
||||
services.nix-daemon.enable = true;
|
||||
# nix.package = pkgs.nix;
|
||||
|
||||
# Create /etc/bashrc that loads the nix-darwin environment.
|
||||
programs.zsh.enable = true; # default shell on catalina
|
||||
# programs.fish.enable = true;
|
||||
|
||||
system.primaryUser = "haak";
|
||||
|
||||
# We need this snippet to allow spotlight to find the applications installed
|
||||
# by nix-darwin
|
||||
system.activationScripts.applications.text = pkgs.lib.mkForce (
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue