Merge remote-tracking branch 'gum/master'

3 files changed, 0 insertions, 58 deletions

diff --git a/makefu/1systems/sdcard/config.nix b/makefu/1systems/sdcard/config.nix
deleted file mode 100644
index 4e3c22a30..000000000
--- a/makefu/1systems/sdcard/config.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  kernel = pkgs.callPackage ./kernel.nix {
-      kernelPatches = with pkgs.kernelPatches; [
-      #  kernelPatches.bridge_stp_helper
-      #  kernelPatches.modinst_arg_list_too_long
-      ];
-    };
-in
-{
-  imports = [
-    <nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix>
-    # <stockholm/makefu/2configs/minimal.nix>
-  ];
-  # TODO: NIX_PATH and nix.nixPath are being set by default.nix right now
-  # cd ~/stockholm ; nix build config.system.build.sdImage -I  nixos-config=makefu/1systems/sdcard/config.nix -f /home/makefu/nixpkgs/nixos
-
-  boot.kernelParams = ["console=ttyS2,1500000" "earlycon=uart8250,mmio32,0xff1a0000"];
-  # boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelPackages = pkgs.linuxPackagesFor kernel;
-  boot.supportedFilesystems = lib.mkForce [ "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
-
-  # krebs.hidden-ssh.enable = true;
-  environment.systemPackages = with pkgs; [
-    aria2
-    ddrescue
-  ];
-  environment.extraInit = ''
-    EDITOR=vim
-  '';
-  # iso-specific
-  services.openssh = {
-    enable = true;
-    hostKeys = [
-      { bits = 8192; type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; }
-    ];
-  };
-  # enable ssh in the iso boot process
-  systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ];
-}
diff --git a/makefu/1systems/sdcard/kernel.nix b/makefu/1systems/sdcard/kernel.nix
deleted file mode 100644
index df5e7ada9..000000000
--- a/makefu/1systems/sdcard/kernel.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ fetchFromGitLab, buildLinux, ... } @ args:
-buildLinux (args // rec {
-  version = "4.4.55";
-  modDirVersion = "4.4.55";
-  extraMeta.branch = "4.4";
-  defconfig = "firefly_linux_defconfig";
-
-  src = fetchFromGitLab {
-    owner = "TeeFirefly";
-    repo = "linux-kernel";
-    rev = "firefly_0821_release";
-    sha256 = "1fwj9cm5ysz286znrr3fyrhfn903m84i7py4rv3y3h9avxb3zl1r";
-  };
-  extraMeta.platforms = [ "aarch64-linux" ];
-} // (args.argsOverride or {}))
diff --git a/makefu/1systems/sdcard/source.nix b/makefu/1systems/sdcard/source.nix
deleted file mode 100644
index 6bef8ada9..000000000
--- a/makefu/1systems/sdcard/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  name="iso";
-}