flake.lock

@@ -436,6 +436,21 @@
         "type": "github"
       }
     },
+    "nurpkgs": {
+      "locked": {
+        "lastModified": 1711597179,
+        "narHash": "sha256-k3TekWyk8RH7Td9xS3sHIrvDXmO/OBoNC770Oec25q4=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "2d22add691c4187f5d629c2c42b7cb602d37d156",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -474,6 +489,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixos-unstable": "nixos-unstable",
         "nixpkgs": "nixpkgs",
+        "nurpkgs": "nurpkgs",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "treefmt-nix": "treefmt-nix"
       }

flake.nix

@@ -39,6 +39,8 @@
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
+    nurpkgs.url = "github:nix-community/NUR";
+
     agenix = {
       url = "github:ryantm/agenix";
       inputs = {

home/programs/ssh/shared/work.nix

@@ -3,7 +3,7 @@
 {
   matchBlocks = {
     "git.app.nedeco.de" = {
-      port = 22;
+      port = 20022;
       user = "git";
       identityFile = "~/.ssh/nedeco_gitlab.pub";
       identitiesOnly = true;

system/darwin/attic.nix

@@ -1,5 +1,14 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
+let
+  inherit (pkgs) stdenv;
+
+  attic = pkgs.attic-client.overrideAttrs (_: _: {
+    env = lib.optionalAttrs stdenv.cc.isClang {
+      NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
+    };
+  });
+in
 {
-  environment.systemPackages = [ pkgs.attic-client ];
+  environment.systemPackages = [ attic ];
 }

system/flakes/Styx.nix

@@ -9,6 +9,7 @@ let
   nixpkgsConfig = {
     overlays = [
       overlay-x86
+      inputs.nurpkgs.overlay
       agenix.overlays.default
       inputs.attic.overlays.default
       overlay-mkalias

system/flakes/argon.nix

@@ -3,10 +3,12 @@
 let
   default-system = "aarch64-linux";
 
+  overlay-attic = inputs.attic.overlays.default;
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
+      overlay-attic
       overlay-nifoc
     ];
 

system/flakes/neon.nix

@@ -3,10 +3,12 @@
 let
   default-system = "aarch64-linux";
 
+  overlay-attic = inputs.attic.overlays.default;
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
+      overlay-attic
       overlay-nifoc
     ];
 

system/hosts/neon.nix

@@ -83,16 +83,6 @@ in
   systemd.network = {
     enable = true;
 
-    netdevs = {
-      "20-vlan10" = {
-        netdevConfig = {
-          Kind = "vlan";
-          Name = "vlan51";
-        };
-        vlanConfig.Id = 51;
-      };
-    };
-
     networks = {
       "10-lan" = {
         matchConfig.Name = "end0";