Switch to niv for managing third party sources

2 files changed, 12 insertions, 62 deletions

diff --git a/Biz/Dev/configuration.nix b/Biz/Dev/configuration.nix
index 4a8839e..e822837 100644
--- a/Biz/Dev/configuration.nix
+++ b/Biz/Dev/configuration.nix
@@ -190,12 +190,18 @@ in {
     nixos.enable = true;
   };
 
-  # Since this is the dev machine, we can turn these on at the expense of extra
-  # disk space.
-  nix.extraOptions = ''
-    keep-outputs = true
-    keep-derivations = true
-  '';
+
+  nix = {
+    # 1 job * 2 cores = 2 maximum cores used at any one time
+    maxJobs = 1;
+    buildCores = 2;
+    # Since this is the dev machine, we can turn these on at the expense
+    # of extra disk space.
+    extraOptions = ''
+      keep-outputs = true
+      keep-derivations = true
+    '';
+  };
 
   # This value determines the NixOS release with which your system is to be
   # compatible, in order to avoid breaking some software such as database
diff --git a/Biz/buildOS.nix b/Biz/buildOS.nix
deleted file mode 100644
index 9e6c2f2..0000000
--- a/Biz/buildOS.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-nixos:
-{ ipAddress ? null
-, enableVpn ? false
-, vpnConnectTo ? ""
-, vpnRsaPrivateKeyFile ? null
-, vpnEd25519PrivateKeyFile ? null
-, deps ? {} # an attrset overlayed to pkgs
-, configuration # see: configuration.nix(5)
-}:
-# assert enableVpn -> builtins.isString ipAddress;
-# assert enableVpn -> builtins.isString vpnRsaPrivateKeyFile;
-# assert enableVpn -> builtins.isString vpnEd25519PrivateKeyFile;
-let
-  vpnExtraConfig = if enableVpn then ''
-    ConnectTo = ${vpnConnectTo}
-    Ed25519PrivateKeyFile = "${vpnEd25519PrivateKeyFile}"
-    PrivateKeyFile = "${vpnRsaPrivateKeyFile}"
-  '' else "";
-  overlay = self: super: deps;
-  defaults = {
-    boot.cleanTmpDir = true;
-    #networking.interfaces.simatime-vpn = [{ ipv4.address = ipAddress; }];
-    networking.firewall.allowPing = true;
-    nix.binaryCaches = [ "https://cache.nixos.org" ];
-    nix.gc.automatic = true;
-    nix.gc.dates = "Sunday 02:15";
-    nix.maxJobs = 1; # "auto";
-    nix.optimise.automatic = true;
-    nix.optimise.dates = [ "Sunday 02:30" ];
-    nixpkgs.overlays = [ overlay ];
-    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;
-    #services.tinc.networks.simatime-vpn.extraConfig = vpnExtraConfig;
-    #services.tinc.networks.simatime-vpn.debugLevel = 3;
-    #services.tinc.networks.simatime-vpn.interfaceType = "tap";
-    #services.tinc.networks.simatime-vpn.hosts = import ./vpnHosts.nix;
-    system.autoUpgrade.enable = false; # 'true' breaks our nixpkgs pin
-  };
-  os = nixos {
-    system = "x86_64-linux";
-    configuration = (defaults // configuration);
-  };
-in {
-   system = os.system;
-   vm = os.vm;
-}