diff options
| author | Franck Cuny <franck@fcuny.net> | 2022-04-05 20:16:49 -0700 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2022-04-05 20:16:49 -0700 |
| commit | cb66e057603302026731d33189d076815f0a38f4 (patch) | |
| tree | b60cf9a2412e4f6f8e34d7c65f7db947deed9023 | |
| parent | refactor network configuration (diff) | |
| download | world-cb66e057603302026731d33189d076815f0a38f4.tar.gz | |
refactor modules for btrfs, ssd, and fwupd
| -rw-r--r-- | hosts/common/system/default.nix | 2 | ||||
| -rw-r--r-- | hosts/common/system/hardware.nix | 8 | ||||
| -rw-r--r-- | modules/hardware/default.nix | 2 | ||||
| -rw-r--r-- | modules/hardware/ssd/default.nix | 5 | ||||
| -rw-r--r-- | modules/services/default.nix | 2 | ||||
| -rw-r--r-- | modules/services/fwupd/default.nix | 5 | ||||
| -rw-r--r-- | modules/system/btrfs/default.nix | 5 | ||||
| -rw-r--r-- | modules/system/default.nix | 2 |
8 files changed, 19 insertions, 12 deletions
diff --git a/hosts/common/system/default.nix b/hosts/common/system/default.nix index 8ccb80f..a4ef6cd 100644 --- a/hosts/common/system/default.nix +++ b/hosts/common/system/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { - imports = [ ./boot.nix ./hardware.nix ]; + imports = [ ./boot.nix ]; } diff --git a/hosts/common/system/hardware.nix b/hosts/common/system/hardware.nix deleted file mode 100644 index 43c2718..0000000 --- a/hosts/common/system/hardware.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, lib, config, ... }: - -{ - services.fwupd.enable = true; - - services.fstrim.enable = true; - services.btrfs.autoScrub.enable = true; -} diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix index 73b6fbd..16761db 100644 --- a/modules/hardware/default.nix +++ b/modules/hardware/default.nix @@ -1,5 +1,5 @@ { ... }: { - imports = [ ./sound ./networking ]; + imports = [ ./ssd ./sound ./networking ]; } diff --git a/modules/hardware/ssd/default.nix b/modules/hardware/ssd/default.nix new file mode 100644 index 0000000..935c217 --- /dev/null +++ b/modules/hardware/ssd/default.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + services.fstrim.enable = true; +} diff --git a/modules/services/default.nix b/modules/services/default.nix index 2e04cac..a919d04 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -1 +1 @@ -{ ... }: { imports = [ ./ssh-server ./tailscale ./thermald ./tlp ]; } +{ ... }: { imports = [ ./ssh-server ./tailscale ./thermald ./tlp ./fwupd ]; } diff --git a/modules/services/fwupd/default.nix b/modules/services/fwupd/default.nix new file mode 100644 index 0000000..52dc13e --- /dev/null +++ b/modules/services/fwupd/default.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + services.fwupd.enable = true; +} diff --git a/modules/system/btrfs/default.nix b/modules/system/btrfs/default.nix new file mode 100644 index 0000000..d569c78 --- /dev/null +++ b/modules/system/btrfs/default.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + services.btrfs.autoScrub.enable = true; +} diff --git a/modules/system/default.nix b/modules/system/default.nix index d3eea02..620ad2e 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -1 +1 @@ -{ ... }: { imports = [ ./console ./locale ./nix ./users ./security ]; } +{ ... }: { imports = [ ./console ./locale ./nix ./users ./security ./btrfs ]; } |