diff options
author | makefu <github@syntax-fehler.de> | 2016-12-24 15:39:37 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2016-12-24 15:39:37 +0100 |
commit | 78c50fe49599b5c3dd147ebd23253fa2abe53998 (patch) | |
tree | 6d609ffc1c59ed6bdb35ef354c5b96de7858e778 /tv/1systems | |
parent | d385e3c6968d9317b7d8adea3671c79258a24cec (diff) | |
parent | bece7d9da29adde2c79e49c40d975dc46eed4c1e (diff) |
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'tv/1systems')
-rw-r--r-- | tv/1systems/xu-qemu0.nix | 28 | ||||
-rw-r--r-- | tv/1systems/xu.nix | 1 |
2 files changed, 0 insertions, 29 deletions
diff --git a/tv/1systems/xu-qemu0.nix b/tv/1systems/xu-qemu0.nix deleted file mode 100644 index 8945c190..00000000 --- a/tv/1systems/xu-qemu0.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ 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 b6fe6dc5..974d820d 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -17,7 +17,6 @@ with import <stockholm/lib>; ../2configs/retiolum.nix ../2configs/binary-cache ../2configs/xserver - ../2configs/xu-qemu0.nix { environment.systemPackages = with pkgs; [ |