From 26e9593aabccce01d13abfb744eac0dc5a742050 Mon Sep 17 00:00:00 2001
From: Jelle Spreeuwenberg <mail@jelles.net>
Date: Sat, 25 Apr 2026 22:42:23 +0200
Subject: [PATCH] feat: add typst dependencies and make conform use isort

---
 modules/features/neovim/default.nix                         | 6 ++++++
 modules/features/neovim/lua-config/init.lua                 | 2 ++
 .../features/neovim/lua-config/lua/plugins/formatting.lua   | 4 ++--
 modules/features/neovim/lua-config/lua/plugins/lsp.lua      | 4 +---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/features/neovim/default.nix b/modules/features/neovim/default.nix
index 26587d2..570dc20 100644
--- a/modules/features/neovim/default.nix
+++ b/modules/features/neovim/default.nix
@@ -57,6 +57,7 @@ in
           astro-language-server
           tinymist
           typstyle
+          websocat
 
           # ty
           # basedpyright
@@ -121,6 +122,11 @@ in
             themeName = repoTheme.name;
           };
 
+          typstPreviewDependencies = {
+            tinymist = "${pkgs.tinymist}/bin/tinymist";
+            websocat = "${pkgs.websocat}/bin/websocat";
+          };
+
         };
 
         # 5. Wrapper Configuration
diff --git a/modules/features/neovim/lua-config/init.lua b/modules/features/neovim/lua-config/init.lua
index 2aa9040..03f8225 100644
--- a/modules/features/neovim/lua-config/init.lua
+++ b/modules/features/neovim/lua-config/init.lua
@@ -1,3 +1,5 @@
+vim.loader.enable()
+
 require("options")
 require("plugins.lsp")
 require("plugins.completion")
diff --git a/modules/features/neovim/lua-config/lua/plugins/formatting.lua b/modules/features/neovim/lua-config/lua/plugins/formatting.lua
index 43da74e..a4df311 100644
--- a/modules/features/neovim/lua-config/lua/plugins/formatting.lua
+++ b/modules/features/neovim/lua-config/lua/plugins/formatting.lua
@@ -33,7 +33,7 @@ require("lz.n").load({
         formatters_by_ft = {
           lua = { "stylua" },
           -- Conform can also run multiple formatters sequentially
-          python = { "isort", "black" },
+          python = { "ruff_fix", "ruff_format", "ruff_organize_imports" },
           --
           -- You can use 'stop_after_first' to run the first available formatter from the list
           -- javascript = { "prettierd", "prettier", stop_after_first = true },
@@ -46,4 +46,4 @@ require("lz.n").load({
       })
     end,
   },
-})
\ No newline at end of file
+})
diff --git a/modules/features/neovim/lua-config/lua/plugins/lsp.lua b/modules/features/neovim/lua-config/lua/plugins/lsp.lua
index ed9f6ab..8e004ba 100644
--- a/modules/features/neovim/lua-config/lua/plugins/lsp.lua
+++ b/modules/features/neovim/lua-config/lua/plugins/lsp.lua
@@ -6,9 +6,7 @@ require("lz.n").load({
       -- Setup typst-preview
       require("typst-preview").setup({
         -- Optionally configure things here
-        dependencies_bin = {
-          -- For example, use tinymist as the LSP if that's what you are running
-        },
+        dependencies_bin = require("nix-info").settings.typstPreviewDependencies,
       })
 
       vim.keymap.set("n", "<leader>tp", "<cmd>TypstPreviewToggle<cr>", { desc = "[T]ypst [P]review Toggle" })