Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'lass/20.03' into 20.03

Browse Source
This commit is contained in:
makefu 2020-04-22 08:24:59 +02:00
commit fa8c519a53
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jeschli/2configs/haskell.nix
View File

@ -13,7 +13,6 @@ in
haskellPackages.hlint haskellPackages.hlint
haskellPackages.hoogle haskellPackages.hoogle
haskellPackages.stack haskellPackages.stack
haskellPackages.stylish-haskell
(all-hies.selection { selector = p: {inherit (p) ghc864; }; }) (all-hies.selection { selector = p: {inherit (p) ghc864; }; })
]; ];
} }

20
lass/1systems/prism/config.nix
View File

@ -116,26 +116,6 @@ with import <stockholm/lib>;
localAddress = "10.233.2.2"; localAddress = "10.233.2.2";
}; };
} }
{
#onondaga
systemd.services."container@onondaga".reloadIfChanged = mkForce false;
containers.onondaga = {
config = { ... }: {
imports = [ <stockholm/lass/2configs/rebuild-on-boot.nix> ];
environment.systemPackages = [ pkgs.git ];
services.openssh.enable = true;
users.users.root.openssh.authorizedKeys.keys = [
config.krebs.users.lass.pubkey
config.krebs.users.nin.pubkey
];
};
autoStart = true;
enableTun = true;
privateNetwork = true;
hostAddress = "10.233.2.5";
localAddress = "10.233.2.6";
};
}
<stockholm/lass/2configs/exim-smarthost.nix> <stockholm/lass/2configs/exim-smarthost.nix>
<stockholm/lass/2configs/ts3.nix> <stockholm/lass/2configs/ts3.nix>
<stockholm/lass/2configs/privoxy-retiolum.nix> <stockholm/lass/2configs/privoxy-retiolum.nix>