summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/core/memory.nix13
-rw-r--r--sys/core/storage.nix5
2 files changed, 6 insertions, 12 deletions
diff --git a/sys/core/memory.nix b/sys/core/memory.nix
index cdf71e8..956cc73 100644
--- a/sys/core/memory.nix
+++ b/sys/core/memory.nix
@@ -4,14 +4,11 @@ let
in
{
options.sys.core.memory = {
- enable = lib.mkEnableOption "memory management";
-
zram = {
enable = lib.mkEnableOption "enables zram compression";
percent = lib.mkOption {
type = lib.types.int;
default = 25;
- description = "Percentage of total RAM to use for zram";
};
};
@@ -19,13 +16,11 @@ in
enable = lib.mkEnableOption "enables a swapfile";
size = lib.mkOption {
type = lib.types.int;
- default = 8192;
- description = "Size of the swapfile in gigabytes";
+ default = 8;
};
};
};
-
- config = lib.mkIf cfg.enable (lib.mkMerge [
+ config = lib.mkMerge [
(lib.mkIf cfg.zram.enable {
zramSwap = {
enable = true;
@@ -38,9 +33,9 @@ in
(lib.mkIf cfg.swapfile.enable {
swapDevices = [ {
device = "/.swapvol/swapfile";
- size = cfg.swapfile.size * 1024;
+ size = cfg.swapfile.size * 1024;
priority = 0;
} ];
})
- ]);
+ ];
}
diff --git a/sys/core/storage.nix b/sys/core/storage.nix
index d026eeb..693e5e7 100644
--- a/sys/core/storage.nix
+++ b/sys/core/storage.nix
@@ -24,9 +24,8 @@ in
services.fstrim.enable = true;
services.btrfs.autoScrub = {
- enable = true;
- interval = "monthly";
- fileSystems = [ "/" ];
+ enable = true;
+ fileSystems = [ "/" ];
};
boot.tmp = {