summaryrefslogtreecommitdiffstats
path: root/tv/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-02-15 17:07:48 +0100
committermakefu <github@syntax-fehler.de>2016-02-15 17:07:48 +0100
commit3ceff0ec29a36119ea83f02c8943752d91b250e9 (patch)
tree7b179bc972ea01c9305ea64697e14237346885d8 /tv/1systems
parent9a4071b66ff45e99a30e9a314eb43c6efc7e921f (diff)
parent372f2d77f301719e396a6f943657325e2f8b2cf4 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/1systems')
-rw-r--r--tv/1systems/cd.nix3
-rw-r--r--tv/1systems/mkdir.nix3
-rw-r--r--tv/1systems/nomic.nix3
-rw-r--r--tv/1systems/rmdir.nix3
-rw-r--r--tv/1systems/wu.nix6
-rw-r--r--tv/1systems/xu-qemu0.nix28
-rw-r--r--tv/1systems/xu.nix8
7 files changed, 42 insertions, 12 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index b96548d61..9b6382607 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -1,11 +1,12 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
{
krebs.build.host = config.krebs.hosts.cd;
imports = [
+ ../.
../2configs/hw/CAC-Developer-2.nix
../2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/exim-smarthost.nix
diff --git a/tv/1systems/mkdir.nix b/tv/1systems/mkdir.nix
index 2010dcd57..58a8fdcb2 100644
--- a/tv/1systems/mkdir.nix
+++ b/tv/1systems/mkdir.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
let
# TODO merge with lass
@@ -19,6 +19,7 @@ in
krebs.build.host = config.krebs.hosts.mkdir;
imports = [
+ ../.
../2configs/hw/CAC-Developer-1.nix
../2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/exim-smarthost.nix
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 37ef204c7..2c9775da7 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -1,11 +1,12 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
{
krebs.build.host = config.krebs.hosts.nomic;
imports = [
+ ../.
../2configs/hw/AO753.nix
../2configs/exim-retiolum.nix
../2configs/git.nix
diff --git a/tv/1systems/rmdir.nix b/tv/1systems/rmdir.nix
index 4005b5e6f..c54caa649 100644
--- a/tv/1systems/rmdir.nix
+++ b/tv/1systems/rmdir.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
let
# TODO merge with lass
@@ -19,6 +19,7 @@ in
krebs.build.host = config.krebs.hosts.rmdir;
imports = [
+ ../.
../2configs/hw/CAC-Developer-1.nix
../2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/exim-smarthost.nix
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 4ed13a0ea..6154e4df9 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -1,11 +1,12 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
{
krebs.build.host = config.krebs.hosts.wu;
imports = [
+ ../.
../2configs/hw/w110er.nix
../2configs/exim-retiolum.nix
../2configs/git.nix
@@ -191,8 +192,6 @@ with lib;
"d /tmp 1777 root root - -" # does this work with mounted /tmp?
];
- virtualisation.libvirtd.enable = true;
-
services.udev.extraRules = ''
SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0"
SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:1b:ae:6c", NAME="wl0"
@@ -211,5 +210,4 @@ with lib;
services.tor.client.enable = true;
services.tor.enable = true;
services.virtualboxHost.enable = true;
-
}
diff --git a/tv/1systems/xu-qemu0.nix b/tv/1systems/xu-qemu0.nix
new file mode 100644
index 000000000..8945c1907
--- /dev/null
+++ b/tv/1systems/xu-qemu0.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+{
+ krebs.hosts.xu-qemu0 = {
+ cores = 1;
+ ssh.privkey.path = <secrets/ssh.id_ed25519>;
+ # cannot define ssh.pubkey without at least one addr or alias
+ #ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFe51rD0ZqlMXNi/YpapnRzvdzCjI0icmxfCyBLSKG04";
+ };
+ krebs.build.host = config.krebs.hosts.xu-qemu0;
+
+ imports = [
+ ../.
+ <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
+ ];
+
+ boot.loader.grub.device = "/dev/sda";
+
+ fileSystems = {
+ "/boot" = {
+ device = "/dev/sda1";
+ };
+ "/" = {
+ device = "/dev/sda2";
+ fsType = "btrfs";
+ };
+ };
+}
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 8c4af2bd3..5ec1fe52b 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -1,11 +1,12 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
{
krebs.build.host = config.krebs.hosts.xu;
imports = [
+ ../.
../2configs/hw/x220.nix
../2configs/exim-retiolum.nix
../2configs/git.nix
@@ -14,6 +15,7 @@ with lib;
../2configs/pulse.nix
../2configs/retiolum.nix
../2configs/xserver
+ ../2configs/xu-qemu0.nix
{
environment.systemPackages = with pkgs; [
@@ -43,7 +45,7 @@ with lib;
# tv
bc
bind # dig
- #cac
+ cac-api
dic
file
gnupg21
@@ -189,8 +191,6 @@ with lib;
"d /tmp 1777 root root - -" # does this work with mounted /tmp?
];
- #virtualisation.libvirtd.enable = true;
-
#services.bitlbee.enable = true;
#services.tor.client.enable = true;
#services.tor.enable = true;