From 890e44ebcc11c48f7347aa60748a84c48261aa5e Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Thu, 12 Nov 2020 17:13:39 -0800
Subject: Get Biz.Dev setup again

Also correctly renamed the files (didn't work the first time thanks to
the macOS filesystem) and moved the default build.os settings to a
OsBase.nix file to be used via imports.
---
 Biz/Bild/Rules.nix    | 24 +-----------------------
 Biz/Bild/Sources.json |  8 ++++----
 2 files changed, 5 insertions(+), 27 deletions(-)

(limited to 'Biz/Bild')

diff --git a/Biz/Bild/Rules.nix b/Biz/Bild/Rules.nix
index 9fea5df..e6a6979 100644
--- a/Biz/Bild/Rules.nix
+++ b/Biz/Bild/Rules.nix
@@ -128,27 +128,5 @@ in {
     shellHook = ". ${./ShellHook.sh}";
   };
 
-  os = cfg: (nixos (args: lib.attrsets.recursiveUpdate cfg {
-    boot.cleanTmpDir = true;
-    networking.firewall.allowPing = true;
-    nix.binaryCaches = [ "https://cache.nixos.org" ];
-    nix.gc.automatic = true;
-    nix.gc.dates = "Sunday 02:15";
-    nix.optimise.automatic = true;
-    nix.optimise.dates = [ "Sunday 02:30" ];
-    nixpkgs.overlays = overlays;
-    programs.mosh.enable = true;
-    programs.mosh.withUtempter = true;
-    security.acme.email = "ben@bsima.me";
-    security.acme.acceptTerms = true;
-    security.sudo.wheelNeedsPassword = false;
-    services.clamav.daemon.enable = true; # security
-    services.clamav.updater.enable = true; # security
-    services.fail2ban.enable = true; # security
-    services.openssh.enable = true;
-    services.openssh.openFirewall = true;
-    services.openssh.forwardX11 = true;
-    services.openssh.passwordAuthentication = false;
-    system.autoUpgrade.enable = false; # 'true' breaks our nixpkgs pin
-  })).toplevel;
+  os = cfg: (nixos (args: cfg)).toplevel;
 }
diff --git a/Biz/Bild/Sources.json b/Biz/Bild/Sources.json
index d2565a7..da5e255 100644
--- a/Biz/Bild/Sources.json
+++ b/Biz/Bild/Sources.json
@@ -51,15 +51,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixos-19.09",
+        "branch": "nixos-20.09",
         "description": "Nix Packages collection",
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b0c285807d6a9f1b7562ec417c24fa1a30ecc31a",
-        "sha256": "0waapr7aqz0h1fy1fqlx981ygllh91qx9sz1l2j2h59s46cdircl",
+        "rev": "d105075a1fd870b1d1617a6008cb38b443e65433",
+        "sha256": "1jcs44wn0s6mlf2jps25bvcai1rij9b2dil6zcj8zqwf2i8xmqjh",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/b0c285807d6a9f1b7562ec417c24fa1a30ecc31a.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/d105075a1fd870b1d1617a6008cb38b443e65433.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "regex-applicative": {
-- 
cgit v1.2.3