Merge remote-tracking branch 'orange/master'

88 files changed, 0 insertions, 3694 deletions

diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix
deleted file mode 100644
index b9550cb2e..000000000
--- a/makefu/1systems/cake/config.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  primaryInterface = "eth0";
-in {
-  imports = [
-    <stockholm/makefu>
-    ./hardware-config.nix
-    <stockholm/makefu/2configs/home-manager>
-    <stockholm/makefu/2configs/home/3dprint.nix>
-    #./hardware-config.nix
-    { environment.systemPackages = with pkgs;[ rsync screen curl git tmux picocom mosh ];}
-    # <stockholm/makefu/2configs/tools/core.nix>
-    <stockholm/makefu/2configs/binary-cache/nixos.nix>
-    #<stockholm/makefu/2configs/support-nixos.nix>
-    # <stockholm/makefu/2configs/homeautomation/default.nix>
-    # <stockholm/makefu/2configs/homeautomation/google-muell.nix>
-    # <stockholm/makefu/2configs/hw/pseyecam.nix>
-    # configure your hw:
-    # <stockholm/makefu/2configs/save-diskspace.nix>
-
-    # directly use the alsa device instead of attaching to pulse
-
-    <stockholm/makefu/2configs/audio/respeaker.nix>
-    <stockholm/makefu/2configs/home/rhasspy/default.nix>
-    <stockholm/makefu/2configs/home/rhasspy/led-control.nix>
-  ];
-  krebs = {
-    enable = true;
-    tinc.retiolum.enable = true;
-    build.host = config.krebs.hosts.cake;
-  };
-  # ensure disk usage is limited
-  services.journald.extraConfig = "Storage=volatile";
-  networking.firewall.trustedInterfaces = [ primaryInterface ];
-  documentation.info.enable = false;
-  documentation.man.enable = false;
-  documentation.nixos.enable = false;
-}
diff --git a/makefu/1systems/cake/hardware-config.nix b/makefu/1systems/cake/hardware-config.nix
deleted file mode 100644
index 932aa1929..000000000
--- a/makefu/1systems/cake/hardware-config.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  environment.systemPackages = [ pkgs.libraspberrypi ];
-  imports = [ <nixos-hardware/raspberry-pi/4> ];
-  boot.kernelPackages = pkgs.linuxPackages_rpi4;
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-label/NIXOS_SD";
-      fsType = "ext4";
-      options = [ "noatime" ];
-    };
-  };
-  hardware.raspberry-pi."4".fkms-3d.enable = true; 
-  hardware.raspberry-pi."4".audio.enable = true;  
-}
diff --git a/makefu/1systems/cake/source.nix b/makefu/1systems/cake/source.nix
deleted file mode 100644
index 8fc2fff2d..000000000
--- a/makefu/1systems/cake/source.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  name="cake";
-  full = true;
-  home-manager = true;
-  hw = true;
-}
diff --git a/makefu/1systems/crapi/README b/makefu/1systems/crapi/README
deleted file mode 100644
index 9278c764a..000000000
--- a/makefu/1systems/crapi/README
+++ /dev/null
@@ -1,4 +0,0 @@
-1. flash arm6 image from https://www.cs.helsinki.fi/u/tmtynkky/nixos-arm/installer/ to sdcard
-2. passwd; systemctl start sshd; mkdir /var/src ; touch /var/src/.populate
-3. "environment.systemPackages = [ pkgs.rsync pkgs.git ];" in /etc/nixos/configuration.nix
-5. nixos-rebuild switch --fast --option binary-caches http://nixos-arm.dezgeg.me/channel --option binary-cache-public-keys nixos-arm.dezgeg.me-1:xBaUKS3n17BZPKeyxL4JfbTqECsT+ysbDJz29kLFRW0=%
diff --git a/makefu/1systems/crapi/config.nix b/makefu/1systems/crapi/config.nix
deleted file mode 100644
index e7c6c3666..000000000
--- a/makefu/1systems/crapi/config.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  imports = [
-    <stockholm/makefu>
-    ./hardware-config.nix
-    <stockholm/makefu/2configs>
-    <stockholm/makefu/2configs/tinc/retiolum.nix>
-    <stockholm/makefu/2configs/save-diskspace.nix>
-
-  ];
-  krebs.build.host = config.krebs.hosts.crapi;
-
-  services.openssh.enable = true;
-
-}
diff --git a/makefu/1systems/crapi/hardware-config.nix b/makefu/1systems/crapi/hardware-config.nix
deleted file mode 100644
index bba31dabd..000000000
--- a/makefu/1systems/crapi/hardware-config.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  #raspi1
-  boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=tty0" "console=ttyS1,115200n8" ];
-
-  boot.loader.grub.enable = false;
-  boot.loader.raspberryPi.enable = true;
-  boot.loader.raspberryPi.version = 1;
-  boot.loader.raspberryPi.uboot.enable = true;
-  boot.loader.raspberryPi.uboot.configurationLimit = 1;
-  boot.loader.generationsDir.enable = lib.mkDefault false;
-  hardware.enableRedistributableFirmware = true;
-  boot.cleanTmpDir = true;
-  environment.systemPackages = [ pkgs.raspberrypi-tools ];
-  boot.kernelPackages = pkgs.linuxPackages_rpi;
-
-  nix.binaryCaches = [ "http://nixos-arm.dezgeg.me/channel" ];
-  nix.binaryCachePublicKeys = [ "nixos-arm.dezgeg.me-1:xBaUKS3n17BZPKeyxL4JfbTqECsT+ysbDJz29kLFRW0=%" ];
-
-  fileSystems = {
-    "/boot" = {
-      device = "/dev/disk/by-label/NIXOS_BOOT";
-      fsType = "vfat";
-    };
-    "/" = {
-      device = "/dev/disk/by-label/NIXOS_SD";
-      fsType = "ext4";
-    };
-  };
-
-  system.activationScripts.create-swap = ''
-    if [ ! -e /swapfile ]; then
-      fallocate -l 2G /swapfile
-      mkswap /swapfile
-      chmod 600 /swapfile
-    fi
-  '';
-  swapDevices = [ { device = "/swapfile"; size = 4096; } ];
-}
diff --git a/makefu/1systems/crapi/source.nix b/makefu/1systems/crapi/source.nix
deleted file mode 100644
index 4a4359ee6..000000000
--- a/makefu/1systems/crapi/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  arm6 = true;
-}
diff --git a/makefu/1systems/darth/config.nix b/makefu/1systems/darth/config.nix
deleted file mode 100644
index 4e71d1426..000000000
--- a/makefu/1systems/darth/config.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with import <stockholm/lib>;
-let
-  # all the good stuff resides in /data
-
-  byid = dev: "/dev/disk/by-id/" + dev;
-  rootDisk = byid "ata-INTEL_SSDSC2BW480H6_CVTR53120385480EGN";
-  bootPart = rootDisk + "-part1";
-  rootPart = rootDisk + "-part2";
-
-  allDisks = [ rootDisk ]; # auxDisk
-in {
-  imports = [
-      <stockholm/makefu>
-      <stockholm/makefu/2configs/fs/sda-crypto-root.nix>
-      <stockholm/makefu/2configs/sshd-totp.nix>
-      <stockholm/makefu/2configs/zsh-user.nix>
-      <stockholm/makefu/2configs/smart-monitor.nix>
-      <stockholm/makefu/2configs/exim-retiolum.nix>
-      # <stockholm/makefu/2configs/virtualisation/libvirt.nix>
-
-      <stockholm/makefu/2configs/tinc/retiolum.nix>
-      <stockholm/makefu/2configs/tools/core.nix>
-      <stockholm/makefu/2configs/stats/client.nix>
-      # <stockholm/makefu/2configs/nsupdate-data.nix>
-
-      <stockholm/makefu/2configs/share/anon-ftp.nix>
-
-      # lan party
-      <stockholm/makefu/2configs/lanparty/lancache.nix>
-      <stockholm/makefu/2configs/lanparty/lancache-dns.nix>
-      <stockholm/makefu/2configs/lanparty/samba.nix>
-      <stockholm/makefu/2configs/lanparty/mumble-server.nix>
-      <stockholm/makefu/2configs/virtualisation/libvirt.nix>
-  ];
-
-
-
-  #networking.firewall.enable = false;
-  makefu.server.primary-itf = "enp0s25";
-  # krebs.hidden-ssh.enable = true;
-  boot.kernelModules = [ "coretemp" "f71882fg" ];
-  hardware.enableRedistributableFirmware = true;
-  nixpkgs.config.allowUnfree = true;
-  networking = {
-    wireless.enable = true;
-    firewall = {
-      allowPing = true;
-      logRefusedConnections = false;
-      # trustedInterfaces = [ "eno1" ];
-      allowedUDPPorts = [ 80 655 1655 67 ];
-      allowedTCPPorts = [ 80 655 1655 ];
-    };
-    # fallback connection to the internal virtual network
-    # interfaces.virbr3.ip4 =  [{
-    #   address = "10.8.8.2";
-    #   prefixLength = 24;
-    # }];
-  };
-
-  # TODO smartd omo darth gum all-in-one
-  services.smartd.devices = builtins.map (x: { device = x; }) allDisks;
-
-  boot.loader.grub.device = rootDisk;
-  boot.initrd.luks.devices = [
-    { name = "luksroot";
-      device = rootPart;
-      allowDiscards = true;
-      keyFileSize = 4096;
-      keyFile = "/dev/sdb";
-    }
-  ];
-
-  krebs.build.host = config.krebs.hosts.darth;
-}
diff --git a/makefu/1systems/darth/source.nix b/makefu/1systems/darth/source.nix
deleted file mode 100644
index a8d7368ab..000000000
--- a/makefu/1systems/darth/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  name="darth";
-}
diff --git a/makefu/1systems/drop/config.nix b/makefu/1systems/drop/config.nix
deleted file mode 100644
index 2757db8cc..000000000
--- a/makefu/1systems/drop/config.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ config, pkgs, ... }:
-let
-  external-ip = "45.55.145.62";
-  default-gw = "45.55.128.1";
-  prefixLength = 18;
-in {
-  imports = [
-      <stockholm/makefu>
-      <stockholm/makefu/2configs/hw/CAC.nix>
-      <stockholm/makefu/2configs/save-diskspace.nix>
-      <stockholm/makefu/2configs/torrent.nix>
-  ];
-  krebs = {
-    enable = true;
-    tinc.retiolum.enable = true;
-    build.host = config.krebs.hosts.drop;
-  };
-
-  boot.loader.grub.device = "/dev/vda";
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "virtio_blk" "virtio_net" "virtio_scsi" ];
-  fileSystems."/" = {
-    device = "/dev/vda1";
-    fsType = "ext4";
-  };
-
-  networking = {
-    firewall = {
-      allowPing = true;
-      logRefusedConnections = false;
-      allowedTCPPorts = [ ];
-      allowedUDPPorts = [ 655 ];
-    };
-    interfaces.enp0s3.ipv4.addresses = [{
-      address = external-ip;
-      inherit prefixLength;
-    }];
-    defaultGateway = default-gw;
-    nameservers = [ "8.8.8.8" ];
-  };
-}
diff --git a/makefu/1systems/drop/source.nix b/makefu/1systems/drop/source.nix
deleted file mode 100644
index a6bc834b0..000000000
--- a/makefu/1systems/drop/source.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  name="drop";
-  torrent = true;
-}
diff --git a/makefu/1systems/fileleech/config.nix b/makefu/1systems/fileleech/config.nix
deleted file mode 100644
index 7e9dea9ec..000000000
--- a/makefu/1systems/fileleech/config.nix
+++ /dev/null
@@ -1,174 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  toMapper = id: "/media/crypt${builtins.toString id}";
-  byid = dev: "/dev/disk/by-id/" + dev;
-  keyFile = byid "usb-Intuix_DiskOnKey_09A07360336198F8-0:0";
-  rootDisk = byid "ata-INTEL_SSDSA2M080G2GC_CVPO003402PB080BGN";
-  rootPartition = rootDisk + "-part3";
-
-  dataDisks =  let
-    idpart = dev: byid  dev + "-part1";
-  in [
-    { name = "crypt0"; device = idpart "scsi-1ATA_HUA722020ALA330_B9GDLJEF";}
-    { name = "crypt1"; device = idpart "scsi-1ATA_HUA722020ALA330_B9GGWG8F";}
-    { name = "crypt2"; device = idpart "scsi-1ATA_HUA722020ALA330_B9GH5NAF";}
-    { name = "crypt3"; device = idpart "scsi-1ATA_HUA722020ALA330_B9GJWGDF";}
-    { name = "crypt4"; device = idpart "scsi-