From 4e1c0a168b62eb0931c4419df86ba4d673d8e16d Mon Sep 17 00:00:00 2001
From: rocketcamel <luca_lise@icloud.com>
Date: Mon, 18 Aug 2025 18:51:00 -0700
Subject: [PATCH] fix: use nixd

---
 .config/nvim/lua/rocketcamel/plugins/lsp.lua | 7 ++++++-
 mise.toml                                    | 2 ++
 nix/modules/commonPackages.nix               | 1 +
 nix/modules/desktop.nix                      | 1 -
 nix/users/luca/home.nix                      | 1 +
 nix/users/luca/mise.nix                      | 4 ++++
 6 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 mise.toml
 create mode 100644 nix/users/luca/mise.nix

diff --git a/.config/nvim/lua/rocketcamel/plugins/lsp.lua b/.config/nvim/lua/rocketcamel/plugins/lsp.lua
index a0a81ca..18cc8d3 100644
--- a/.config/nvim/lua/rocketcamel/plugins/lsp.lua
+++ b/.config/nvim/lua/rocketcamel/plugins/lsp.lua
@@ -43,6 +43,10 @@ local function setup_ts()
   require("lspconfig").ts_ls.setup({})
 end
 
+local function setup_nix()
+  require("lspconfig").nixd.setup({})
+end
+
 return {
   {
     "neovim/nvim-lspconfig",
@@ -65,8 +69,8 @@ return {
         ensure_installed = {
           "ts_ls",
           "lua_ls",
+          "luau_lsp",
           "rust_analyzer",
-          "nil_ls",
           "tailwindcss",
           "svelte",
           "html",
@@ -78,6 +82,7 @@ return {
       setup_luau()
       setup_lua()
       setup_ts()
+      setup_nix()
     end,
   },
 }
diff --git a/mise.toml b/mise.toml
new file mode 100644
index 0000000..fceb024
--- /dev/null
+++ b/mise.toml
@@ -0,0 +1,2 @@
+[tools]
+"ubi:lune-org/lune" = "latest"
diff --git a/nix/modules/commonPackages.nix b/nix/modules/commonPackages.nix
index 3435594..99c9385 100644
--- a/nix/modules/commonPackages.nix
+++ b/nix/modules/commonPackages.nix
@@ -55,6 +55,7 @@
       pkg-config
       openssl
       gnupg
+      nixd
     ];
     programs.nix-ld.enable = lib.mkDefault true;
     programs.zsh.enable = lib.mkDefault true;
diff --git a/nix/modules/desktop.nix b/nix/modules/desktop.nix
index 44e7a82..21ad325 100644
--- a/nix/modules/desktop.nix
+++ b/nix/modules/desktop.nix
@@ -36,7 +36,6 @@
       wl-clip-persist
       wdisplays
       efibootmgr
-      nixd
       xfce.thunar
       altserver-linux
       xdg-desktop-portal
diff --git a/nix/users/luca/home.nix b/nix/users/luca/home.nix
index 3c2ae19..b735fb8 100644
--- a/nix/users/luca/home.nix
+++ b/nix/users/luca/home.nix
@@ -15,6 +15,7 @@
     tmux = import ./tmux.nix { inherit pkgs; };
     oh-my-posh = import ./omp.nix;
     eza = import ./eza.nix;
+    mise = import ./mise.nix;
   };
   xdg.mimeApps = import ./mime.nix;
 
diff --git a/nix/users/luca/mise.nix b/nix/users/luca/mise.nix
new file mode 100644
index 0000000..349adb2
--- /dev/null
+++ b/nix/users/luca/mise.nix
@@ -0,0 +1,4 @@
+{
+  enable = true;
+  enableZshIntegration = true;
+}