From 99623ce473899152fd0ecda40d7eb07f272154f9 Mon Sep 17 00:00:00 2001 From: punkfairie Date: Sun, 25 May 2025 17:37:22 -0700 Subject: [PATCH] feat: mounts --- modules/nixos/base/default.nix | 1 + modules/nixos/base/mounts/automounts.nix | 7 +++++++ .../nixos/base/mounts/babeshare.nix | 0 modules/nixos/base/mounts/default.nix | 6 ++++++ .../modules/nixos/mounts/automounts/default.nix | 17 ----------------- 5 files changed, 14 insertions(+), 17 deletions(-) create mode 100644 modules/nixos/base/mounts/automounts.nix rename snowflake/modules/nixos/mounts/babeshare/default.nix => modules/nixos/base/mounts/babeshare.nix (100%) create mode 100644 modules/nixos/base/mounts/default.nix delete mode 100644 snowflake/modules/nixos/mounts/automounts/default.nix diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix index cbb281a..ae7f805 100644 --- a/modules/nixos/base/default.nix +++ b/modules/nixos/base/default.nix @@ -5,6 +5,7 @@ ./fonts.nix ./home.nix ./i18n.nix + ./mounts ./networking.nix ./nix.nix ./stylix.nix diff --git a/modules/nixos/base/mounts/automounts.nix b/modules/nixos/base/mounts/automounts.nix new file mode 100644 index 0000000..a922b2d --- /dev/null +++ b/modules/nixos/base/mounts/automounts.nix @@ -0,0 +1,7 @@ +{ + boot.supportedFilesystems = { + ntfs = true; + }; + + services.udisks2.enable = true; +} diff --git a/snowflake/modules/nixos/mounts/babeshare/default.nix b/modules/nixos/base/mounts/babeshare.nix similarity index 100% rename from snowflake/modules/nixos/mounts/babeshare/default.nix rename to modules/nixos/base/mounts/babeshare.nix diff --git a/modules/nixos/base/mounts/default.nix b/modules/nixos/base/mounts/default.nix new file mode 100644 index 0000000..cfacb94 --- /dev/null +++ b/modules/nixos/base/mounts/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./automounts.nix + ./babeshare.nix + ]; +} diff --git a/snowflake/modules/nixos/mounts/automounts/default.nix b/snowflake/modules/nixos/mounts/automounts/default.nix deleted file mode 100644 index 2850e44..0000000 --- a/snowflake/modules/nixos/mounts/automounts/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - lib, - config, - ... -}: let - cfg = config.marleyos.mounts.automounts; -in { - options.marleyos.mounts.automounts.enable = lib.mkEnableOption "automounts"; - - config = lib.mkIf cfg.enable { - boot.supportedFilesystems = { - ntfs = true; - }; - - services.udisks2.enable = true; - }; -}