feat(nixvim): added conform

also fixed merge conflict

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";
+					};
+				};
+			};
+		};
+	};
+}