haak/dotfiles
1
0
Fork 0
Code Issues Pull requests Wiki Activity Actions

Updating nix channels, requires responding to deprecations

Browse source
This commit is contained in:
Haak Saxberg 2025-04-30 14:01:00 -07:00
parent d76b16ddc7
commit 7a7e3d56b2
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nix/home/programs/nvim/default.nix
View file

@ -124,12 +124,13 @@ with builtins;
config = '' config = ''
lua << EOF lua << EOF
${readFile ( ${readFile (
pkgs.substituteAll { pkgs.replaceVars ./nvim-lspconfig.lua {
src = ./nvim-lspconfig.lua;
# since both of these are used for actually configuring the system, # since both of these are used for actually configuring the system,
# we'll probably always want them around. # we'll probably always want them around.
lua_ls = pkgs.sumneko-lua-language-server; lua_ls = pkgs.sumneko-lua-language-server;
nixd = pkgs.nixd; nixd = pkgs.nixd;
ts_server = pkgs.nodePackages.typescript-language-server;
diagnostic_server = pkgs.nodePackages.diagnostic-languageserver;
} }
) } ) }
EOF EOF

2
nix/home/programs/nvim/nvim-lspconfig.lua
View file

@ -62,6 +62,7 @@ vim.api.nvim_create_autocmd("BufWritePre", {
}) })
nvim_lsp.diagnosticls.setup { nvim_lsp.diagnosticls.setup {
cmd = { "@diagnostic_server@/bin/diagnostic-languageserver", '--stdio' },
filetypes = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'css', 'scss', 'markdown', 'pandoc', filetypes = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'css', 'scss', 'markdown', 'pandoc',
'prisma' }, 'prisma' },
init_options = { init_options = {
@ -150,6 +151,7 @@ capabilitiesWithoutFomatting.textDocument.rangeFormatting = false
capabilitiesWithoutFomatting.textDocument.range_formatting = false capabilitiesWithoutFomatting.textDocument.range_formatting = false
nvim_lsp.ts_ls.setup { nvim_lsp.ts_ls.setup {
cmd = { "@ts_server@/bin/typescript-language-server", '--stdio' },
init_options = { init_options = {
hostInfo = "neovim", hostInfo = "neovim",
maxTsServerMemory = "8192", maxTsServerMemory = "8192",

4
nix/system/worktop/darwin-configuration.nix
View file

@ -104,14 +104,14 @@ in
../../home/programs/alacritty ../../home/programs/alacritty
]; ];
# Auto upgrade nix package and the daemon service.
services.nix-daemon.enable = true;
# nix.package = pkgs.nix; # nix.package = pkgs.nix;
# Create /etc/bashrc that loads the nix-darwin environment. # Create /etc/bashrc that loads the nix-darwin environment.
programs.zsh.enable = true; # default shell on catalina programs.zsh.enable = true; # default shell on catalina
# programs.fish.enable = true; # programs.fish.enable = true;
system.primaryUser = "haak";
# We need this snippet to allow spotlight to find the applications installed # We need this snippet to allow spotlight to find the applications installed
# by nix-darwin # by nix-darwin
system.activationScripts.applications.text = pkgs.lib.mkForce ( system.activationScripts.applications.text = pkgs.lib.mkForce (