From b23265403c87af272c74cda484a840b0f22306f5 Mon Sep 17 00:00:00 2001
From: Asmir A <asmir.abdulahovic@gmail.com>
Date: Sat, 24 May 2025 11:11:17 +0200
Subject: [PATCH] update 24.11 -> 25.05; typst_lsp -> tinymst

---
 flake.nix |  4 ++--
 vimrc.lua | 29 +++++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index c802847..06a9de0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "A very basic flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
   };
 
   outputs = {
@@ -33,7 +33,7 @@
             svls
             texlab
             tree-sitter
-            typst-lsp
+            tinymist
             verible
             yaml-language-server
             zls
diff --git a/vimrc.lua b/vimrc.lua
index f40d74d..f8b94ef 100644
--- a/vimrc.lua
+++ b/vimrc.lua
@@ -34,7 +34,7 @@ require 'nvim-treesitter.configs'.setup {
 		enable = true,
 		extended_mode = true,
 		max_file_lines = 1000,
-		colors = { '#ff0000', '#0051a0' ,'#ffa500', '#ffff00', '#008000',  '#8003f2' }
+		colors = { '#ff0000', '#0051a0', '#ffa500', '#ffff00', '#008000', '#8003f2' }
 	}
 }
 
@@ -182,7 +182,7 @@ cmp.setup({
 	}
 })
 
-local servers = { 'pyright', 'rust_analyzer', 'ccls', 'nixd', 'texlab', 'zls', 'gopls', 'yamlls', 'typst_lsp' }
+local servers = { 'pyright', 'rust_analyzer', 'ccls', 'texlab', 'zls', 'gopls', 'yamlls', 'tinymst' }
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
 for _, lsp in pairs(servers) do
 	require('lspconfig')[lsp].setup {
@@ -190,6 +190,31 @@ for _, lsp in pairs(servers) do
 	}
 end
 
+require("lspconfig").nixd.setup({
+	cmd = { "nixd" },
+	settings = {
+		nixd = {
+			nixpkgs = {
+				expr = 'import "${flake.inputs.nixpkgs}" { }',
+
+			},
+			formatting = {
+				command = { "nixpkgs-fmt" },
+			},
+			options = {
+				nixos = {
+					expr =
+					'(let pkgs = import "${inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules =  (import "${inputs.nixpkgs}/nixos/modules/module-list.nix") ++ [ ({...}: { nixpkgs.hostPlatform = builtins.currentSystem;} ) ] ; })).options',
+				},
+				home_manager = {
+					expr =
+					'(let pkgs = import "${inputs.nixpkgs}" { }; lib = import "${inputs.home-manager}/modules/lib/stdlib-extended.nix" pkgs.lib; in (lib.evalModules { modules =  (import "${inputs.home-manager}/modules/modules.nix") { inherit lib pkgs; check = false; }; })).options',
+				},
+			},
+		},
+	},
+})
+
 require('lspconfig').lua_ls.setup({
 	capabilities = capabilities,
 	single_file_support = true,