diff --git a/pr-28.patch b/pr-28.patch index 6f8b440..0c58027 100644 --- a/pr-28.patch +++ b/pr-28.patch @@ -1,5 +1,5 @@ diff --git a/base.nix b/base.nix -index 7eaee32..c0a88c0 100644 +index 7eaee32..5e5d650 100644 --- a/base.nix +++ b/base.nix @@ -27,6 +27,11 @@ with lib; @@ -14,15 +14,21 @@ index 7eaee32..c0a88c0 100644 not-os.simpleStaticIp = mkOption { type = types.bool; default = false; -@@ -93,6 +98,8 @@ with lib; +@@ -93,8 +98,13 @@ with lib; build-cores = 4 EOF ''; + "ssl/certs/ca-certificates.crt".source = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; + "ssl/certs/ca-bundle.crt".source = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; bashrc.text = "export PATH=/run/current-system/sw/bin"; - profile.text = "export PATH=/run/current-system/sw/bin"; +- profile.text = "export PATH=/run/current-system/sw/bin"; ++ profile.text = '' ++ export PATH=/run/current-system/sw/bin ++ export EDITOR=nano ++ ''; "resolv.conf".text = "nameserver 10.0.2.3"; + passwd.text = '' + root:x:0:0:System administrator:/root:/run/current-system/sw/bin/bash diff --git a/runit.nix b/runit.nix index d7b0bf3..70353a1 100644 --- a/runit.nix @@ -129,7 +135,7 @@ index c61f9d6..fbdf0fd 100644 }; } diff --git a/zynq_image.nix b/zynq_image.nix -index 3fa23ab..9ea1df3 100644 +index 3fa23ab..727e3ef 100644 --- a/zynq_image.nix +++ b/zynq_image.nix @@ -1,66 +1,96 @@ @@ -235,7 +241,7 @@ index 3fa23ab..9ea1df3 100644 - environment.etc."service/getty/run".source = pkgs.writeShellScript "getty" '' - agetty ttyPS0 115200 + environment = { -+ systemPackages = with pkgs; [ inetutils wget ]; ++ systemPackages = with pkgs; [ inetutils wget nano ]; + etc = { + "service/getty/run".source = pkgs.writeShellScript "getty" '' + hostname ${config.networking.hostName}