diff options
| -rw-r--r-- | krebs/3modules/mv/default.nix | 1 | ||||
| -rw-r--r-- | krebs/3modules/tv/default.nix | 5 | ||||
| -rw-r--r-- | mv/dummy_secrets/default.nix | 8 | ||||
| -rw-r--r-- | mv/dummy_secrets/ssh.ed25519 | 3 | ||||
| -rw-r--r-- | mv/source.nix | 2 | ||||
| -rw-r--r-- | tv/1systems/mu/config.nix | 17 |
6 files changed, 27 insertions, 9 deletions
diff --git a/krebs/3modules/mv/default.nix b/krebs/3modules/mv/default.nix index 7876ab79e..c8d138a44 100644 --- a/krebs/3modules/mv/default.nix +++ b/krebs/3modules/mv/default.nix @@ -5,6 +5,7 @@ with import <stockholm/lib>; { hosts = mapAttrs (_: setAttr "owner" config.krebs.users.mv) { stro = { + ci = true; cores = 4; nets = { retiolum = { diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index d6e6eae11..79fa27bad 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -79,6 +79,7 @@ with import <stockholm/lib>; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOd/HqZIO9Trn3eycl23GZAz21HQCISaVNfNyaLSQvJ6"; }; ju = { + external = true; nets = { gg23 = { ip4.addr = "10.23.1.144"; @@ -112,6 +113,7 @@ with import <stockholm/lib>; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHM6dL0fQ8Bd0hER0Xa3I2pAWVHdnwOBaAZhbDlLJmUu"; }; kaepsele = { + external = true; nets = { retiolum = { ip4.addr = "10.243.166.2"; @@ -237,6 +239,7 @@ with import <stockholm/lib>; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMIHmwXHV7E9UGuk4voVCADjlLkyygqNw054jvrsPn5t root@nomic"; }; ok = { + external = true; nets = { gg23 = { ip4.addr = "10.23.1.1"; @@ -245,6 +248,7 @@ with import <stockholm/lib>; }; }; schnabeldrucker = { + external = true; nets = { gg23 = { ip4.addr = "10.23.1.21"; @@ -253,6 +257,7 @@ with import <stockholm/lib>; }; }; schnabelscanner = { + external = true; nets = { gg23 = { ip4.addr = "10.23.1.22"; diff --git a/mv/dummy_secrets/default.nix b/mv/dummy_secrets/default.nix new file mode 100644 index 000000000..84a5e1186 --- /dev/null +++ b/mv/dummy_secrets/default.nix @@ -0,0 +1,8 @@ +{ config, ... }: +{ + users.users.root = { + openssh.authorizedKeys.keys = [ + config.krebs.users.mv.pubkey + ]; + }; +} diff --git a/mv/dummy_secrets/ssh.ed25519 b/mv/dummy_secrets/ssh.ed25519 new file mode 100644 index 000000000..a7d2adab4 --- /dev/null +++ b/mv/dummy_secrets/ssh.ed25519 @@ -0,0 +1,3 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +dummy +-----END OPENSSH PRIVATE KEY----- diff --git a/mv/source.nix b/mv/source.nix index 8b1563914..aa2b13fd8 100644 --- a/mv/source.nix +++ b/mv/source.nix @@ -10,7 +10,7 @@ in nixos-config.symlink = "stockholm/mv/1systems/${name}/config.nix"; nixpkgs.git = { # nixos-17.03 - ref = mkDefault "94941cb0455bfc50b1bf63186cfad7136d629f78"; + ref = mkDefault "56da88a298a6f549701a10bb12072804a1ebfbd5"; url = https://github.com/NixOS/nixpkgs; }; secrets.file = getAttr builder { diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index ee0f4f7f5..f3e7b515b 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -52,18 +52,19 @@ with import <stockholm/lib>; networking.networkmanager.enable = true; environment.systemPackages = with pkgs; [ + chromium + firefoxWrapper + gimp + iptables + kdeApplications.l10n.de.qt5 + libreoffice + pidginotr + pidgin-with-plugins + skype slock tinc_pre - iptables vim - gimp xsane - firefoxWrapper - chromium - skype - libreoffice - pidgin-with-plugins - pidginotr #foomatic_filters #gutenprint |