diff --git a/flake.lock b/flake.lock index c09742c..8f05a36 100644 --- a/flake.lock +++ b/flake.lock @@ -220,6 +220,22 @@ "type": "github" } }, + "linux-ntfs": { + "flake": false, + "locked": { + "lastModified": 1777784940, + "narHash": "sha256-Dbh1r86X0uNx8keTkdg+uzq4/+DHm+IiTuxrHXlklXA=", + "owner": "namjaejeon", + "repo": "linux-ntfs", + "rev": "9e031cf453d8b3c226aac7cb7105af46efd79690", + "type": "github" + }, + "original": { + "owner": "namjaejeon", + "repo": "linux-ntfs", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1767983141, @@ -291,6 +307,27 @@ "type": "github" } }, + "ntfsplus": { + "inputs": { + "linux-ntfs": "linux-ntfs", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774317576, + "narHash": "sha256-HSDFaDLvfS/NqJlXbHh9135DEpqH6JrNuWqbu3YPcTg=", + "owner": "cmspam", + "repo": "ntfsplus-flake", + "rev": "e22d1bcbac31b4e6484d32c503396e8184650215", + "type": "github" + }, + "original": { + "owner": "cmspam", + "repo": "ntfsplus-flake", + "type": "github" + } + }, "peerix": { "inputs": { "flake-compat": "flake-compat_2", @@ -369,6 +406,7 @@ "nix-sweep": "nix-sweep", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "ntfsplus": "ntfsplus", "peerix": "peerix", "plasma-manager": "plasma-manager" } diff --git a/flake.nix b/flake.nix index 3c3b25c..5a3e8ff 100644 --- a/flake.nix +++ b/flake.nix @@ -34,6 +34,10 @@ url = "github:Lumpiasty/acer-wmi-ext/main"; inputs.nixpkgs.follows = "nixpkgs"; }; + ntfsplus = { + url = "github:cmspam/ntfsplus-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixos-hardware, ... }@inputs: diff --git a/hosts/gaming-pc.nix b/hosts/gaming-pc.nix index 4808728..44db927 100644 --- a/hosts/gaming-pc.nix +++ b/hosts/gaming-pc.nix @@ -94,7 +94,7 @@ "/var/games" = { device = "/dev/disk/by-uuid/8A3094A230949733"; # "Shared" NTFS partition - fsType = "ntfs-3g"; + fsType = "ntfs"; options = [ "uid=1000" "gid=100" # My user account "nofail" # Don't fail boot if failed to mount because windows left it dirty @@ -102,6 +102,11 @@ }; }; + # Use ntfs-plus instead driver + services.ntfsplus.enable = true; + # Force disable ntfs-3g driver + boot.supportedFilesystems.ntfs = lib.mkForce false; + # Config modules lumpiasty = { pc = true; diff --git a/lib/mkNixosSystem.nix b/lib/mkNixosSystem.nix index af6b0d8..7ed7bde 100644 --- a/lib/mkNixosSystem.nix +++ b/lib/mkNixosSystem.nix @@ -9,6 +9,7 @@ nix-sweep, peerix, acer-wmi-ext, + ntfsplus, ... }: hardwareConfig: hostConfig: @@ -36,6 +37,7 @@ nixpkgs.lib.nixosSystem { home-manager.nixosModules.home-manager nix-sweep.nixosModules.default peerix.nixosModules.peerix + ntfsplus.nixosModules.default ../modules hostConfig ];