Merge remote-tracking branch 'ni/master'

This commit is contained in:
lassulus 2017-09-01 21:52:48 +02:00
commit 6bb5eeeb05
6 changed files with 27 additions and 9 deletions

View File

@ -5,6 +5,7 @@ with import <stockholm/lib>;
{ {
hosts = mapAttrs (_: setAttr "owner" config.krebs.users.mv) { hosts = mapAttrs (_: setAttr "owner" config.krebs.users.mv) {
stro = { stro = {
ci = true;
cores = 4; cores = 4;
nets = { nets = {
retiolum = { retiolum = {

View File

@ -79,6 +79,7 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOd/HqZIO9Trn3eycl23GZAz21HQCISaVNfNyaLSQvJ6"; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOd/HqZIO9Trn3eycl23GZAz21HQCISaVNfNyaLSQvJ6";
}; };
ju = { ju = {
external = true;
nets = { nets = {
gg23 = { gg23 = {
ip4.addr = "10.23.1.144"; ip4.addr = "10.23.1.144";
@ -112,6 +113,7 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHM6dL0fQ8Bd0hER0Xa3I2pAWVHdnwOBaAZhbDlLJmUu"; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHM6dL0fQ8Bd0hER0Xa3I2pAWVHdnwOBaAZhbDlLJmUu";
}; };
kaepsele = { kaepsele = {
external = true;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.166.2"; ip4.addr = "10.243.166.2";
@ -237,6 +239,7 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMIHmwXHV7E9UGuk4voVCADjlLkyygqNw054jvrsPn5t root@nomic"; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMIHmwXHV7E9UGuk4voVCADjlLkyygqNw054jvrsPn5t root@nomic";
}; };
ok = { ok = {
external = true;
nets = { nets = {
gg23 = { gg23 = {
ip4.addr = "10.23.1.1"; ip4.addr = "10.23.1.1";
@ -245,6 +248,7 @@ with import <stockholm/lib>;
}; };
}; };
schnabeldrucker = { schnabeldrucker = {
external = true;
nets = { nets = {
gg23 = { gg23 = {
ip4.addr = "10.23.1.21"; ip4.addr = "10.23.1.21";
@ -253,6 +257,7 @@ with import <stockholm/lib>;
}; };
}; };
schnabelscanner = { schnabelscanner = {
external = true;
nets = { nets = {
gg23 = { gg23 = {
ip4.addr = "10.23.1.22"; ip4.addr = "10.23.1.22";

View File

@ -0,0 +1,8 @@
{ config, ... }:
{
users.users.root = {
openssh.authorizedKeys.keys = [
config.krebs.users.mv.pubkey
];
};
}

View File

@ -0,0 +1,3 @@
-----BEGIN OPENSSH PRIVATE KEY-----
dummy
-----END OPENSSH PRIVATE KEY-----

View File

@ -10,7 +10,7 @@ in
nixos-config.symlink = "stockholm/mv/1systems/${name}/config.nix"; nixos-config.symlink = "stockholm/mv/1systems/${name}/config.nix";
nixpkgs.git = { nixpkgs.git = {
# nixos-17.03 # nixos-17.03
ref = mkDefault "94941cb0455bfc50b1bf63186cfad7136d629f78"; ref = mkDefault "56da88a298a6f549701a10bb12072804a1ebfbd5";
url = https://github.com/NixOS/nixpkgs; url = https://github.com/NixOS/nixpkgs;
}; };
secrets.file = getAttr builder { secrets.file = getAttr builder {

View File

@ -52,18 +52,19 @@ with import <stockholm/lib>;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
chromium
firefoxWrapper
gimp
iptables
kdeApplications.l10n.de.qt5
libreoffice
pidginotr
pidgin-with-plugins
skype
slock slock
tinc_pre tinc_pre
iptables
vim vim
gimp
xsane xsane
firefoxWrapper
chromium
skype
libreoffice
pidgin-with-plugins
pidginotr
#foomatic_filters #foomatic_filters
#gutenprint #gutenprint