From 84c03d71525ba551e06034095e7f27cb5ad25ca9 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Fri, 3 Dec 2021 22:09:00 -0500
Subject: [PATCH] modules/filesystems: include more filesystems

---
 modules/modules/filesystems.nix       | 35 +++++++++++++++++++++++++++
 modules/modules/filesystems/btrfs.nix | 21 ----------------
 users/infinidoge/default.nix          |  1 -
 3 files changed, 35 insertions(+), 22 deletions(-)
 create mode 100644 modules/modules/filesystems.nix
 delete mode 100644 modules/modules/filesystems/btrfs.nix

diff --git a/modules/modules/filesystems.nix b/modules/modules/filesystems.nix
new file mode 100644
index 0000000..836a150
--- /dev/null
+++ b/modules/modules/filesystems.nix
@@ -0,0 +1,35 @@
+{ config, options, lib, pkgs, ... }:
+with lib;
+with lib.hlissner;
+let
+  cfg = config.modules.filesystems;
+  opt = options.modules.filesystems;
+in
+{
+  options.modules.filesystems = {
+    enable = mkBoolOpt false;
+
+    btrfs = with types; {
+      enable = mkBoolOpt false;
+      scrub = mkOpt attrs { };
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+      programs.udevil.enable = true;
+
+      environment.systemPackages = with pkgs; [
+        sshfs
+        exfat # Windows drives
+        ntfs3g # Windows drives
+      ];
+    })
+
+    (mkIf cfg.btrfs.enable {
+      environment.systemPackages = with pkgs; [ btrfs-progs ];
+
+      services.btrfs.autoScrub = mkAliasDefinitions opt.scrub;
+    })
+  ];
+}
diff --git a/modules/modules/filesystems/btrfs.nix b/modules/modules/filesystems/btrfs.nix
deleted file mode 100644
index d34c78c..0000000
--- a/modules/modules/filesystems/btrfs.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, options, lib, pkgs, ... }:
-with lib;
-with lib.hlissner;
-let
-  cfg = config.modules.filesystems.btrfs;
-  opt = options.modules.filesystems.btrfs;
-in
-{
-  options.modules.filesystems.btrfs = with types; {
-    enable = mkBoolOpt false;
-    scrub = mkOpt attrs { };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      btrfs-progs
-    ];
-
-    services.btrfs.autoScrub = mkAliasDefinitions opt.scrub;
-  };
-}
diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix
index 4e241af..cb6376d 100644
--- a/users/infinidoge/default.nix
+++ b/users/infinidoge/default.nix
@@ -63,7 +63,6 @@ in
   environment = {
     systemPackages = with pkgs; [
       ffmpeg
-      ntfs3g
     ];
 
     shellAliases = { };