From 181e59a105021905746a7c37db3eb26e5fa738a9 Mon Sep 17 00:00:00 2001
From: cnst <cnst@cana.st>
Date: Sun, 14 Jul 2024 20:43:33 +0200
Subject: [PATCH] testing nixvim 5

---
 home/extra/neovim/plugins/conform.nix | 24 ++++++++++++++++++++++++
 home/extra/neovim/plugins/default.nix |  1 +
 home/extra/neovim/plugins/lsp.nix     |  5 +----
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 home/extra/neovim/plugins/conform.nix

diff --git a/home/extra/neovim/plugins/conform.nix b/home/extra/neovim/plugins/conform.nix
new file mode 100644
index 00000000..e2c05766
--- /dev/null
+++ b/home/extra/neovim/plugins/conform.nix
@@ -0,0 +1,24 @@
+{
+  plugins.conform-nvim = {
+    enable = true;
+    formatOnSave = {
+      lspFallback = true;
+      timeoutMs = 500;
+    };
+    notifyOnError = true;
+    formattersByFt = {
+      liquidsoap = [ "liquidsoap-prettier" ];
+      html = [ [ "prettierd" "prettier" ] ];
+      css = [ [ "prettierd" "prettier" ] ];
+      javascript = [ [ "prettierd" "prettier" ] ];
+      javascriptreact = [ [ "prettierd" "prettier" ] ];
+      typescript = [ [ "prettierd" "prettier" ] ];
+      typescriptreact = [ [ "prettierd" "prettier" ] ];
+      python = [ "black" ];
+      lua = [ "stylua" ];
+      nix = [ "alejandra" ];
+      markdown = [ [ "prettierd" "prettier" ] ];
+      yaml = [ "yamllint" "yamlfmt" ];
+    };
+  };
+}
diff --git a/home/extra/neovim/plugins/default.nix b/home/extra/neovim/plugins/default.nix
index da8d3d26..60612a27 100644
--- a/home/extra/neovim/plugins/default.nix
+++ b/home/extra/neovim/plugins/default.nix
@@ -16,6 +16,7 @@
     ./treesitter.nix
     ./vimtex.nix
     ./nonels.nix
+    ./conform.nix
   ];
 
   programs.nixvim = {
diff --git a/home/extra/neovim/plugins/lsp.nix b/home/extra/neovim/plugins/lsp.nix
index c3def42d..790d4f03 100644
--- a/home/extra/neovim/plugins/lsp.nix
+++ b/home/extra/neovim/plugins/lsp.nix
@@ -23,11 +23,9 @@
         };
 
     # Language server
-    lsp = {
-      enable = true;
       servers = {
         # Average webdev LSPs
-        tsserver.enable = true; # TS/JS
+        tsserver.enable = false; # TS/JS
         cssls.enable = true; # CSS
         tailwindcss.enable = true; # TailwindCSS
         html.enable = true; # HTML
@@ -79,5 +77,4 @@
     };
     };
 };
-};
 }