devices/gl-ar750/default.nix

@@ -52,9 +52,8 @@
 
   '';
 
-  module = {pkgs, config, lim, lib, ... }:
+  module = {pkgs, config, lim, ... }:
     let
-      inherit (lib) mkIf;
       openwrt = pkgs.openwrt;
       firmwareBlobs = pkgs.pkgsBuildBuild.fetchFromGitHub {
         owner = "kvalo";
@@ -120,9 +119,6 @@
           includePaths =  [
             "${openwrt.src}/target/linux/ath79/dts"
           ];
-          includes = mkIf config.logging.persistent.enable [
-            ./pstore-ramoops.dtsi
-          ];
         };
 
         networkInterfaces =

devices/gl-ar750/pstore-ramoops.dtsi

@@ -1,10 +0,0 @@
-/ {
-reserved-memory {
-		ramoops@03f00000 {
-			compatible = "ramoops";
-			reg = <0x03f00000 0x10000>;
-			record-size = <0x1000>;
-			pmsg-size = <0x1000>;
-		};
-	};
-};

modules/outputs.nix

@@ -104,7 +104,7 @@ in
     system.outputs = rec {
       dtb = liminix.builders.dtb {
         inherit (config.boot) commandLine;
-        dts = [config.hardware.dts.src] ++ config.hardware.dts.includes;
+        dts = config.hardware.dts.includes ++ [config.hardware.dts.src];
         includes = config.hardware.dts.includePaths ++ [
           "${o.kernel.headers}/include"
         ];

modules/s6/default.nix

@@ -212,9 +212,6 @@ let
 in {
   options = {
     logging = {
-      persistent = {
-        enable = mkEnableOption "store logs across reboots";
-      };
       shipping = {
         enable = mkEnableOption "unix socket for log shipping";
         socket = mkOption {
@@ -266,11 +263,6 @@ in {
     )];
 
   config = {
-    kernel.config = mkIf config.logging.persistent.enable {
-      PSTORE = "y";
-      PSTORE_PMSG = "y";
-      PSTORE_RAM = "y";
-    };
     filesystem = dir {
       etc = dir {
         s6-rc = dir {

shell.nix

@@ -3,6 +3,7 @@ let
   liminix = (import ./default.nix {
     device = (import ./devices/qemu);
     liminix-config = ./vanilla-configuration.nix;
+    inherit nixpkgs;
   });
   here = builtins.toString ./.;
 in liminix.buildEnv.overrideAttrs (o: {