From 7bb3fdfef76f71b91d0c863f938f77209d8928c8 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Wed, 20 Apr 2022 09:30:40 -0400 Subject: [PATCH] module: move filesystems into core profile --- hosts/Infini-DESKTOP/default.nix | 4 ---- hosts/Infini-FRAMEWORK/default.nix | 4 ---- hosts/Infini-SERVER/default.nix | 4 ---- hosts/Infini-STICK/default.nix | 4 ---- modules/modules/Modules.org | 15 ------------- modules/modules/filesystems.nix | 35 ------------------------------ 6 files changed, 66 deletions(-) delete mode 100644 modules/modules/filesystems.nix diff --git a/hosts/Infini-DESKTOP/default.nix b/hosts/Infini-DESKTOP/default.nix index ae6fe46..b46d385 100644 --- a/hosts/Infini-DESKTOP/default.nix +++ b/hosts/Infini-DESKTOP/default.nix @@ -57,10 +57,6 @@ }; }; }; - filesystems = { - enable = true; - btrfs.enable = true; - }; desktop = { gaming.enableAll = true; }; diff --git a/hosts/Infini-FRAMEWORK/default.nix b/hosts/Infini-FRAMEWORK/default.nix index 062043c..35fe43d 100644 --- a/hosts/Infini-FRAMEWORK/default.nix +++ b/hosts/Infini-FRAMEWORK/default.nix @@ -46,10 +46,6 @@ fprint-sensor.enable = true; }; }; - filesystems = { - enable = true; - btrfs.enable = true; - }; desktop = { gaming = { steam.enable = true; diff --git a/hosts/Infini-SERVER/default.nix b/hosts/Infini-SERVER/default.nix index 3546d7c..02ff91a 100644 --- a/hosts/Infini-SERVER/default.nix +++ b/hosts/Infini-SERVER/default.nix @@ -14,10 +14,6 @@ # gpu.nvidia = true; form.server = true; }; - filesystems = { - enable = true; - btrfs.enable = true; - }; }; services = { diff --git a/hosts/Infini-STICK/default.nix b/hosts/Infini-STICK/default.nix index 157389a..190972a 100644 --- a/hosts/Infini-STICK/default.nix +++ b/hosts/Infini-STICK/default.nix @@ -19,10 +19,6 @@ form.portable = true; }; services.proxy.enable = false; - filesystems = { - enable = true; - btrfs.enable = true; - }; }; environment.persistence."/persist" = { diff --git a/modules/modules/Modules.org b/modules/modules/Modules.org index 48fa993..79b41da 100644 --- a/modules/modules/Modules.org +++ b/modules/modules/Modules.org @@ -91,21 +91,6 @@ Currently includes: - GRUB v2 - systemd-boot -* Filesystems :module: - -Sets up a variety of filesystems that may be needed on a computer, as well as any software necessary to manage them. - -Currently includes: -- Filesystems - + btrfs - - btrfs-progs - - btrfs autoscrub service - + sshfs - + exfat - + ntfs -- Software - + udevil - * Locale :module: Sets up a variety of locale-related options like font, timezone, language, etc. diff --git a/modules/modules/filesystems.nix b/modules/modules/filesystems.nix deleted file mode 100644 index 60f7c37..0000000 --- a/modules/modules/filesystems.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ 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.btrfs.scrub; - }) - ]; -}