From 7a7e3d56b2f1642454f31ab5762b4bd112da656d Mon Sep 17 00:00:00 2001
From: Haak Saxberg <haak@kept.io>
Date: Wed, 30 Apr 2025 14:01:00 -0700
Subject: [PATCH] Updating nix channels, requires responding to deprecations

---
 nix/home/programs/nvim/default.nix          | 5 +++--
 nix/home/programs/nvim/nvim-lspconfig.lua   | 2 ++
 nix/system/worktop/darwin-configuration.nix | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nix/home/programs/nvim/default.nix b/nix/home/programs/nvim/default.nix
index ef7cd36..d8bafd0 100644
--- a/nix/home/programs/nvim/default.nix
+++ b/nix/home/programs/nvim/default.nix
@@ -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
diff --git a/nix/home/programs/nvim/nvim-lspconfig.lua b/nix/home/programs/nvim/nvim-lspconfig.lua
index 337bac1..9862892 100644
--- a/nix/home/programs/nvim/nvim-lspconfig.lua
+++ b/nix/home/programs/nvim/nvim-lspconfig.lua
@@ -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",
diff --git a/nix/system/worktop/darwin-configuration.nix b/nix/system/worktop/darwin-configuration.nix
index 4de61c8..b964df5 100644
--- a/nix/system/worktop/darwin-configuration.nix
+++ b/nix/system/worktop/darwin-configuration.nix
@@ -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 (