Merge remote-tracking branch 'prism/makefu'

3 files changed, 63 insertions, 1 deletions

diff --git a/krebs/1systems/onebutton/config.nix b/krebs/1systems/onebutton/config.nix
index dca00a206..b87aef5a3 100644
--- a/krebs/1systems/onebutton/config.nix
+++ b/krebs/1systems/onebutton/config.nix
@@ -16,6 +16,36 @@
       services.nixosManual.enable = false;
       services.journald.extraConfig = "SystemMaxUse=50M";
     }
+    {
+      systemd.services.mpc-booter = let
+        mpc = "${pkgs.mpc_cli}/bin/mpc -h mpd.shack -p 6600";
+        url = "http://lassul.us:8000/radio.ogg";
+        say = pkgs.writeDash "say" ''
+          tmpfile=$(${pkgs.coreutils}/bin/mktemp)
+          echo "$@" > $tmpfile
+          ${pkgs.curl}/bin/curl -i -H "content-type: text/plain" -X POST -d "@$tmpfile" gobbelz.shack/say/
+          rm "$tmpfile"
+        '';
+      in {
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network-online.target" ];
+        serviceConfig = {
+          RemainAfterExit = "yes";
+          Type = "oneshot";
+          ExecStart = pkgs.writeDash "mpc-boot" ''
+            until ${mpc} stats;do
+              echo "waiting for mpd.shack to appear"
+              sleep 1
+            done
+            ${say} "Willkommen im Shack wertes Mitglied"
+
+            ${say} "Lassulus Super Radio wurde gestartet"
+            ${mpc} add ${url}
+            ${mpc} play
+          '';
+        };
+      };
+    }
   ];
   krebs.build.host = config.krebs.hosts.onebutton;
   # NixOS wants to enable GRUB by default
diff --git a/krebs/1systems/onebutton/source.nix b/krebs/1systems/onebutton/source.nix
index 8f25881c9..6842bfaab 100644
--- a/krebs/1systems/onebutton/source.nix
+++ b/krebs/1systems/onebutton/source.nix
@@ -4,7 +4,7 @@ let
   nixpkgs = pkgs.fetchFromGitHub {
     owner = "nixos";
     repo = "nixpkgs-channels";
-    rev = "6c064e6b"; # only binary cache for unstable arm6
+    rev = "nixos-unstable"; # only binary cache for unstable arm6
     sha256 = "1rqzh475xn43phagrr30lb0fd292c1s8as53irihsnd5wcksnbyd";
   };
 in import <stockholm/krebs/source.nix> {
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index d7a750c6e..c5404f96d 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -520,6 +520,38 @@ with import <stockholm/lib>;
       ssh.privkey.path = <secrets/ssh.id_ed25519>;
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN5ZmJSypW3LXIJ67DdbxMxCfLtORFkl5jEuD131S5Tr";
     };
+    nextgum = rec {
+      ci = true;
+      cores = 8;
+      nets = rec {
+        internet = {
+          ip4.addr = "144.76.26.247";
+          ip6.addr = "2a01:4f8:191:12f6::2";
+          aliases = [
+            "nextgum.i"
+          ];
+        };
+        retiolum = {
+          via = internet;
+          ip4.addr = "10.243.0.213";
+          ip6.addr = "42:f9f0:0000:0000:0000:0000:0000:70d3";
+          aliases = [
+            "nextgum.r"
+          ];
+          tinc.pubkey = ''
+            -----BEGIN RSA PUBLIC KEY-----
+            MIIBCgKCAQEAucCebFmS96WorD+Br4UQudmAhMlLpacErjwA/u2argBTT2nGHTR8
+            aN4e0xf3IYLA+iogLIW/JuQfKLe8evEK21iZ3jleW8N7mbCulhasi/0lqWlirrpO
+            npJAiSNF1m7ijoylkEKxtmehze+8ojprUT2hx1ImMlHMWGxvs+TmBbZBMgxAGMJh
+            6cMMDJQi+4d9XrJQ3+XUVK3MkviLA91oIAXsLdFptL6b12siUaz4StQXDJUHemBF
+            3ZwlO+W2Es69ifEhmV6NaDDRcSRdChGbHTz1OU8wYaFNaxWla/iprQQ+jEUldpcN
+            VC18QGYRUAgZ0PCIpKurjWNehJFB3zXt+wIDAQAB
+            -----END RSA PUBLIC KEY-----
+          '';
+        };
+      };
+      ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcxWFEPzke/Sdd9qNX6rSJgXal8NmINYajpFCxXfYdj root@gum";
+    };
 
     gum = rec {
       ci = true;