From 16a1c5101d08e7267d384032295fb4171e59913f Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Mon, 30 Dec 2024 22:07:30 +0100
Subject: [PATCH] Remove experimental leftovers

---
 modules/outputs/tftpboot.nix | 1 -
 modules/s6/default.nix       | 6 +-----
 pkgs/kernel/kernel_fdt.its   | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/outputs/tftpboot.nix b/modules/outputs/tftpboot.nix
index ac925f9..33dcb5e 100644
--- a/modules/outputs/tftpboot.nix
+++ b/modules/outputs/tftpboot.nix
@@ -124,7 +124,6 @@ in {
             fdtput -p -t lx dtb /reserved-memory/$node reg $ac_prefix $(hex $rootfsStart) $sz_prefix $(hex $rootfsSize)
 
             cmd="liminix ${cmdline} mtdparts=phram0:''${rootfsSize}(rootfs) phram.phram=phram0,''${rootfsStart},''${rootfsSize},${toString config.hardware.flash.eraseBlockSize} root=/dev/mtdblock0";
-            #cmd="liminix ${cmdline}"
             fdtput -t s dtb /chosen ${config.boot.commandLineDtbNode} "$cmd"
 
             dtbSize=$(binsize ./dtb )
diff --git a/modules/s6/default.nix b/modules/s6/default.nix
index a530e16..53d7968 100644
--- a/modules/s6/default.nix
+++ b/modules/s6/default.nix
@@ -5,8 +5,7 @@ let
     s6
     s6-init-bin
     s6-linux-init
-    stdenvNoCC
-    writeShellScript;
+    stdenvNoCC;
   inherit (lib.lists) unique concatMap;
   inherit (lib) concatStrings;
   inherit (builtins) map;
@@ -293,9 +292,6 @@ in {
       };
       bin = dir {
         init = symlink "${s6-init-bin}/bin/init";
-        #init = symlink (writeShellScript "myinit.sh" ''
-        #  echo 'tralala'
-        #'');
       };
     };
   };
diff --git a/pkgs/kernel/kernel_fdt.its b/pkgs/kernel/kernel_fdt.its
index 6127d80..c9907cf 100644
--- a/pkgs/kernel/kernel_fdt.its
+++ b/pkgs/kernel/kernel_fdt.its
@@ -40,8 +40,8 @@
     };
 
     configurations {
-        default = "config-1";
-        config-1 {
+        default = "conf-1";
+        conf-1 {
             description = "Boot Linux kernel with FDT blob";
             kernel = "kernel";
             fdt = "fdt-1";