diff --git a/config/default.nix b/config/default.nix index 31bf8a3..ca3bc46 100644 --- a/config/default.nix +++ b/config/default.nix @@ -4,7 +4,10 @@ "services/networking/netbird.nix" ]; - hardware.nvidia.modesetting.enable = builtins.trace "remove once #330748 is merged" true; + # Not setting this causes infinite recursion because it has a very weird default. + # The default should probably be removed upstream and only applied with mkDefault + # if hardware.nvidia.enable is true + hardware.nvidia.modesetting.enable = true; imports = [ inputs.agenix-rekey.nixosModules.default diff --git a/flake.lock b/flake.lock index d760cd3..eac4e08 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1720546205, - "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", + "lastModified": 1722339003, + "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", "owner": "ryantm", "repo": "agenix", - "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", + "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", "type": "github" }, "original": { @@ -51,11 +51,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1721402988, - "narHash": "sha256-O5j5y5gpssVF5FNsSF7joTyrlW//LpwyLk6yBWgQ0VE=", + "lastModified": 1722597419, + "narHash": "sha256-YbMzll0Dh2ln/TryDP+S3IGm8nRHkzcSQIubI4ZEOAw=", "owner": "oddlama", "repo": "agenix-rekey", - "rev": "3f1c787e2092d9c13142ae7572cc1c52b68f1c4c", + "rev": "126b4a5133eb361cbf5bf90e44c71b6f830845ec", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1722028105, - "narHash": "sha256-0ButnGQ1bCMIDblzC6NBSL71Wi6JmHGweI3scoV8CgM=", + "lastModified": 1722476845, + "narHash": "sha256-7gZ8uf3qOox8Vrwd+p9EhUHHLhhK8lis/5KcXGmIaow=", "owner": "nix-community", "repo": "disko", - "rev": "5b01cea8b5753de9c2febd27203c530be14745ff", + "rev": "7e1b215a0a96efb306ad6440bf706d2b307dc267", "type": "github" }, "original": { @@ -422,11 +422,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1721316623, - "narHash": "sha256-WmPX3r0YtUxvcQmTgvNld2xJooWr4f/+5dURiw7/3zc=", + "lastModified": 1722526955, + "narHash": "sha256-fFS8aDnfK9Qfm2FLnQ8pqWk8FzvFEv5LvTuZTZLREnc=", "owner": "nix-community", "repo": "dream2nix", - "rev": "4e9fd61a1201f4b3800d6946810a6b4c2ecdcde8", + "rev": "3fd4c14d3683baac8d1f94286ae14fe160888b51", "type": "github" }, "original": { @@ -468,11 +468,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1720420198, - "narHash": "sha256-OIuDb6pHDyGpo7YMFyuRzMLcHm7mRvlYOz0Ht7ps2sU=", + "lastModified": 1722580276, + "narHash": "sha256-VaNcSh7n8OaFW/DJsR6Fm23V+EGpSei0DyF71RKB+90=", "owner": "nix-community", "repo": "fenix", - "rev": "abc0549e3560189462a7d394cc9d50af4608d103", + "rev": "286f371b3cfeaa5c856c8e6dfb893018e86cc947", "type": "github" }, "original": { @@ -644,11 +644,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -662,11 +662,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -683,11 +683,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -1139,11 +1139,11 @@ ] }, "locked": { - "lastModified": 1722202622, - "narHash": "sha256-AOe1F9EbQpcluAP+mq+i8T3/OfMu7ALiQtSdF+oAJRE=", + "lastModified": 1722630065, + "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", "owner": "nix-community", "repo": "home-manager", - "rev": "587fcca66e9d11c8e2357053c096a8a727c120ab", + "rev": "afc892db74d65042031a093adb6010c4c3378422", "type": "github" }, "original": { @@ -1160,11 +1160,11 @@ ] }, "locked": { - "lastModified": 1722119539, - "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=", + "lastModified": 1722630065, + "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922", + "rev": "afc892db74d65042031a093adb6010c4c3378422", "type": "github" }, "original": { @@ -1183,11 +1183,11 @@ "pre-commit-hooks": "pre-commit-hooks_3" }, "locked": { - "lastModified": 1722465026, - "narHash": "sha256-ARhBk+MO+/35IlnApuag1hK2Q7XZL16tO/suXB6KCrg=", + "lastModified": 1722815593, + "narHash": "sha256-GJkmvEyLHxvNWNAXOuptP8QNMkTsm9VH+JBcTx5pSHA=", "owner": "oddlama", "repo": "idmail", - "rev": "5f8a184cb8be04e7b80fea4f57b266687c67d09d", + "rev": "a26d3a21962396e26d1f7891938229a0cce34ba9", "type": "github" }, "original": { @@ -1234,11 +1234,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1721849618, - "narHash": "sha256-+cKh/zzyzOfOC7GryAVMESpvTckOVJ+cQC01JJi1z8k=", + "lastModified": 1722696400, + "narHash": "sha256-8bz0+XpjGgio5Bjte0PWsYRArVR2godIBoArly0D+HU=", "owner": "astro", "repo": "microvm.nix", - "rev": "2f56d58cae49d6b66adc42aa3c52051a83f6a176", + "rev": "dc326ff7fa41aa5cc210b99617743bbc51275924", "type": "github" }, "original": { @@ -1274,11 +1274,11 @@ "treefmt": "treefmt" }, "locked": { - "lastModified": 1721628845, - "narHash": "sha256-bk3pvu9fkE7kueTRZXSY2SbZugjfaLscm3ealKzcV8E=", + "lastModified": 1722751969, + "narHash": "sha256-cl4M94gy6Qd4lFfygeNhCyhSBGG0XCLqd8UfMxyGPvU=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "3aec989d85322ab28b5d8f742227f1bb97986f99", + "rev": "deac3b762f1de75571dadfaa36c44f365a1006e3", "type": "github" }, "original": { @@ -1295,11 +1295,11 @@ ] }, "locked": { - "lastModified": 1722082646, - "narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=", + "lastModified": 1722609272, + "narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6", + "rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49", "type": "github" }, "original": { @@ -1315,11 +1315,11 @@ ] }, "locked": { - "lastModified": 1722136042, - "narHash": "sha256-x3FmT4QSyK28itMiR5zfYhUrG5nY+2dv+AIcKfmSp5A=", + "lastModified": 1722740924, + "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "c0ca47e8523b578464014961059999d8eddd4aae", + "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", "type": "github" }, "original": { @@ -1338,11 +1338,11 @@ "pre-commit-hooks": "pre-commit-hooks_4" }, "locked": { - "lastModified": 1721160643, - "narHash": "sha256-ZkjJnwgDUkjzgySZv9GjKnDsDmNJVkU2u2pLD4a1QKA=", + "lastModified": 1722338736, + "narHash": "sha256-bSnWgJ7eXgHZ/pwL7+NTDGfOzsbOiw899BV3k7TawWE=", "owner": "oddlama", "repo": "nix-topology", - "rev": "fe9ace7f40a63e3eb9b39a20a1032834e090d806", + "rev": "870dcc9074077a327220b36597098c295944a47d", "type": "github" }, "original": { @@ -1353,11 +1353,11 @@ }, "nixlib": { "locked": { - "lastModified": 1721523216, - "narHash": "sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ=", + "lastModified": 1722128034, + "narHash": "sha256-L8rwzYPsLo/TYtydPJoQyYOfetuiyQYnTWYcyB8UE/s=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "31a99025ce3784c20dd11dafa5260e80e314f59e", + "rev": "d15f6f6021693898fcd2c6a9bb13707383da9bbc", "type": "github" }, "original": { @@ -1377,15 +1377,16 @@ "pre-commit-hooks": "pre-commit-hooks_5" }, "locked": { - "lastModified": 1720823772, - "narHash": "sha256-tsFUe3BU/0K4tGpPbljA4o/73nqoVi77IldpAiK/bAo=", + "lastModified": 1722900646, + "narHash": "sha256-5yIEwMiydFm8ToZVEDg69HQdFxbsRDOwxj4tYa3tdKo=", "owner": "oddlama", "repo": "nixos-extra-modules", - "rev": "c058a7597be380492cca9eedf99db0834f777c6e", + "rev": "31051a3f3cc21e79889447f6d0bfca27177d8761", "type": "github" }, "original": { "owner": "oddlama", + "ref": "append-only-backups", "repo": "nixos-extra-modules", "type": "github" } @@ -1398,11 +1399,11 @@ ] }, "locked": { - "lastModified": 1721869487, - "narHash": "sha256-zcusn81g+0gO+tSMhfs4W+wAP9As/MWNTBCbS+Ggp7A=", + "lastModified": 1722214420, + "narHash": "sha256-qfHC1p5hcErGcE672/KhBkyWYloekQpqIxtcbcUVYkA=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "c12f9a969c8cdf14618774515c7c6c96aef753c7", + "rev": "75cbb2a5e19c18840d105a72d036c6c92fc46c5d", "type": "github" }, "original": { @@ -1413,11 +1414,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1722114937, - "narHash": "sha256-MOZ9woPwdpFJcHx3wic2Mlw9aztdKjMnFT3FaeLzJkM=", + "lastModified": 1722332872, + "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e67b60fb1b2c3aad2202d95b91d4c218cf2a4fdd", + "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", "type": "github" }, "original": { @@ -1449,11 +1450,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721379653, - "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", + "lastModified": 1722421184, + "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", + "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", "type": "github" }, "original": { @@ -1465,26 +1466,26 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, "nixpkgs-lib_3": { @@ -1625,11 +1626,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1722630782, + "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", "type": "github" }, "original": { @@ -1670,11 +1671,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1722168943, - "narHash": "sha256-7hIR+TJZH2++h431ZUwbqn7bXZxouIsSg939CI5a/Lw=", + "lastModified": 1722763580, + "narHash": "sha256-LgYIYkNYzqCldWJ/xJRQ156WDp6P9hHb4EsIXsRa+u4=", "owner": "nix-community", "repo": "nixvim", - "rev": "a655679eccecddee70bf43fd4ca82f91f61a5045", + "rev": "6f7cf23b226ceaee0a2d479c505652065dfe526f", "type": "github" }, "original": { @@ -1692,11 +1693,11 @@ ] }, "locked": { - "lastModified": 1722144272, - "narHash": "sha256-olZbfaEdd+zNPuuyYcYGaRzymA9rOmth8yXOlVm+LUs=", + "lastModified": 1722493084, + "narHash": "sha256-ktjl908zZKWcGdMyz6kX1kHSg7LFFGPYBvTi9FgQleM=", "owner": "NuschtOS", "repo": "search", - "rev": "16565307c267ec219c2b5d3494ba66df08e7d403", + "rev": "3f5abffa5f28b4ac3c9212c81c5e8d2d22876071", "type": "github" }, "original": { @@ -1714,11 +1715,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -1980,11 +1981,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1720344064, - "narHash": "sha256-STmaV9Zu74QtkGGrbr9uMhskwagfCjJqOAYapXabiuk=", + "lastModified": 1722521768, + "narHash": "sha256-FvJ4FaMy1kJbZ3Iw1RyvuiUAsbHJXoU2HwylzaFzj1o=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "a5b21ea0aa644dffd7cf958b43f11f221d53404e", + "rev": "f149dc5029d8406fae8b2c541603bcac06e30deb", "type": "github" }, "original": { @@ -2024,11 +2025,11 @@ "rust-overlay_2": { "flake": false, "locked": { - "lastModified": 1721614891, - "narHash": "sha256-1yGOh8w/yhWAZ2NJR9N/shQ1tx2n9fmGe0XrDE00i9U=", + "lastModified": 1722738111, + "narHash": "sha256-cWD5pCs9AYb+512/yCx9D0Pl5KcmyuXHeJpsDw/D1vs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "424a759557ed4c01cf9dbbf79a714150d64a90ad", + "rev": "27ec296d93cb4b2d03e8cbd019b1b4cde8c34280", "type": "github" }, "original": { @@ -2114,11 +2115,11 @@ ] }, "locked": { - "lastModified": 1721989207, - "narHash": "sha256-APKQeMMdh1O1W3OnxEvNfHNBiE4eRvEN6rosFr2dLHE=", + "lastModified": 1722295291, + "narHash": "sha256-3XpT9GMw50NCGT1Gd2YAwEjrEcFtDqnuQ7sRUcuU/Pc=", "owner": "danth", "repo": "stylix", - "rev": "b9de20c76e8d5c13cf2304d23cf589803c311670", + "rev": "feb2973dfa8232c07efbd2b48f11a5cfa2276570", "type": "github" }, "original": { @@ -2316,11 +2317,11 @@ ] }, "locked": { - "lastModified": 1721458737, - "narHash": "sha256-wNXLQ/ATs1S4Opg1PmuNoJ+Wamqj93rgZYV3Di7kxkg=", + "lastModified": 1722330636, + "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "888bfb10a9b091d9ed2f5f8064de8d488f7b7c97", + "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", "type": "github" }, "original": { @@ -2337,11 +2338,11 @@ ] }, "locked": { - "lastModified": 1721769617, - "narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=", + "lastModified": 1722330636, + "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009", + "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 673dae7..87b1f44 100644 --- a/flake.nix +++ b/flake.nix @@ -56,7 +56,7 @@ }; nixos-extra-modules = { - url = "github:oddlama/nixos-extra-modules"; + url = "github:oddlama/nixos-extra-modules/append-only-backups"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/envoy/idmail.nix b/hosts/envoy/idmail.nix index 616f1e7..3635a18 100644 --- a/hosts/envoy/idmail.nix +++ b/hosts/envoy/idmail.nix @@ -19,7 +19,7 @@ group = "stalwart-mail"; }; in { - environment.persistence."/persist".directories = lib.trace "stalwart backups to dusk!" [ + environment.persistence."/persist".directories = [ { directory = config.services.idmail.dataDir; user = "stalwart-mail"; diff --git a/hosts/sire/guests/ai.nix b/hosts/sire/guests/ai.nix index dc7fee9..3176d16 100644 --- a/hosts/sire/guests/ai.nix +++ b/hosts/sire/guests/ai.nix @@ -33,7 +33,7 @@ in { }; services.open-webui = { - enable = true; + enable = builtins.trace "open-webui disabled because opentelemetry python is broken" false; host = "0.0.0.0"; port = 11222; environment = { diff --git a/hosts/ward/net.nix b/hosts/ward/net.nix index 9fb14e6..b657f4f 100644 --- a/hosts/ward/net.nix +++ b/hosts/ward/net.nix @@ -29,7 +29,7 @@ ]; matchConfig.MACAddress = config.repo.secrets.local.networking.interfaces.lan.mac; networkConfig = { - IPForward = "yes"; + IPv4Forwarding = "yes"; IPv6PrivacyExtensions = "yes"; MulticastDNS = true; }; @@ -87,7 +87,7 @@ ]; matchConfig.Name = "lan-self"; networkConfig = { - IPForward = "yes"; + IPv4Forwarding = "yes"; IPv6PrivacyExtensions = "yes"; IPv6SendRA = true; IPv6AcceptRA = false; diff --git a/hosts/zackbiene/net.nix b/hosts/zackbiene/net.nix index 0b3abad..6dbd5d2 100644 --- a/hosts/zackbiene/net.nix +++ b/hosts/zackbiene/net.nix @@ -42,7 +42,7 @@ in { ]; matchConfig.MACAddress = config.repo.secrets.local.networking.interfaces.wlan1.mac; networkConfig = { - IPForward = "yes"; + IPv4Forwarding = "yes"; IPv6PrivacyExtensions = "yes"; IPv6SendRA = true; MulticastDNS = true; diff --git a/modules/backups.nix b/modules/backups.nix index ff84d5c..78ed858 100644 --- a/modules/backups.nix +++ b/modules/backups.nix @@ -68,12 +68,13 @@ in { }; initialize = true; passwordFile = config.age.secrets.restic-encryption-password.path; - pruneOpts = [ - "--keep-daily 14" - "--keep-weekly 7" - "--keep-monthly 12" - "--keep-yearly 75" - ]; + # We cannot prune ourselves, since the remote repository will be append-only + # pruneOpts = [ + # "--keep-daily 14" + # "--keep-weekly 7" + # "--keep-monthly 12" + # "--keep-yearly 75" + # ]; }; })); }; diff --git a/users/myuser/dev/0001-gdb-show-libraries-in-coredump-backtrace.patch b/users/myuser/dev/0001-gdb-show-libraries-in-coredump-backtrace.patch deleted file mode 100644 index 88f46f8..0000000 --- a/users/myuser/dev/0001-gdb-show-libraries-in-coredump-backtrace.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/gdb/stack.c b/gdb/stack.c -index 7e45d59..cf38ff8 100644 ---- a/gdb/stack.c -+++ b/gdb/stack.c -@@ -1376,7 +1376,27 @@ print_frame (const frame_print_options &fp_opts, - annotate_frame_function_name (); - - string_file stb; -- gdb_puts (funname ? funname.get () : "??", &stb); -+ -+ const char* from_where = "??"; -+ if (funname) { -+ from_where = funname.get(); -+ } else { -+ if (core_bfd) { -+ gdbarch_read_core_file_mappings(gdbarch, core_bfd, -+ [=] (ULONGEST count) { }, -+ [&] (int num, ULONGEST start, ULONGEST end, ULONGEST file_ofs, -+ const char *filename, const bfd_build_id *build_id) -+ { -+ if (start <= pc && pc < end) { -+ from_where = filename; -+ } -+ }); -+ } else { -+ // too much work for this small patch. Would need to inspect /proc//maps -+ } -+ } -+ -+ gdb_puts (from_where, &stb); - uiout->field_stream ("func", stb, function_name_style.style ()); - uiout->wrap_hint (3); - annotate_frame_args (); diff --git a/users/myuser/dev/gdb.nix b/users/myuser/dev/gdb.nix index 28071ab..beb1faf 100644 --- a/users/myuser/dev/gdb.nix +++ b/users/myuser/dev/gdb.nix @@ -3,17 +3,9 @@ # Also make it the default gdb. pwndbgWithDebuginfod = (pkgs.pwndbg.override { - gdb = - (pkgs.gdb.override { - enableDebuginfod = true; - }) - .overrideAttrs (_finalAttrs: previousAttrs: { - patches = - previousAttrs.patches - ++ [ - ./0001-gdb-show-libraries-in-coredump-backtrace.patch - ]; - }); + gdb = pkgs.gdb.override { + enableDebuginfod = true; + }; }) .overrideAttrs (_finalAttrs: previousAttrs: { installPhase =