diff options
Diffstat (limited to 'makefu/1systems')
-rw-r--r-- | makefu/1systems/cake/config.nix | 21 | ||||
-rw-r--r-- | makefu/1systems/cake/source.nix | 3 | ||||
-rw-r--r-- | makefu/1systems/gum/config.nix | 4 | ||||
-rw-r--r-- | makefu/1systems/x/config.nix | 2 |
4 files changed, 26 insertions, 4 deletions
diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix index 826af24e7..e8438e50d 100644 --- a/makefu/1systems/cake/config.nix +++ b/makefu/1systems/cake/config.nix @@ -1,7 +1,8 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: { imports = [ <stockholm/makefu> + <stockholm/makefu/2configs/tools/core.nix> # configure your hw: # <stockholm/makefu/2configs/save-diskspace.nix> ]; @@ -18,6 +19,24 @@ programs.info.enable = false; programs.man.enable = false; services.nixosManual.enable = false; + boot.tmpOnTmpfs = lib.mkForce false; + + hardware.enableRedistributableFirmware = true; + hardware.firmware = [ + (pkgs.stdenv.mkDerivation { + name = "broadcom-rpi3-rest"; + src = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/54bab3d/brcm80211/brcm/brcmfmac43430-sdio.txt"; + sha256 = "19bmdd7w0xzybfassn7x4rb30l70vynnw3c80nlapna2k57xwbw7"; + }; + phases = [ "installPhase" ]; + installPhase = '' + mkdir -p $out/lib/firmware/brcm + cp $src $out/lib/firmware/brcm/brcmfmac43430-sdio.txt + ''; + }) + ]; + networking.wireless.enable = true; # File systems configuration for using the installer's partition layout fileSystems = { diff --git a/makefu/1systems/cake/source.nix b/makefu/1systems/cake/source.nix index 797417a1d..cd97a7c62 100644 --- a/makefu/1systems/cake/source.nix +++ b/makefu/1systems/cake/source.nix @@ -1,3 +1,4 @@ import <stockholm/makefu/source.nix> { name="cake"; -}
\ No newline at end of file + full = true; +} diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index e1357ff01..e769b1e22 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -81,7 +81,9 @@ in { ]; makefu.dl-dir = "/var/download"; - + services.openssh.hostKeys = [ + { bits = 4096; path = <secrets/ssh_host_rsa_key>; type = "rsa"; } + { path = <secrets/ssh_host_ed25519_key>; type = "ed25519"; } ]; ###### stable services.nginx.virtualHosts.cgit.serverAliases = [ "cgit.euer.krebsco.de" ]; krebs.build.host = config.krebs.hosts.gum; diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 443f912d8..f7db75564 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -57,7 +57,7 @@ with import <stockholm/lib>; <stockholm/makefu/2configs/tor.nix> <stockholm/makefu/2configs/vpn/vpngate.nix> # <stockholm/makefu/2configs/buildbot-standalone.nix> - <stockholm/makefu/2configs/remote-build/master.nix> + # <stockholm/makefu/2configs/remote-build/master.nix> # Hardware <stockholm/makefu/2configs/hw/tp-x230.nix> |