From 2e935d6328bf9f39de2b6cae8cf3a6c4c4fe0e6d Mon Sep 17 00:00:00 2001
From: rocketcamel <luca_lise@icloud.com>
Date: Wed, 5 Feb 2025 16:45:44 +0000
Subject: [PATCH] feat: luau lsp

---
 .config/nvim/lazy-lock.json                  |  4 +-
 .config/nvim/lua/rocketcamel/plugins/lsp.lua | 58 +++++++++++---------
 nix/modules/commonPackages.nix               |  1 +
 nix/users/luca/zsh.nix                       |  2 +-
 4 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index c822282..f9131d0 100755
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,12 +1,12 @@
 {
   "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
-  "fidget.nvim": { "branch": "main", "commit": "a0abbf18084b77d28bc70e24752e4f4fd54aea17" },
+  "fidget.nvim": { "branch": "main", "commit": "3fa10de61546fd0a98faac3084a6c0db612adaf8" },
   "lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "mini.nvim": { "branch": "main", "commit": "87fc38a8a2b8d498cecb021d057a38ea2e9f5a79" },
   "nvim-lspconfig": { "branch": "master", "commit": "66bc018936c6ff76beb75f89d986af6442db4001" },
-  "nvim-treesitter": { "branch": "master", "commit": "53a6b3993f5803378d4d031bf114c0b125a52ba8" },
+  "nvim-treesitter": { "branch": "master", "commit": "cced713b4993ddbfba8f82e9e60fcab7cbee8101" },
   "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
   "rose-pine": { "branch": "main", "commit": "00ec4cec924b624920baac9d42eac02e1efcae76" },
   "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
diff --git a/.config/nvim/lua/rocketcamel/plugins/lsp.lua b/.config/nvim/lua/rocketcamel/plugins/lsp.lua
index aa37258..032921d 100755
--- a/.config/nvim/lua/rocketcamel/plugins/lsp.lua
+++ b/.config/nvim/lua/rocketcamel/plugins/lsp.lua
@@ -1,27 +1,35 @@
 return {
-  {
-    "neovim/nvim-lspconfig",
-    dependencies = {
-      "williamboman/mason.nvim",
-      "williamboman/mason-lspconfig.nvim",
-      "j-hui/fidget.nvim",
-    },
-    config = function()
-      require("mason").setup()
-      require("fidget").setup()
-      require("mason-lspconfig").setup({
-        ensure_installed = {
-          "ts_ls",
-          "lua_ls",
-          "rust_analyzer",
-          "nil_ls",
-        },
-        handlers = {
-          function(server)
-            require("lspconfig")[server].setup({})
-          end,
-        },
-      })
-    end,
-  },
+	{
+		"neovim/nvim-lspconfig",
+		dependencies = {
+			"williamboman/mason.nvim",
+			"williamboman/mason-lspconfig.nvim",
+			"j-hui/fidget.nvim",
+		},
+		config = function()
+			require("mason").setup()
+			require("fidget").setup()
+			require("mason-lspconfig").setup({
+				ensure_installed = {
+					"ts_ls",
+					"lua_ls",
+					"luau_lsp",
+					"rust_analyzer",
+					"nil_ls",
+				},
+				handlers = {
+					function(server)
+						require("lspconfig")[server].setup({})
+					end,
+					luau_lsp = function()
+						require("lspconfig").luau_lsp.setup({
+							fflags = {
+								enable_new_solver = true,
+							},
+						})
+					end,
+				},
+			})
+		end,
+	},
 }
diff --git a/nix/modules/commonPackages.nix b/nix/modules/commonPackages.nix
index a4b6ec2..6aa5132 100644
--- a/nix/modules/commonPackages.nix
+++ b/nix/modules/commonPackages.nix
@@ -23,6 +23,7 @@
       asciiquarium
       wireguard-tools
       fzf
+      lune
     ];
     programs.nix-ld.enable = lib.mkDefault true;
     programs.zsh.enable = lib.mkDefault true;
diff --git a/nix/users/luca/zsh.nix b/nix/users/luca/zsh.nix
index 5b552cf..32a4c06 100644
--- a/nix/users/luca/zsh.nix
+++ b/nix/users/luca/zsh.nix
@@ -6,7 +6,7 @@
   syntaxHighlighting.enable = true;
   history.size = 1000;
   envExtra = ''
-    . "$HOME/.rokit/env"
+    export PATH="$PATH:$HOME/.pesde/bin"
   '';
   oh-my-zsh = {
     enable = true;