From aea7e04bda37da24c660ff5ab220182dfbb8244f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Tue, 19 Jul 2022 17:08:18 +0200
Subject: nixos: fix invalid init

---
 nixos/modules/turris-defaults.nix | 4 ++--
 nixos/modules/turris-tarball.nix  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/turris-defaults.nix b/nixos/modules/turris-defaults.nix
index ff2e141..9d7a19c 100644
--- a/nixos/modules/turris-defaults.nix
+++ b/nixos/modules/turris-defaults.nix
@@ -48,12 +48,12 @@ in {
     boot.initrd.supportedFilesystems = [ "btrfs" ];
 
     # Cover nix memory consumption peaks by compressing the RAM
-    zramSwap = {
+    zramSwap = mkDefault {
       enable = true;
       memoryPercent = 80;
     };
 
-    fileSystems = {
+    fileSystems = mkDefault {
       "/" = {
         device = "/dev/disk/by-partlabel/" + cnf.rootLabel;
         fsType = "btrfs";
diff --git a/nixos/modules/turris-tarball.nix b/nixos/modules/turris-tarball.nix
index 87c4fb9..55187e4 100644
--- a/nixos/modules/turris-tarball.nix
+++ b/nixos/modules/turris-tarball.nix
@@ -63,7 +63,7 @@ in {
             LINUX /run/current-system/kernel
             FDTDIR /run/current-system/dtbs
             INITRD /run/current-system/initrd
-            APPEND init=${config.system.build.toplevel}/init ${builtins.toString config.boot.kernelParams}
+            APPEND init=${tarballVariant.config.system.build.toplevel}/init ${builtins.toString tarballVariant.config.boot.kernelParams}
         '';
         target = "./boot/extlinux/extlinux.conf";
       }
-- 
cgit v1.2.3