update

fixups.nix

@@ -1,21 +1,5 @@
 (pkgs: super: {
-  # https://github.com/NixOS/nixpkgs/pull/145738
+  # notmuch = super.notmuch.overrideAttrs (o: {
-  # tree = super.tree.overrideAttrs (o: {
+  #   doCheck = false;
-  #   preConfigure = o.preConfigure + ''
-  #     makeFlags+=("CC=$CC")
-  #   '';
-  #   makeFlags = pkgs.lib.filter (x: x != "CC=$CC") o.makeFlags;
   # });
-  yubikey-manager = super.yubikey-manager.overrideAttrs (o: {
-    # remove after 7d8d3c71228756406b70e142411295affbbb3fa1 is merged
-    postPatch = ''
-      substituteInPlace pyproject.toml \
-        --replace 'cryptography = "^2.1 || ^3.0"' 'cryptography = "*"'
-      substituteInPlace "ykman/pcsc/__init__.py" \
-        --replace 'pkill' '${pkgs.procps}/bin/pkill'
-      '';
-  });
-  notmuch = super.notmuch.overrideAttrs (o: {
-    doCheck = false;
-  });
 })

home-manager/home.nix

@@ -270,7 +270,7 @@ in {
       nix-tree
       virt-manager
       watchman
-      gnome3.gcr.out # alacritty
+      gcr.out # alacritty
       notmuch
       gmailieer
       git-absorb

nix/sources.json

@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "50c206818dd137d6c28f61143319691fd910b0c7",
+        "rev": "df459e39ce667fc1455a1fa05dc107ae624f671a",
-        "sha256": "0vy42w223g00ckmi7d4kxf30f6bwcffkpj54gzni5bclq1af4lfz",
+        "sha256": "0wrbjjr6nm9k8pafj8x5iic1bikxkpq00r1z675xv5m48m78cbf9",
         "type": "tarball",
-        "url": "https://github.com/nix-community/emacs-overlay/archive/50c206818dd137d6c28f61143319691fd910b0c7.tar.gz",
+        "url": "https://github.com/nix-community/emacs-overlay/archive/df459e39ce667fc1455a1fa05dc107ae624f671a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "home-manager": {
@@ -17,10 +17,10 @@
         "homepage": "https://nix-community.github.io/home-manager/",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d07df8d9a80a4a34ea881bee7860ae437c5d44a5",
+        "rev": "8eb7c009f09f1f7b1ec151e5d537104acf42213a",
-        "sha256": "15jqh8jqbvrwardwi62bs7r9myppc90qkzbbp7mzzsjmfgbd35i0",
+        "sha256": "1j8nv6y5r9gsp6ws1bqzbqlz444qd8lz1xm848ii8ycimw9b0icr",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/d07df8d9a80a4a34ea881bee7860ae437c5d44a5.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/8eb7c009f09f1f7b1ec151e5d537104acf42213a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
@@ -29,10 +29,10 @@
         "homepage": "https://github.com/nmattia/niv",
         "owner": "nmattia",
         "repo": "niv",
-        "rev": "5830a4dd348d77e39a0f3c4c762ff2663b602d4c",
+        "rev": "9cb7ef336bb71fd1ca84fc7f2dff15ef4b033f2a",
-        "sha256": "1d3lsrqvci4qz2hwjrcnd8h5vfkg8aypq3sjd4g3izbc8frwz5sm",
+        "sha256": "1ajyqr8zka1zlb25jx1v4xys3zqmdy3prbm1vxlid6ah27a8qnzh",
         "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/5830a4dd348d77e39a0f3c4c762ff2663b602d4c.tar.gz",
+        "url": "https://github.com/nmattia/niv/archive/9cb7ef336bb71fd1ca84fc7f2dff15ef4b033f2a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixos-hardware": {
@@ -41,10 +41,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "4045d5f43aff4440661d8912fc6e373188d15b5b",
+        "rev": "816a935bf5aa5f77cb1f03ebfe20ab13b112d0f1",
-        "sha256": "1f07p7awpxwg8f9ps5ncvnpkh9ny3aj2n28gqqhafdk9i6f9zkfi",
+        "sha256": "1dldbr0ikwb28ramzncriylfr8v6chf5wsadm844wx3487hx4sxr",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixos-hardware/archive/4045d5f43aff4440661d8912fc6e373188d15b5b.tar.gz",
+        "url": "https://github.com/nixos/nixos-hardware/archive/816a935bf5aa5f77cb1f03ebfe20ab13b112d0f1.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixos-mailserver": {
@@ -61,10 +61,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b2737d4980a17cc2b7d600d7d0b32fd7333aca88",
+        "rev": "73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58",
-        "sha256": "012db5d6k0lajp4q37byhgamz3ry04av1dcpgf3ahm9kzjwsjcch",
+        "sha256": "01j7nhxbb2kjw38yk4hkjkkbmz50g3br7fgvad6b1cjpdvfsllds",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/b2737d4980a17cc2b7d600d7d0b32fd7333aca88.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-mozilla": {
@@ -73,10 +73,10 @@
         "homepage": "",
         "owner": "mozilla",
         "repo": "nixpkgs-mozilla",
-        "rev": "9f70f86d73fa97e043bebeb58e5676d157069cfb",
+        "rev": "15b7a05f20aab51c4ffbefddb1b448e862dccb7d",
-        "sha256": "1ws4xf6234cwzr9gya7f6p2cvdk5w7w1pccl4m2viqdnws16hcc8",
+        "sha256": "0admybxrjan9a04wq54c3zykpw81sc1z1nqclm74a7pgjdp7iqv1",
         "type": "tarball",
-        "url": "https://github.com/mozilla/nixpkgs-mozilla/archive/9f70f86d73fa97e043bebeb58e5676d157069cfb.tar.gz",
+        "url": "https://github.com/mozilla/nixpkgs-mozilla/archive/15b7a05f20aab51c4ffbefddb1b448e862dccb7d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-wayland": {
@@ -85,10 +85,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "d82f96a4e818ddd2fddcd5b157bff85b54e5ad80",
+        "rev": "d27494f618f938c94e0f89108214e1a888e52f25",
-        "sha256": "1y68pf2d373jqnfvdidnz8682ss3ips49mg4mdzwy18y4b9m9dj7",
+        "sha256": "1qya6xm4j9mhk82f282sj5bmkcxa1a6ccv115qcl1gmdx0142n74",
         "type": "tarball",
-        "url": "https://github.com/nix-community/nixpkgs-wayland/archive/d82f96a4e818ddd2fddcd5b157bff85b54e5ad80.tar.gz",
+        "url": "https://github.com/nix-community/nixpkgs-wayland/archive/d27494f618f938c94e0f89108214e1a888e52f25.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

nixos/logical/blackadder.nix

@@ -35,7 +35,7 @@
     SUBSYSTEM=="usb", ATTRS{idVendor}=="20b7", ATTRS{idProduct}=="9db1", MODE="0660", GROUP="dialout", TAG+="uaccess"
   '';
 
-  nix.trustedUsers = [ "lars" ];
+  nix.settings.trusted-users = [ "lars" ];
   users.users.yorick.extraGroups = [ "docker" ];
   users.users.lars = {
     isNormalUser = true;

nixos/overlay.nix

@@ -5,9 +5,11 @@ in pkgs: super: {
       let
         c = import (pkgs.path + "/nixos/lib/eval-config.nix") {
           inherit (pkgs.stdenv.hostPlatform) system;
-          inherit extraArgs;
           modules =
-            [ ({ lib, ... }: { config.nixpkgs.pkgs = lib.mkDefault pkgs; }) ]
+            [ ({ lib, ... }: {
+              config.nixpkgs.pkgs = lib.mkDefault pkgs;
+              config._module.args = extraArgs;
+            }) ]
             ++ (if builtins.isList configuration then
               configuration
             else

nixos/physical/3950x-hardware-config.nix

@@ -30,7 +30,7 @@
   swapDevices =
     [{ device = "/dev/disk/by-uuid/61a23e27-2cd4-4456-bcde-aec68be04239"; }];
 
-  nix.maxJobs = lib.mkDefault 32;
+  nix.settings.max-jobs = lib.mkDefault 32;
   # High-DPI console
   #i18n.consoleFont = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
 }

nixos/roles/default.nix

@@ -47,7 +47,7 @@ in {
   services.openssh = {
     enable = true;
     passwordAuthentication = false;
-    challengeResponseAuthentication = false;
+    kbdInteractiveAuthentication = false;
   };
 
   environment.systemPackages = with pkgs; [
@@ -93,7 +93,7 @@ in {
     mtr
     bind
     socat
-    netcat-openbsd
+    libressl.nc
     lftp
     wget
     rsync
@@ -122,10 +122,10 @@ in {
   };
   security.acme.defaults.email = "acme@yori.cc";
   security.acme.acceptTerms = true;
-  nix.binaryCachePublicKeys =
+  nix.settings.trusted-public-keys =
     [ "yorick:Pmd0gyrTvVdzpQyb/raHJKdoOag8RLaj434qBgMm4I0=" ];
 
-  nix.trustedUsers = [ "@wheel" ];
+  nix.settings.trusted-users = [ "@wheel" ];
   services.prometheus.exporters.node = {
     enable = true;
     enabledCollectors = [ "systemd" ];

nixos/roles/workstation.nix

@@ -39,18 +39,18 @@ in {
   programs.wireshark.enable = true;
   nix = {
     gc.automatic = pkgs.lib.mkOverride 30 false;
-    binaryCaches = [
+    settings.substituters = [
       "https://cache.nixos.org"
       "https://cache.lumi.guide/"
       #"s3://yori-nix?endpoint=s3.eu-central-003.backblazeb2.com&profile=backblaze-read"
       #"https://nixpkgs-wayland.cachix.org"
     ];
-    trustedBinaryCaches = config.nix.binaryCaches ++ [
+    settings.trusted-substituters = config.nix.settings.substituters ++ [
       "ssh://yorick@jupiter.serokell.io"
       "ssh-ng://jupiter"
       "https://serokell.cachix.org"
     ];
-    binaryCachePublicKeys = [
+    settings.trusted-public-keys = [
       "serokell:ic/49yTkeFIk4EBX1CZ/Wlt5fQfV7yCifaJyoM+S3Ss="
       "serokell-1:aIojg2Vxgv7MkzPJoftOO/I8HKX622sT+c0fjnZBLj0="
       (lib.mkIf config.yorick.lumi-vpn.enable "cache.lumi.guide-1:z813xH+DDlh+wvloqEiihGvZqLXFmN7zmyF8wR47BHE=")
@@ -60,7 +60,7 @@ in {
     ];
     extraOptions = lib.mkIf config.yorick.lumi-vpn.enable ''
       netrc-file = ${nixNetrcFile}
-    '';
+    # '';
   };
   services.avahi = {
     enable = true;

pkgs/envs.nix

@@ -7,7 +7,7 @@ in {
   envs = recurseIntoAttrs {
     de = mkEnv "y-de-deps" [
       gtk-engine-murrine
-      hicolor_icon_theme
+      hicolor-icon-theme
       vanilla-dmz
       # arc-theme
       libnotify
@@ -78,12 +78,12 @@ in {
       valgrind cdecl gdb ltrace cmake radare2 # gcc
     ];
     misc = mkEnv "y-misc" [
-      #gitAndTools.git-annex # doesn't build
+      gitAndTools.git-annex
       gnupg1 man-pages bup # catdoc
       borgbackup
       imagemagick
       openssl
-      sshfsFuse
+      sshfs-fuse
       sshuttle iodine stow
       expect duplicity
       wakelan pass