From f832903ada3b0998bc5bf46b07898a8683b3ceb6 Mon Sep 17 00:00:00 2001 From: Superredstone Date: Thu, 19 Feb 2026 08:58:37 +0100 Subject: [PATCH] feat: modular zram --- flake.nix | 3 +++ lib/mksystem.nix | 2 ++ machines/katana/hardware.nix | 2 -- modules/nix-config/default.nix | 1 + modules/nix-config/hardware.nix | 4 ++++ 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 modules/nix-config/hardware.nix diff --git a/flake.nix b/flake.nix index bd3a65e..bedf914 100644 --- a/flake.nix +++ b/flake.nix @@ -57,6 +57,7 @@ gamingSystem = true; # Currently supported: plasma, gnome, hyprland and none desktopEnvironment = "gnome"; + enableZram = true; additionalModules = [ ]; }; @@ -66,12 +67,14 @@ email = personalEmail; workSystem = true; desktopEnvironment = "gnome"; + enableZram = true; }; nixosConfigurations."bomba" = mkSystem "bomba" { system = "x86_64-linux"; email = personalEmail; user = username; desktopEnvironment = "none"; + enableZram = true; }; }; } diff --git a/lib/mksystem.nix b/lib/mksystem.nix index 4427eeb..55ca305 100644 --- a/lib/mksystem.nix +++ b/lib/mksystem.nix @@ -17,6 +17,7 @@ name: gamingSystem ? false, workSystem ? false, desktopEnvironment ? "", + enableZram ? false, additionalModules ? [ ], }: let @@ -36,6 +37,7 @@ let currentSystemDe = desktopEnvironment; gamingSystem = gamingSystem; workSystem = workSystem; + enableZram = enableZram; nixvim = nixvim; millennium = millennium; nur = nur; diff --git a/machines/katana/hardware.nix b/machines/katana/hardware.nix index f5bbf45..4b1aa37 100644 --- a/machines/katana/hardware.nix +++ b/machines/katana/hardware.nix @@ -48,6 +48,4 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - - zramSwap.enable = true; } diff --git a/modules/nix-config/default.nix b/modules/nix-config/default.nix index d90d89e..f2df549 100644 --- a/modules/nix-config/default.nix +++ b/modules/nix-config/default.nix @@ -6,6 +6,7 @@ }: { imports = [ + ./hardware.nix ./keyboard.nix ./security.nix ./services.nix diff --git a/modules/nix-config/hardware.nix b/modules/nix-config/hardware.nix new file mode 100644 index 0000000..892ef18 --- /dev/null +++ b/modules/nix-config/hardware.nix @@ -0,0 +1,4 @@ +{ enableZram, ... }: +{ + zramSwap.enable = enableZram; +}