From dbe5c33c7a77275bbd18fe2f7ff91625746c4330 Mon Sep 17 00:00:00 2001
From: Lumpiasty <arek.dzski@gmail.com>
Date: Thu, 24 Sep 2026 20:05:57 +0200
Subject: [PATCH] remove ntfs patches as they are upstream

---
 modules/default.nix                           |  1 -
 .../0001-fix-windows_names-option.patch       | 13 ------------
 ...bad-character-check-by-windows_names.patch | 20 -------------------
 modules/system/ntfsplus.nix                   | 13 ------------
 4 files changed, 47 deletions(-)
 delete mode 100644 modules/system/ntfsplus-patches/0001-fix-windows_names-option.patch
 delete mode 100644 modules/system/ntfsplus-patches/0002-gate-bad-character-check-by-windows_names.patch
 delete mode 100644 modules/system/ntfsplus.nix

diff --git a/modules/default.nix b/modules/default.nix
index 331e846..f39db14 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -18,7 +18,6 @@
     system/ipv6-mostly.nix
     system/nix.nix
     system/zfs.nix
-    system/ntfsplus.nix
 
     desktop/plasma.nix
     desktop/touchpad.nix
diff --git a/modules/system/ntfsplus-patches/0001-fix-windows_names-option.patch b/modules/system/ntfsplus-patches/0001-fix-windows_names-option.patch
deleted file mode 100644
index 1de620d..0000000
--- a/modules/system/ntfsplus-patches/0001-fix-windows_names-option.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
---- a/fs/ntfs/super.c
-+++ b/fs/ntfs/super.c
-@@ -91,7 +91,7 @@ static const struct fs_parameter_spec ntfs_parameters[] = {
- 	fsparam_flag("sys_immutable",		Opt_sys_immutable),
- 	fsparam_flag("nohidden",		Opt_nohidden),
- 	fsparam_flag("hide_dot_files",		Opt_hide_dot_files),
--	fsparam_flag("windows_names",		Opt_check_windows_names),
-+	fsparam_bool("windows_names",		Opt_check_windows_names),
- 	fsparam_flag("acl",			Opt_acl),
- 	fsparam_flag("discard",			Opt_discard),
- 	fsparam_flag("sparse",			Opt_sparse),
-
diff --git a/modules/system/ntfsplus-patches/0002-gate-bad-character-check-by-windows_names.patch b/modules/system/ntfsplus-patches/0002-gate-bad-character-check-by-windows_names.patch
deleted file mode 100644
index e613e8e..0000000
--- a/modules/system/ntfsplus-patches/0002-gate-bad-character-check-by-windows_names.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/fs/ntfs/namei.c b/fs/ntfs/namei.c
---- a/fs/ntfs/namei.c
-+++ b/fs/ntfs/namei.c
-@@ -61,12 +61,12 @@ static int ntfs_check_bad_windows_name(struct ntfs_volume *vol,
- 				       const __le16 *wc,
- 				       unsigned int wc_len)
- {
--	if (ntfs_check_bad_char(wc, wc_len))
--		return -EINVAL;
--
- 	if (!NVolCheckWindowsNames(vol))
- 		return 0;
- 
-+	if (ntfs_check_bad_char(wc, wc_len))
-+		return -EINVAL;
-+
- 	/* Check for trailing space or dot. */
- 	if (wc_len > 0 &&
- 	    (wc[wc_len - 1] == cpu_to_le16(' ') ||
-
diff --git a/modules/system/ntfsplus.nix b/modules/system/ntfsplus.nix
deleted file mode 100644
index 5a3043c..0000000
--- a/modules/system/ntfsplus.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-
-{
-  boot.extraModulePackages = [
-    ((pkgs.callPackage ../../pkgs/ntfs/package.nix { kernel = config.boot.kernelPackages.kernel; }).overrideAttrs {
-      patches = [
-        ./ntfsplus-patches/0001-fix-windows_names-option.patch
-        ./ntfsplus-patches/0002-gate-bad-character-check-by-windows_names.patch
-        ];
-    })
-  ];
-}