diff options
| author | makefu <github@syntax-fehler.de> | 2020-04-22 08:24:59 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2020-04-22 08:24:59 +0200 |
| commit | fa8c519a538ce6a680e685422c43f86a2c3e567d (patch) | |
| tree | 9575815b77b55d90871fccefdefb2ee9d338b303 | |
| parent | e7caceb6df27615f33083ae9430b61ffebcff5a7 (diff) | |
| parent | d23fa4802edf7835c68de1fcce08d7b2643c9d48 (diff) | |
Merge remote-tracking branch 'lass/20.03' into 20.03
| -rw-r--r-- | jeschli/2configs/haskell.nix | 1 | ||||
| -rw-r--r-- | lass/1systems/prism/config.nix | 20 |
2 files changed, 0 insertions, 21 deletions
diff --git a/jeschli/2configs/haskell.nix b/jeschli/2configs/haskell.nix index 2e00d0673..46ae24fb0 100644 --- a/jeschli/2configs/haskell.nix +++ b/jeschli/2configs/haskell.nix @@ -13,7 +13,6 @@ in haskellPackages.hlint haskellPackages.hoogle haskellPackages.stack - haskellPackages.stylish-haskell (all-hies.selection { selector = p: {inherit (p) ghc864; }; }) ]; } diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 004183102..f1f14e791 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -116,26 +116,6 @@ with import <stockholm/lib>; 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/ts3.nix> <stockholm/lass/2configs/privoxy-retiolum.nix> |