diff --git a/flake.lock b/flake.lock index 6a2ace0..8d56512 100644 --- a/flake.lock +++ b/flake.lock @@ -8,14 +8,14 @@ "ragenix", "nixpkgs" ], - "systems": "systems_8" + "systems": "systems_7" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -24,36 +24,10 @@ "type": "github" } }, - "attic": { - "inputs": { - "crane": "crane", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "nixpkgs-stable": [ - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1720542474, - "narHash": "sha256-aKjJ/4l2I9+wNGTaOGRsuS3M1+IoTibqgEMPDikXm04=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "6139576a3ce6bb992e0f6c3022528ec233e45f00", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "repo": "attic", - "type": "github" - } - }, "boardie": { "inputs": { "devshell": "devshell", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs-unstable" ], @@ -76,7 +50,7 @@ "borgthin": { "inputs": { "devshell": "devshell_2", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs-mine" ] @@ -96,39 +70,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "attic", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1717025063, - "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", + "lastModified": 1725409566, + "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", "owner": "ipetkov", "repo": "crane", - "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { - "inputs": { - "nixpkgs": [ - "ragenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708794349, - "narHash": "sha256-jX+B1VGHT0ruHHL5RwS8L21R6miBn4B6s9iVyUJsJJY=", - "owner": "ipetkov", - "repo": "crane", - "rev": "2c94ff9a6fbeb9f3ea0107f28688edbe9c81deaa", + "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", "type": "github" }, "original": { @@ -162,18 +109,18 @@ }, "deploy-rs": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs-unstable" ], "utils": "utils" }, "locked": { - "lastModified": 1718194053, - "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=", + "lastModified": 1727447169, + "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=", "owner": "serokell", "repo": "deploy-rs", - "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a", + "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76", "type": "github" }, "original": { @@ -184,7 +131,7 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" }, "locked": { @@ -203,7 +150,7 @@ }, "devshell-tools": { "inputs": { - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_9", "nixpkgs": "nixpkgs_4" }, "locked": { @@ -222,7 +169,7 @@ }, "devshell_2": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_3" }, "locked": { @@ -241,17 +188,16 @@ }, "devshell_3": { "inputs": { - "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -261,22 +207,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -293,90 +223,6 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_10": { - "inputs": { - "systems": "systems_9" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_11": { - "inputs": { - "systems": "systems_10" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_12": { - "inputs": { - "systems": "systems_11" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_13": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -394,7 +240,40 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_10": { + "inputs": { + "systems": "systems_10" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_11": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems_2" }, @@ -412,7 +291,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { "systems": "systems_3" }, @@ -430,7 +309,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "locked": { "lastModified": 1642700792, "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", @@ -445,7 +324,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -460,16 +339,31 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { "systems": "systems_6" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -480,7 +374,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1710146030, @@ -497,12 +391,15 @@ } }, "flake-utils_9": { + "inputs": { + "systems": "systems_9" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -540,16 +437,16 @@ ] }, "locked": { - "lastModified": 1719827415, - "narHash": "sha256-pvh+1hStXXAZf0sZ1xIJbWGx4u+OGBC1rVx6Wsw0fBw=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2e3c19867262dbe84fdfab42467fc8dd83a2005", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { "id": "home-manager", - "ref": "release-23.11", + "ref": "release-24.05", "type": "indirect" } }, @@ -560,11 +457,11 @@ ] }, "locked": { - "lastModified": 1720734513, - "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -574,11 +471,11 @@ }, "impermanence": { "locked": { - "lastModified": 1719091691, - "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", + "lastModified": 1731242966, + "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", "owner": "nix-community", "repo": "impermanence", - "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", + "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", "type": "github" }, "original": { @@ -611,7 +508,7 @@ }, "nixGL": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs-unstable" ] @@ -648,11 +545,11 @@ }, "nixpkgs-mine": { "locked": { - "lastModified": 1724669894, - "narHash": "sha256-oHDWt37dN3Bq12E016HDw0rnjBlRg51hg66b7qG6cro=", + "lastModified": 1731774603, + "narHash": "sha256-d8Y7nqzdjKqG/sOkEm52J0C6jBX0cn1GHGuh0GUTqyI=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "01d95eaee35f63ed8e48dedb573f48a1a3028f88", + "rev": "0712614f7c9f98eddf838c2a6ae1a2e315ca6b83", "type": "github" }, "original": { @@ -664,11 +561,11 @@ }, "nixpkgs-mine-stable": { "locked": { - "lastModified": 1720987393, - "narHash": "sha256-aq1reu43552gD+QRyxAMlimAX9+YbGpAIyw82jg0eWY=", + "lastModified": 1731774637, + "narHash": "sha256-j2swiGIVhYDpbsf+uCfMmxZ69nzy5VvW6OKUSJFifds=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "154ab603fb2b794b437f233853aeb3c75f101049", + "rev": "682a245504aa86e26aab8d4a5273333946d19689", "type": "github" }, "original": { @@ -680,26 +577,26 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "type": "indirect" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -774,7 +671,7 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nix-github-actions": "nix-github-actions", "nixpkgs": "nixpkgs_2", "systems": "systems_4", @@ -797,19 +694,19 @@ "ragenix": { "inputs": { "agenix": "agenix", - "crane": "crane_2", - "flake-utils": "flake-utils_10", + "crane": "crane", + "flake-utils": "flake-utils_8", "nixpkgs": [ "nixpkgs-unstable" ], "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725195663, - "narHash": "sha256-vnmQ0tMkQpiOW5xvM9WVVDLr4OjYKquq0iOaAlPriqA=", + "lastModified": 1731774781, + "narHash": "sha256-vwsUUYOIs8J6weeSK1n1mbZf8fgvygGUMsadx0JmG70=", "owner": "devplayer0", "repo": "ragenix", - "rev": "58820d99352a5e7067ec98374b8c4519c8e225b6", + "rev": "ec4115da7b67c783b1091811e17dbcba50edd1c6", "type": "github" }, "original": { @@ -821,12 +718,11 @@ }, "root": { "inputs": { - "attic": "attic", "boardie": "boardie", "borgthin": "borgthin", "deploy-rs": "deploy-rs", "devshell": "devshell_3", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_6", "home-manager-stable": "home-manager-stable", "home-manager-unstable": "home-manager-unstable", "impermanence": "impermanence", @@ -841,21 +737,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "ragenix", - "flake-utils" - ], "nixpkgs": [ "ragenix", "nixpkgs" ] }, "locked": { - "lastModified": 1708740535, - "narHash": "sha256-NCTw235XwSDbeTAtAwg/hOeNOgwYhVq7JjDdbkOgBeA=", + "lastModified": 1725675754, + "narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9b24383d77f598716fa0cbb8b48c97249f5ee1af", + "rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54", "type": "github" }, "original": { @@ -866,7 +758,7 @@ }, "sbt": { "inputs": { - "flake-utils": "flake-utils_13", + "flake-utils": "flake-utils_11", "nixpkgs": "nixpkgs_5" }, "locked": { @@ -886,7 +778,7 @@ "sharry": { "inputs": { "devshell-tools": "devshell-tools", - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_10", "nixpkgs": [ "nixpkgs-unstable" ], @@ -936,21 +828,6 @@ "type": "github" } }, - "systems_11": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 9c3ef16..36b6819 100644 --- a/flake.nix +++ b/flake.nix @@ -7,13 +7,13 @@ devshell.inputs.nixpkgs.follows = "nixpkgs-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "nixpkgs/nixos-23.11"; + nixpkgs-stable.url = "nixpkgs/nixos-24.05"; nixpkgs-mine.url = "github:devplayer0/nixpkgs/devplayer0"; nixpkgs-mine-stable.url = "github:devplayer0/nixpkgs/devplayer0-stable"; home-manager-unstable.url = "home-manager"; home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable"; - home-manager-stable.url = "home-manager/release-23.11"; + home-manager-stable.url = "home-manager/release-24.05"; home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; # Stuff used by the flake for build / deployment @@ -35,9 +35,6 @@ sharry.inputs.nixpkgs.follows = "nixpkgs-unstable"; borgthin.url = "github:devplayer0/borg"; borgthin.inputs.nixpkgs.follows = "nixpkgs-mine"; - attic.url = "github:zhaofengli/attic"; - attic.inputs.nixpkgs.follows = "nixpkgs-unstable"; - attic.inputs.nixpkgs-stable.follows = "nixpkgs-stable"; }; outputs = @@ -96,7 +93,6 @@ inputs.ragenix.overlays.default inputs.deploy-rs.overlay (flakePackageOverlay inputs.home-manager-unstable system) - inputs.attic.overlays.default ]; })) pkgsFlakes; diff --git a/home-manager/modules/gui/default.nix b/home-manager/modules/gui/default.nix index 2934714..79fba39 100644 --- a/home-manager/modules/gui/default.nix +++ b/home-manager/modules/gui/default.nix @@ -417,8 +417,9 @@ in font = "${font.name} ${toString font.size}"; plugins = with pkgs; (map (p: p.override { rofi-unwrapped = rofi-wayland-unwrapped; }) [ rofi-calc - rofi-emoji - ]); + ]) ++ [ + rofi-emoji-wayland + ]; extraConfig = { modes = "window,run,ssh,filebrowser,calc,emoji"; emoji-mode = "copy"; diff --git a/lib/constants.nix b/lib/constants.nix index cbec64e..0dce1db 100644 --- a/lib/constants.nix +++ b/lib/constants.nix @@ -27,7 +27,7 @@ rec { kernel = { lts = pkgs: pkgs.linuxKernel.packages.linux_6_6; - latest = pkgs: pkgs.linuxKernel.packages.linux_6_9; + latest = pkgs: pkgs.linuxKernel.packages.linux_6_11; }; nginx = rec { diff --git a/lib/default.nix b/lib/default.nix index 40b8f25..5377863 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -248,8 +248,8 @@ rec { in { trivial = prev.trivial // { - release = "24.07:u-${prev.trivial.release}"; - codeName = "Diffed"; + release = "24.12:u-${prev.trivial.release}"; + codeName = "Epic"; revisionWithDefault = default: self.rev or default; versionSuffix = ".${date}.${revCode self}:u-${revCode pkgsFlake}"; }; diff --git a/nixos/boxes/britway/nginx.nix b/nixos/boxes/britway/nginx.nix index 203a35a..f010441 100644 --- a/nixos/boxes/britway/nginx.nix +++ b/nixos/boxes/britway/nginx.nix @@ -80,7 +80,7 @@ in }; }; - "ts.${pubDomain}" = { + "hs.${pubDomain}" = { locations."/" = { proxyPass = "http://localhost:${toString config.services.headscale.port}"; proxyWebsockets = true; diff --git a/nixos/boxes/britway/tailscale.nix b/nixos/boxes/britway/tailscale.nix index e8c4179..a07b43d 100644 --- a/nixos/boxes/britway/tailscale.nix +++ b/nixos/boxes/britway/tailscale.nix @@ -4,7 +4,7 @@ let inherit (lib.my.c.britway) prefixes domain; # Can't use overrideAttrs because we need to override `vendorHash` within `buildGoModule` - headscale = (pkgs.headscale.override { + headscale' = (pkgs.headscale.override { buildGoModule = args: pkgs.buildGoModule (args // rec { version = "0.23.0-alpha12"; src = pkgs.fetchFromGitHub { @@ -36,21 +36,20 @@ in services = { headscale = { enable = true; - package = headscale; settings = { disable_check_updates = true; unix_socket_permission = "0770"; - server_url = "https://ts.${pubDomain}"; + server_url = "https://hs.${pubDomain}"; database = { type = "sqlite3"; sqlite.path = "/var/lib/headscale/db.sqlite3"; }; noise.private_key_path = "/var/lib/headscale/noise_private.key"; prefixes = with lib.my.c.tailscale.prefix; { inherit v4 v6; }; - dns_config = { + dns = { # Use IPs that will route inside the VPN to prevent interception # (e.g. DNS rebinding filtering) - restricted_nameservers = { + nameservers.split = { "${domain}" = pubNameservers; "${lib.my.c.colony.domain}" = with allAssignments.estuary.base; [ ipv4.address ipv6.address @@ -64,7 +63,6 @@ in }; magic_dns = true; base_domain = "ts.${pubDomain}"; - override_local_dns = false; }; oidc = { only_start_if_oidc_is_available = true; @@ -84,7 +82,7 @@ in interfaceName = "tailscale0"; extraUpFlags = [ "--operator=${config.my.user.config.name}" - "--login-server=https://ts.nul.ie" + "--login-server=https://hs.nul.ie" "--netfilter-mode=off" "--advertise-exit-node" "--accept-routes=false" diff --git a/nixos/boxes/colony/vms/shill/containers/chatterbox.nix b/nixos/boxes/colony/vms/shill/containers/chatterbox.nix index cd3a0e3..ab4c849 100644 --- a/nixos/boxes/colony/vms/shill/containers/chatterbox.nix +++ b/nixos/boxes/colony/vms/shill/containers/chatterbox.nix @@ -50,11 +50,6 @@ in group = "matrix-synapse"; }; - "chatterbox/syncv3.env" = { - owner = "matrix-syncv3"; - group = "matrix-syncv3"; - }; - "chatterbox/mautrix-whatsapp.env" = { owner = "mautrix-whatsapp"; group = "mautrix-whatsapp"; @@ -80,32 +75,21 @@ in matrix-synapse.extraGroups = [ "mautrix-whatsapp" ]; - matrix-syncv3 = { - isSystemUser = true; - uid = uids.matrix-syncv3; - group = "matrix-syncv3"; - }; - }; - groups = { - matrix-syncv3.gid = gids.matrix-syncv3; }; + groups = { }; }; systemd = { network.networks."80-container-host0" = networkdAssignment "host0" assignments.internal; - services = { - matrix-sliding-sync.serviceConfig = { - # Needs to be able to read its secrets - DynamicUser = mkForce false; - User = "matrix-syncv3"; - Group = "matrix-syncv3"; - }; - } // (genAttrs [ "mautrix-whatsapp" "mautrix-meta-messenger" "mautrix-meta-instagram" ] (_: { + services = { } // (genAttrs [ "mautrix-whatsapp" "mautrix-meta-messenger" "mautrix-meta-instagram" ] (_: { # ffmpeg needed to convert GIFs to video path = with pkgs; [ ffmpeg ]; })); }; + # TODO/FIXME: https://github.com/NixOS/nixpkgs/issues/336052 + nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; + services = { netdata.enable = true; matrix-synapse = { @@ -193,20 +177,10 @@ in app_service_config_files = [ "/var/lib/heisenbridge/registration.yml" config.age.secrets."chatterbox/doublepuppet.yaml".path - "/var/lib/mautrix-whatsapp/whatsapp-registration.yaml" ]; }; }; - matrix-sliding-sync = { - enable = true; - createDatabase = false; - environmentFile = config.age.secrets."chatterbox/syncv3.env".path; - settings = { - SYNCV3_BINDADDR = "[::]:8009"; - SYNCV3_SERVER = "http://localhost:8008"; - }; - }; heisenbridge = { enable = true; @@ -285,10 +259,12 @@ in avatar = "mxc://maunium.net/ygtkteZsXnGJLJHRchUwYWak"; }; }; - meta.mode = "messenger"; + network = { + mode = "messenger"; + displayname_template = ''{{or .DisplayName .Username "Unknown user"}} (FBM)''; + }; bridge = { username_template = "fbm2_{{.}}"; - displayname_template = ''{{or .DisplayName .Username "Unknown user"}} (FBM)''; personal_filtering_spaces = true; delivery_receipts = true; management_room_text.welcome = "Hello, I'm a Messenger bridge bot."; @@ -331,10 +307,12 @@ in avatar = "mxc://maunium.net/JxjlbZUlCPULEeHZSwleUXQv"; }; }; - meta.mode = "instagram"; + network = { + mode = "instagram"; + displayname_template = ''{{or .DisplayName .Username "Unknown user"}} (IG)''; + }; bridge = { username_template = "ig_{{.}}"; - displayname_template = ''{{or .DisplayName .Username "Unknown user"}} (IG)''; personal_filtering_spaces = true; delivery_receipts = true; management_room_text.welcome = "Hello, I'm an Instagram bridge bot."; diff --git a/nixos/boxes/colony/vms/shill/containers/object.nix b/nixos/boxes/colony/vms/shill/containers/object.nix index 30a7b3f..055cffc 100644 --- a/nixos/boxes/colony/vms/shill/containers/object.nix +++ b/nixos/boxes/colony/vms/shill/containers/object.nix @@ -216,7 +216,7 @@ in atticd = { enable = false; - credentialsFile = config.age.secrets."object/atticd.env".path; + environmentFile = config.age.secrets."object/atticd.env".path; settings = { listen = "[::]:8069"; allowed-hosts = [ "nix-cache.${pubDomain}" ]; diff --git a/nixos/boxes/colony/vms/shill/containers/waffletail.nix b/nixos/boxes/colony/vms/shill/containers/waffletail.nix index 21b9a02..bcbdaa1 100644 --- a/nixos/boxes/colony/vms/shill/containers/waffletail.nix +++ b/nixos/boxes/colony/vms/shill/containers/waffletail.nix @@ -86,7 +86,7 @@ in interfaceName = "tailscale0"; extraUpFlags = [ "--operator=${config.my.user.config.name}" - "--login-server=https://ts.nul.ie" + "--login-server=https://hs.nul.ie" "--netfilter-mode=off" "--advertise-exit-node" "--advertise-routes=${advRoutes}" diff --git a/nixos/boxes/home/palace/vms/sfh/containers/unifi.nix b/nixos/boxes/home/palace/vms/sfh/containers/unifi.nix index 1f1492d..91b63b5 100644 --- a/nixos/boxes/home/palace/vms/sfh/containers/unifi.nix +++ b/nixos/boxes/home/palace/vms/sfh/containers/unifi.nix @@ -56,6 +56,7 @@ in enable = true; openFirewall = true; unifiPackage = pkgs.unifi8; + mongodbPackage = pkgs.mongodb-6_0; }; }; }; diff --git a/nixos/boxes/home/routing-common/default.nix b/nixos/boxes/home/routing-common/default.nix index 591c39a..1ed7d1c 100644 --- a/nixos/boxes/home/routing-common/default.nix +++ b/nixos/boxes/home/routing-common/default.nix @@ -166,7 +166,7 @@ in interfaceName = "tailscale0"; extraUpFlags = [ "--operator=${config.my.user.config.name}" - "--login-server=https://ts.nul.ie" + "--login-server=https://hs.nul.ie" "--netfilter-mode=off" "--advertise-exit-node" "--advertise-routes=${advRoutes}" diff --git a/nixos/boxes/tower/default.nix b/nixos/boxes/tower/default.nix index e16ac28..ae22b24 100644 --- a/nixos/boxes/tower/default.nix +++ b/nixos/boxes/tower/default.nix @@ -14,7 +14,7 @@ cpu = { intel.updateMicrocode = true; }; - opengl.extraPackages = with pkgs; [ + graphics.extraPackages = with pkgs; [ intel-media-driver ]; bluetooth.enable = true; @@ -177,7 +177,7 @@ programs = { fish = { shellAbbrs = { - tsup = "doas tailscale up --login-server=https://ts.nul.ie --accept-routes"; + tsup = "doas tailscale up --login-server=https://hs.nul.ie --accept-routes"; }; }; }; diff --git a/nixos/installer.nix b/nixos/installer.nix index 2e53810..49a3aa3 100644 --- a/nixos/installer.nix +++ b/nixos/installer.nix @@ -61,8 +61,8 @@ }; networking = { - # Will be set dynamically - hostName = ""; + # Will be set dynamically, but need something to satisfy `/etc/os-release` stuff + hostName = "installer"; useNetworkd = false; }; diff --git a/nixos/modules/common.nix b/nixos/modules/common.nix index 894e101..c85d95d 100644 --- a/nixos/modules/common.nix +++ b/nixos/modules/common.nix @@ -12,7 +12,6 @@ in inputs.impermanence.nixosModule inputs.ragenix.nixosModules.age inputs.sharry.nixosModules.default - inputs.attic.nixosModules.atticd ]; config = mkMerge [ diff --git a/secrets/chatterbox/syncv3.env.age b/secrets/chatterbox/syncv3.env.age deleted file mode 100644 index 2d3d49d..0000000 --- a/secrets/chatterbox/syncv3.env.age +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USBQMEJB -VVhIL2ViVUx1Ym9IbFV1UW52NjZYMmJlYmpjY0RuMzhiclJVS0ZnCkY5dEZHTHlC -K29uamorWWNJSVV0VlVJNG1VNm9GQ3VPdldJRDNSODVoOVUKLT4gWDI1NTE5IEM0 -UVQvLzFYRTRRMldWSnNnd3V3aXJTeS8vZ1hkdENYVHk1QVVaQVEyQnMKVmN4OUFH -WCtVSW9tREV5RExycnFJejk5UW91dzd5Rm8vcFBTT0ZCdytFWQotPiBCPC0lLTJW -LS1ncmVhc2UgRSBjOlg5a0pdQSBSb2YKN0pkalY4VlFDMm8vZzJpQUV4TmdSRHA2 -dnB4UzJaWTRXeDdmKzFrUGVMSEFlbFhlNFFycFRQU005d1I2Si9VUQpHbDVxcGxn -SVdjZzduSGluYlZnY3lmZmtnOWJYKzkydDhKU0VCNmNvV0EKLS0tIGdaUkpGNy9P -Y3BGVGVJenJkTG51c3Z3WFU0eTFXT09pSVFseGRLMmxJVU0KhH9EjbL0zv821Yox -FXc54SXGEkq97qPi3xIoPydWd3FbIuftAhe0xPFGfUOO5/zDni4h+PoNJs2hnkOK -kHhxtaOj1S6RulI/eYLK/fJjl2aRrTaRFN0TGhFwz5X8HOQe2+Qrq/9wT7pyzOFU -LsMwe71OhTjA5XrBTawU9QkWjPx2LZyb/WEkzlLOCGoHTUm4X03xY/1UeHVYZt2k -wbLses0JHK1h2ttWnO5y68LovZWJqFdIjoCCkgfo0nNUD5i+e51xEju9OBJMngj+ -LnPb6YCqFh4Fxy09WORD0A== ------END AGE ENCRYPTED FILE-----