From 83219fe6de25de62fa5bd0735718446648a953bf Mon Sep 17 00:00:00 2001
From: Doloro1978 <doloroo@proton.me>
Date: Thu, 2 Oct 2025 12:39:52 +0100
Subject: [PATCH] feat(nixvim): added conform

also fixed merge conflict
---
 nix/modules/nixvim/home.nix                 |  3 ++-
 nix/modules/nixvim/plugins/conform.nix      | 24 +++++++++++++++++++++
 nix/modules/nixvim/plugins/default.nix      |  4 ++--
 nix/modules/nixvim/plugins/mini/default.nix |  3 ---
 nvim/init.lua                               |  2 +-
 5 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 nix/modules/nixvim/plugins/conform.nix
 delete mode 100644 nix/modules/nixvim/plugins/mini/default.nix

diff --git a/nix/modules/nixvim/home.nix b/nix/modules/nixvim/home.nix
index 1e0df27..67527e6 100644
--- a/nix/modules/nixvim/home.nix
+++ b/nix/modules/nixvim/home.nix
@@ -2,7 +2,8 @@
 {
   imports = [
     inputs.nixvim.homeModules.nixvim
-  ];
+		./plugins
+  ]; 
   programs.nixvim = {
     enable = true;
     defaultEditor = true;
diff --git a/nix/modules/nixvim/plugins/conform.nix b/nix/modules/nixvim/plugins/conform.nix
new file mode 100644
index 0000000..9f3b869
--- /dev/null
+++ b/nix/modules/nixvim/plugins/conform.nix
@@ -0,0 +1,24 @@
+{ ... }: {
+	programs.nixvim = {
+		plugins = {
+			conform-nvim = {
+				enable = true;
+				settings = {
+				formatters_by_ft = {
+						nix = [ "nixfmt" ];
+						rust = [ "rustfmt" ];
+						"_" = [
+							"squeeze_blanks"
+							"trim_whitespace"
+							"trim_newlines"
+						];
+					};
+					format_on_save = {
+						timeout_ms = 500;
+						lsp_format = "fallback";
+					};
+				};
+			};
+		};
+	};
+}
diff --git a/nix/modules/nixvim/plugins/default.nix b/nix/modules/nixvim/plugins/default.nix
index a34f2ee..94e5cf9 100644
--- a/nix/modules/nixvim/plugins/default.nix
+++ b/nix/modules/nixvim/plugins/default.nix
@@ -1,5 +1,5 @@
 _: {
   imports = [
-    ./
-  ]
+    ./conform.nix
+  ];
 }
diff --git a/nix/modules/nixvim/plugins/mini/default.nix b/nix/modules/nixvim/plugins/mini/default.nix
deleted file mode 100644
index 9ad3aff..0000000
--- a/nix/modules/nixvim/plugins/mini/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-_: {
-  notify: ./notify.nix
-}
diff --git a/nvim/init.lua b/nvim/init.lua
index c50128e..ec24445 120000
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -1 +1 @@
-/nix/store/hlbhy7wzzj8fnh6c6fa9kg33c26s1hzy-home-manager-files/.config/nvim/init.lua
\ No newline at end of file
+/nix/store/q03c1i1hawl68l71aynw1ykhmpw7mbxj-home-manager-files/.config/nvim/init.lua
\ No newline at end of file