From 3189052d4deb516d49f721d5cf496818034ef9b0 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 25 Jul 2019 22:13:14 +0200 Subject: krebs: cleanup default.nix --- krebs/1systems/wolf/config.nix | 14 -------------- krebs/2configs/default.nix | 14 +------------- 2 files changed, 1 insertion(+), 27 deletions(-) (limited to 'krebs') diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index f3db30fc4..d4a52e71d 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -67,20 +67,10 @@ in # use your own binary cache, fallback use cache.nixos.org (which is used by # apt-cacher-ng in first place) - # local discovery in shackspace nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; krebs.tinc.retiolum.extraConfig = "TCPOnly = yes"; - nix = { - # use the up to date prism cache - binaryCaches = [ - "https://cache.nixos.org/" - ]; - binaryCachePublicKeys = [ - "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" - ]; - }; networking = { firewall.enable = false; @@ -125,10 +115,6 @@ in swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; - # fallout of ipv6calypse - networking.extraHosts = '' - hass.shack 10.42.2.191 - ''; users.extraUsers.root.openssh.authorizedKeys.keys = [ config.krebs.users."0x4a6f".pubkey diff --git a/krebs/2configs/default.nix b/krebs/2configs/default.nix index 8771c0e1d..d7d6fbf37 100644 --- a/krebs/2configs/default.nix +++ b/krebs/2configs/default.nix @@ -14,18 +14,13 @@ with import ; ]; krebs.announce-activation.enable = true; krebs.enable = true; - krebs.tinc.retiolum.enable = true; + krebs.tinc.retiolum.enable = mkDefault true; krebs.build.user = mkDefault config.krebs.users.krebs; networking.hostName = config.krebs.build.host.name; nix.maxJobs = 1; - nix.trustedBinaryCaches = [ - "https://cache.nixos.org" - "http://cache.nixos.org" - "http://hydra.nixos.org" - ]; nix.useSandbox = true; environment.systemPackages = with pkgs; [ @@ -39,8 +34,6 @@ with import ; defaultLocale = lib.mkForce "C"; }; - - programs.ssh.startAgent = false; services.openssh = { @@ -55,18 +48,13 @@ with import ; users.mutableUsers = false; users.extraUsers.root.openssh.authorizedKeys.keys = [ - # TODO config.krebs.users.jeschli-brauerei.pubkey config.krebs.users.lass.pubkey config.krebs.users.lass-mors.pubkey config.krebs.users.makefu.pubkey - # TODO HARDER: - config.krebs.users.makefu-omo.pubkey config.krebs.users.tv.pubkey ]; - # The NixOS release to be compatible with for stateful data such as databases. system.stateVersion = "17.03"; - } -- cgit v1.2.3