sources: update nixpkgs to 21.05

this caused various other changes related to nftables, we are now using
hexchen's fork of pbb's module.

common/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, modules, ... }:
 
 let
   sources = import ../nix/sources.nix;
@@ -7,10 +7,10 @@ in {
     ../modules
     ./users.nix
     (sources.home-manager + "/nixos")
-    (sources.pbb-nixfiles + "/modules/nftables")
+    modules.network.nftables
   ];
 
-  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages;
   boot.kernelParams = [ "quiet" ];
 
   networking.domain = lib.mkDefault "hacc.space";
@@ -79,5 +79,5 @@ in {
     access_log off;
   '';
 
-  petabyte.nftables.enable = true;
+  networking.nftables.enable = true;
 }

default.nix

@@ -2,6 +2,10 @@ rec {
   sources = import ./nix/sources.nix;
   pkgs = import ./pkgs {};
   inherit (pkgs) lib;
-  inherit (import (sources.nix-hexchen + "/lib/hosts.nix") { inherit pkgs; hostsDir = ./hosts; commonImports = [./common]; pkgsPath = ./pkgs; }) hosts groups;
+  inherit (import (sources.nix-hexchen + "/lib/hosts.nix") {
+    inherit pkgs sources;
+    inherit ((import sources.nix-hexchen) {}) modules;
+    hostsDir = ./hosts; commonImports = [./common]; pkgsPath = ./pkgs;
+  }) hosts groups;
   deploy = import (sources.nix-hexchen + "/lib/deploy.nix") { inherit pkgs hosts groups; };
 }

modules/nftnat/default.nix

@@ -41,9 +41,7 @@ in {
       };
     };
 
-    petabyte.nftables = {
-      enable = true;
-
+    networking.nftables = {
       extraConfig = ''
         table ip nat {
           chain prerouting {

nix/sources.json

@@ -6,15 +6,15 @@
         "type": "git"
     },
     "home-manager": {
-        "branch": "release-20.09",
+        "branch": "release-21.05",
         "description": "Manage a user environment using Nix  [maintainer=@rycee] ",
         "homepage": "https://nix-community.github.io/home-manager/",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "49706878e1580d796cc99b63574310405935113f",
-        "sha256": "07f903ij0czyhly8kvwjazvz3s6kflxzh5fs6j8781lkxsy47i9f",
+        "rev": "9c0abed5228d54aad120b4bc757b6f5935aeda1c",
+        "sha256": "05pfa26p9k1gpir9sniwg195cqqc9v6yp9b5f9hrjhlh3jm14bgq",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/49706878e1580d796cc99b63574310405935113f.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/9c0abed5228d54aad120b4bc757b6f5935aeda1c.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "mattermost-server": {
@@ -57,11 +57,12 @@
     },
     "nix-hexchen": {
         "branch": "main",
-        "repo": "https://gitlab.com/hexchen/nixfiles.git",
-        "rev": "83b511d9a3754ded187891c711b3dbbef82887d3",
-        "sha256": "1024vl0bgmcb8g91pqcqc601xh90nxp82p0z9imp11fwb1fx7756",
+        "ref": "main",
+        "repo": "https://gitlab.com/hexchen/nixfiles",
+        "rev": "1ae89906c8fb5cf45384eb2821bd89c807c1564f",
+        "sha256": "03yicni5jfr5qjillj3dp899n3lq7dhqrg66dr0w1vy12d0lp43s",
         "type": "tarball",
-        "url": "https://gitlab.com/hexchen/nixfiles/-/archive/83b511d9a3754ded187891c711b3dbbef82887d3/nixfiles-83b511d9a3754ded187891c711b3dbbef82887d3.tar.gz",
+        "url": "https://gitlab.com/hexchen/nixfiles/-/archive/1ae89906c8fb5cf45384eb2821bd89c807c1564f.tar.gz",
         "url_template": "<repo>/-/archive/<rev>.tar.gz"
     },
     "nixos-mailserver": {
@@ -74,15 +75,15 @@
         "url_template": "<repo>/-/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixos-20.09",
+        "branch": "nixos-21.05",
         "description": "Nix Packages collection",
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "068984c00e0d4e54b6684d98f6ac47c92dcb642e",
-        "sha256": "00j4xv4lhhqwry7jd67brnws4pwb8vn660n43pvxpkalbpxszwfg",
+        "rev": "382039c05a16827a7f0731183e862366b66b422f",
+        "sha256": "08mvanp4400zfz1knyxsjhkc7ryjlaa9awcg763ghj235wk6mlld",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/068984c00e0d4e54b6684d98f6ac47c92dcb642e.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/382039c05a16827a7f0731183e862366b66b422f.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-unstable": {

pkgs/default.nix

@@ -10,13 +10,7 @@ let
   newpkgs = {
     alps = callPackage ./alps {};
 
-    docker = (pkgs.callPackage (pkgs.path + "/pkgs/applications/virtualization/docker") {
-      iptables = pkgs.writeScriptBin "iptables" ''
-        #!${pkgs.runtimeShell}
-        echo docker tried to run the following iptables command: $@
-        exit 0
-      '';
-    }).docker_19_03.overrideAttrs (super: {
+    docker = pkgs.docker.overrideAttrs (super: {
       extraPath = super.extraPath + ":${pkgs.zfs}/bin";
     });