diff options
author | polwex <polwex@sortug.com> | 2025-07-26 21:39:11 +0000 |
---|---|---|
committer | polwex <polwex@sortug.com> | 2025-07-26 21:39:11 +0000 |
commit | 7c48432201b2873a04a2e1bcd5aa3a0662558e26 (patch) | |
tree | d1cec8edcecbd482f29d4ec0f94e3ce3b5f91f06 | |
parent | 7c959ef5c9c689c06aa5fe48110cdf6d780a438c (diff) |
hetzner
-rw-r--r-- | flake.lock | 363 | ||||
-rw-r--r-- | hosts/cloud/hetzner/mail.nix | 4 | ||||
-rw-r--r-- | hosts/cloud/hetzner/nginx.nix | 24 | ||||
-rw-r--r-- | hosts/cloud/packages.nix | 1 | ||||
-rw-r--r-- | hosts/local/s15/configuration.nix | 1 |
5 files changed, 168 insertions, 225 deletions
@@ -113,11 +113,11 @@ }, "crane_2": { "locked": { - "lastModified": 1750266157, - "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", + "lastModified": 1752946753, + "narHash": "sha256-g5uP3jIj+STUcfTJDKYopxnSijs2agRg13H0SGL5iE4=", "owner": "ipetkov", "repo": "crane", - "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", + "rev": "544d09fecc8c2338542c57f3f742f1a0c8c71e13", "type": "github" }, "original": { @@ -155,14 +155,14 @@ "flake-compat": "flake-compat", "git-hooks": "git-hooks", "nix": "nix", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752507617, - "narHash": "sha256-BZVFBb8L11prG0xQE1mOpbAbrzPJhlujj7ecY0yiO0g=", + "lastModified": 1753386188, + "narHash": "sha256-x6VQB+z3brzYWscvY/UenGFv+FXc/G/5y1IT1TwtUms=", "owner": "cachix", "repo": "devenv", - "rev": "d26f9cf218d8617168d26f749e02a6d87ea4bc28", + "rev": "a19c43648f108256e442e46dc32d4eee57c71ac3", "type": "github" }, "original": { @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1752541678, - "narHash": "sha256-dyhGzkld6jPqnT/UfGV2oqe7tYn7hppAqFvF3GZTyXY=", + "lastModified": 1753140376, + "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", "owner": "nix-community", "repo": "disko", - "rev": "2bf3421f7fed5c84d9392b62dcb9d76ef09796a7", + "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", "type": "github" }, "original": { @@ -329,11 +329,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -350,11 +350,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -507,7 +507,6 @@ "type": "github" } }, -<<<<<<< Updated upstream "flake-utils_7": { "inputs": { "systems": "systems_7" @@ -526,8 +525,6 @@ "type": "github" } }, -======= ->>>>>>> Stashed changes "git-hooks": { "inputs": { "flake-compat": [ @@ -558,7 +555,7 @@ "inputs": { "flake-compat": "flake-compat_2", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1750779888, @@ -711,15 +708,15 @@ }, "helix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1752426734, - "narHash": "sha256-a434OTO7gxtAnDE6/1JWSf4in3ed24bEYJb0dUSZipE=", + "lastModified": 1753376980, + "narHash": "sha256-h7Say1U7r1ke3mfg3yvbzYnk3izmJ2g1zXzX5APNA8Q=", "owner": "helix-editor", "repo": "helix", - "rev": "6fd1efd1c29f4c0dbdab3a82d961fd5456e0cb1c", + "rev": "4281228da35b02b0dcca3b4772b93d48d79ce046", "type": "github" }, "original": { @@ -752,7 +749,7 @@ }, "homix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1720719665, @@ -785,7 +782,7 @@ }, "kmonad": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "dir": "nix", @@ -808,16 +805,16 @@ "crane": "crane_2", "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1751381593, - "narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=", + "lastModified": 1753349211, + "narHash": "sha256-wGfVht5kOLc9t3GZxEr4IIq5QgHV6nB3w9qqhcVKloo=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f4eb75540307c2b33521322c04b7fea74e48a66f", + "rev": "4775927ef576f6493b79b1d205e42493d6878d47", "type": "github" }, "original": { @@ -832,11 +829,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1752408939, - "narHash": "sha256-FlX55V+xe3rV025aecfJOoukfzCD9Mfp/nXoQweMldI=", + "lastModified": 1753013761, + "narHash": "sha256-ggvjKAeIsjwdu6+ECBGieyBgtotD7BrsGX5BirCacYU=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "134d1f1febcc56bfaff3d0a33cc51a5571b3cb19", + "rev": "f7c04e5ad6aa43a0f9698edb0d74b44e88ee99ee", "type": "github" }, "original": { @@ -848,15 +845,15 @@ "microvm": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "spectrum": "spectrum" }, "locked": { - "lastModified": 1752278584, - "narHash": "sha256-QaT8PpCR1IaUMa12ou2MlvNCzYVWgTQfVWJGXyFvY5c=", + "lastModified": 1753388547, + "narHash": "sha256-zbjlS9sa2BbtE80YA9C9DMXwCADba3NjUROw/7Rpt7Y=", "owner": "astro", "repo": "microvm.nix", - "rev": "f30ae9b9e740116d044935c9c0c68bd1c2ce8432", + "rev": "9694139d7c761e857ac9d025f9110a92cd8f7686", "type": "github" }, "original": { @@ -876,7 +873,10 @@ "devenv", "git-hooks" ], - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], "nixpkgs-23-11": [ "devenv" ], @@ -885,11 +885,11 @@ ] }, "locked": { - "lastModified": 1752251701, - "narHash": "sha256-fkkkwB7jz+14ZdIHAYCCNypO9EZDCKpj7LEQZhV6QJs=", + "lastModified": 1752773918, + "narHash": "sha256-dOi/M6yNeuJlj88exI+7k154z+hAhFcuB8tZktiW7rg=", "owner": "cachix", "repo": "nix", - "rev": "54df04f09cb084b9e58529c0ae6f53f0e50f1a19", + "rev": "031c3cf42d2e9391eee373507d8c12e0f9606779", "type": "github" }, "original": { @@ -922,14 +922,14 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1752373194, - "narHash": "sha256-wr42guldY37FVoFllUNgSavfohWKb/ExIySnzBCswDY=", + "lastModified": 1753435745, + "narHash": "sha256-DcwYM03dorV47ILK9WNF7tmOPQxbEOvPUFPL44yS+SE=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "ad11b470127157e4277a875b0fca4234cca25b78", + "rev": "a73e77822e6e21c9275b484ae4c00e56cb689aec", "type": "github" }, "original": { @@ -1034,11 +1034,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1753122741, + "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", "type": "github" }, "original": { @@ -1059,11 +1059,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1752060039, - "narHash": "sha256-MqcbN/PgfXOv8S4q6GcmlORd6kJZ3UlFNhzCvLOEe4I=", + "lastModified": 1753285640, + "narHash": "sha256-ofa021NeHDXAxg5J8mSnn8rHa393PAlD85ZCetP4Qa0=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "80d21ed7a1ab8007597f7cd9adc26ebc98b9611f", + "rev": "ce87c8a9771d1a20c3fa3b60113b9b0821627dcb", "type": "gitlab" }, "original": { @@ -1076,7 +1076,7 @@ "inputs": { "flake-utils": "flake-utils_5", "nixos-generators": "nixos-generators_2", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -1096,14 +1096,14 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_5", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1752199438, - "narHash": "sha256-xSBMmGtq8K4Qv80TMqREmESCAsRLJRHAbFH2T/2Bf1Y=", + "lastModified": 1752682362, + "narHash": "sha256-ZNIpqCG/CfhmV+TgIeyO/XbhDjSWpwWokHM44j0Mn0w=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "d34d9412556d3a896e294534ccd25f53b6822e80", + "rev": "20001f9bf0aaf2b1c307e43a5eec8cf8f800fe14", "type": "github" }, "original": { @@ -1115,17 +1115,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "lastModified": 1750441195, + "narHash": "sha256-yke+pm+MdgRb6c0dPt8MgDhv7fcBbdjmv1ZceNTyzKg=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "0ceffe312871b443929ff3006960d29b120dc627", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", "type": "github" } }, @@ -1147,28 +1147,16 @@ }, "nixpkgs-darwin": { "locked": { -<<<<<<< Updated upstream - "lastModified": 1752483536, - "narHash": "sha256-RaaMPRtewLITsV0JMIgoTSkSR+Wuu/a/I/Za0hiCes8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1156bb3c3d94de7c6a7dc798b42c98bb975f3a75", -======= - "lastModified": 1735564410, - "narHash": "sha256-HB/FA0+1gpSs8+/boEavrGJH+Eq08/R2wWNph1sM1Dg=", + "lastModified": 1753400184, + "narHash": "sha256-ok5zqdCMXKYOQY4SYL3/FGQVABmMcuIrAmalNizxTVc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1e7a8f391f1a490460760065fa0630b5520f9cf8", ->>>>>>> Stashed changes + "rev": "fabee8e1bcf70fee0cd7dbfdbd2f04ff43e780c9", "type": "github" }, "original": { "owner": "nixos", -<<<<<<< Updated upstream "ref": "nixpkgs-25.05-darwin", -======= - "ref": "nixpkgs-24.05-darwin", ->>>>>>> Stashed changes "repo": "nixpkgs", "type": "github" } @@ -1205,11 +1193,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1752369545, + "lastModified": 1752974445, "narHash": "sha256-jj/HBJFSapTk4LfeJgNLk2wEE2BO6dgBYVRbXMNOCeM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "65d21753676aaf55d8e67249138ab1286599a62b", + "rev": "9100109c11b6b5482ea949c980b86e24740dca08", "type": "github" }, "original": { @@ -1218,7 +1206,6 @@ "type": "github" } }, -<<<<<<< Updated upstream "nixpkgs-old": { "locked": { "lastModified": 1751274312, @@ -1237,43 +1224,30 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1752308619, - "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058", -======= - "nixpkgs-stable": { - "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", ->>>>>>> Stashed changes + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { "owner": "nixos", -<<<<<<< Updated upstream "ref": "nixos-25.05", -======= - "ref": "nixos-24.05", ->>>>>>> Stashed changes "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unfree": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1752157431, - "narHash": "sha256-2hXKttg+ja/CJdibgRUZVg4vuopwfJ1XO25aTPQ+t50=", + "lastModified": 1753367047, + "narHash": "sha256-LZTfxd2QObgFmLcM8pGB8DJR7X6xnF8OuH1SuuG3w60=", "owner": "numtide", "repo": "nixpkgs-unfree", - "rev": "176afe59412399703877c42a9a528f7faf9cc967", + "rev": "0e54f984d3c8cfff8b9e8c4595f1276fbb4c1e54", "type": "github" }, "original": { @@ -1292,19 +1266,11 @@ ] }, "locked": { -<<<<<<< Updated upstream - "lastModified": 1752562123, - "narHash": "sha256-vFgilSNwK5BFyKHb252VmUDY096qwOHlHF424xJxA1Q=", - "owner": "nix-community", - "repo": "nixpkgs-wayland", - "rev": "2a1fbe8df21216eaff2ccf3a60ab94a33838ba97", -======= - "lastModified": 1752547084, - "narHash": "sha256-lgHLCehVd9Y7BOQ3Q5x2IpeYh/xYVj/LSS/PSeeNx50=", + "lastModified": 1753412678, + "narHash": "sha256-GZD/SbD1GXYFFZQdSu/eF6Gr9lsigPoJPsD4nuqx/2I=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "230a740fc870ba7b23f6c35eeb43e881479a059f", ->>>>>>> Stashed changes + "rev": "f8882d1b856d5cc8a7b288627cd8e7e935fe1978", "type": "github" }, "original": { @@ -1315,22 +1281,6 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { "lastModified": 1751792365, "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", @@ -1345,13 +1295,13 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -1361,13 +1311,13 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -1375,13 +1325,13 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -1393,22 +1343,6 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750441195, - "narHash": "sha256-yke+pm+MdgRb6c0dPt8MgDhv7fcBbdjmv1ZceNTyzKg=", - "owner": "cachix", - "repo": "devenv-nixpkgs", - "rev": "0ceffe312871b443929ff3006960d29b120dc627", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "rolling", - "repo": "devenv-nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { "lastModified": 1730768919, "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", "owner": "NixOS", @@ -1423,7 +1357,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1740560979, "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", @@ -1439,7 +1373,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1719690277, "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", @@ -1455,7 +1389,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1744157173, "narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=", @@ -1471,13 +1405,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { - "lastModified": 1751203939, - "narHash": "sha256-omYD+H5LlSihz2DRfv90I8Oeo7JNEwvcHPHX+6nMIM4=", + "lastModified": 1753004467, + "narHash": "sha256-QznRD2YNqBVT+LjrV36rIuOZO1XKbjm1BgtMTIrTDVg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "650e71cbf76de8dd16f5648a96981b726c4ef8fe", + "rev": "147633ad35aba48f75af49be7ddc956c71c35acc", "type": "github" }, "original": { @@ -1487,7 +1421,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1746904237, "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", @@ -1503,13 +1437,13 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { - "lastModified": 1752012998, - "narHash": "sha256-Q82Ms+FQmgOBkdoSVm+FBpuFoeUAffNerR5yVV7SgT8=", + "lastModified": 1752900028, + "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2a2130494ad647f953593c4e84ea4df839fbd68c", + "rev": "6b4955211758ba47fac850c040a27f23b9b4008f", "type": "github" }, "original": { @@ -1519,25 +1453,33 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_13" }, "locked": { -<<<<<<< Updated upstream - "lastModified": 1752575257, - "narHash": "sha256-34S3op5XjbcHahifCUkzxOL0t6YkRzJaj5PXI8tEz6k=", - "owner": "nix-community", - "repo": "NUR", - "rev": "b4815529806b1e30a4e6c66c1091e010e0a4c2b8", -======= - "lastModified": 1752555807, - "narHash": "sha256-uPf6vXeHq/npoRt6gkcoajX6KtfBO1ATmQ0LbxJBc3o=", + "lastModified": 1753439232, + "narHash": "sha256-bM3f3Ew4gQXIte1A5ye5aqACPciRBPmDKlzv9XbXmAs=", "owner": "nix-community", "repo": "NUR", - "rev": "5dfd4f5779c92e6031346e444b61ae6023239092", ->>>>>>> Stashed changes + "rev": "bd271565c4d5c4d12ec920ed8ec83ecb0263e6c9", "type": "github" }, "original": { @@ -1546,7 +1488,6 @@ "type": "github" } }, -<<<<<<< Updated upstream "openai-codex": { "inputs": { "flake-utils": "flake-utils_7", @@ -1556,11 +1497,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1752529892, - "narHash": "sha256-vTe5ipzKp0gsDHW7SItdoPrIoWo9ZGlHoAjrIs5aFPQ=", + "lastModified": 1753433800, + "narHash": "sha256-8xkya+4cK1vbg4lA0hFNQvOUp4OAobh2ZI2IFHZCeuo=", "owner": "openai", "repo": "codex", - "rev": "f14b5adabf5db34864c44c1ffc6c566b018fe0cc", + "rev": "480e82b00daaf038afdd2e3304ee3b801f3661cf", "type": "github" }, "original": { @@ -1569,16 +1510,14 @@ "type": "github" } }, -======= ->>>>>>> Stashed changes "polybar-themes": { "flake": false, "locked": { - "lastModified": 1750950071, - "narHash": "sha256-Hanx8zEueKvI4jBrcUQIo6GnkzcS2TgsixBLS8V9ZKM=", + "lastModified": 1752591678, + "narHash": "sha256-POy0SUzc0ksi+dcj+SYAoHlbPs3famGXSVNizlaHOMw=", "owner": "adi1090x", "repo": "polybar-themes", - "rev": "ccf23ef328f1e988650487c40678c6953038e2b2", + "rev": "42c29530904294d7cb75c525c492c5e0f01c4bfd", "type": "github" }, "original": { @@ -1668,20 +1607,14 @@ "nixos-mailserver": "nixos-mailserver", "nixos-rk3588": "nixos-rk3588", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "nixpkgs-darwin": "nixpkgs-darwin", -<<<<<<< Updated upstream "nixpkgs-old": "nixpkgs-old", -======= ->>>>>>> Stashed changes "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unfree": "nixpkgs-unfree", "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", -<<<<<<< Updated upstream "openai-codex": "openai-codex", -======= ->>>>>>> Stashed changes "polybar-themes": "polybar-themes", "waybar": "waybar", "windsurf": "windsurf", @@ -1740,11 +1673,11 @@ ] }, "locked": { - "lastModified": 1751165203, - "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", + "lastModified": 1752979888, + "narHash": "sha256-qRRP3QavbwW0o+LOh31QNEfCgPlzK5SKlWALUJL6T7E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", + "rev": "95719de18aefa63a624bf75a1ff98744b089ec12", "type": "github" }, "original": { @@ -1753,7 +1686,6 @@ "type": "github" } }, -<<<<<<< Updated upstream "rust-overlay_4": { "inputs": { "nixpkgs": [ @@ -1775,8 +1707,6 @@ "type": "github" } }, -======= ->>>>>>> Stashed changes "spectrum": { "flake": false, "locked": { @@ -1883,7 +1813,6 @@ "type": "github" } }, -<<<<<<< Updated upstream "systems_7": { "locked": { "lastModified": 1681028828, @@ -1899,8 +1828,6 @@ "type": "github" } }, -======= ->>>>>>> Stashed changes "waybar": { "inputs": { "flake-compat": "flake-compat_7", @@ -1909,11 +1836,11 @@ ] }, "locked": { - "lastModified": 1752390446, - "narHash": "sha256-OcVcNM7Jt1E1/5HfPEXAodeJ4z8rvsR+1eY5OUYCt1I=", + "lastModified": 1753252308, + "narHash": "sha256-rwN74KZdAQVLdengxHpUwkyaZTdoRzFjJ3SSr6rx2/o=", "owner": "alexays", "repo": "waybar", - "rev": "94777921d96c2657c37c7d83a18f13968df486de", + "rev": "0776e694df56c2c849b682369148210d81324e93", "type": "github" }, "original": { @@ -1929,11 +1856,7 @@ ] }, "locked": { -<<<<<<< Updated upstream - "lastModified": 1740186345, -======= - "lastModified": 1741246078, ->>>>>>> Stashed changes + "lastModified": 1742369403, "narHash": "sha256-Qox5x+FI4OhCs/7T/v4hZlR9Rm7ZfpXP7ISy+OrHCyw=", "path": "/home/y/nixconf/derivations/windsurf", "type": "path" @@ -1965,11 +1888,7 @@ ] }, "locked": { -<<<<<<< Updated upstream - "lastModified": 1740469068, -======= - "lastModified": 1747476774, ->>>>>>> Stashed changes + "lastModified": 1747466629, "narHash": "sha256-uoitiN9zrv9QaGf8mKIXhRxXtsNi6MupZVK+Zy3jOoA=", "path": "/home/y/nixconf/derivations/yek", "type": "path" @@ -1986,11 +1905,11 @@ ] }, "locked": { - "lastModified": 1752293576, - "narHash": "sha256-84tAzrC/kioWRmG0jLt1HWRP/wHON7zjLtXCwWRNI/g=", + "lastModified": 1753417134, + "narHash": "sha256-hxT+4xR0BCfgdrTM8+GJFpT4ze54e+oZeXlAbybs4cQ=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "1a40cdcb093a0025631ef692caa53130f821dd77", + "rev": "02e2b14e78a87dc4d0a4c401367992d58636c6f0", "type": "github" }, "original": { diff --git a/hosts/cloud/hetzner/mail.nix b/hosts/cloud/hetzner/mail.nix index deab818..9ef4de8 100644 --- a/hosts/cloud/hetzner/mail.nix +++ b/hosts/cloud/hetzner/mail.nix @@ -35,7 +35,7 @@ protocol = "imap"; }; jmap = { - bind = "[::]:88888"; + bind = "[::]:8888"; url = "https://mail.urbit.cloud"; protocol = "jmap"; }; @@ -61,7 +61,7 @@ principals = [ { class = "individual"; - name = "User 1"; + name = "polwex"; secret = "%{file:/etc/stalwart/mail-pw1}%"; email = ["polwex@urbit.cloud"]; } diff --git a/hosts/cloud/hetzner/nginx.nix b/hosts/cloud/hetzner/nginx.nix index 1077e71..2e88843 100644 --- a/hosts/cloud/hetzner/nginx.nix +++ b/hosts/cloud/hetzner/nginx.nix @@ -25,12 +25,34 @@ proxy_cache off; ''; }; + # virtualHosts."bridge.urbit.cloud" = { + # enableACME = true; + # forceSSL = true; + # locations."/" = { + # proxyPass = "http://127.0.0.1:4444"; + # # proxyWebsockets = true; # needed if you need to use WebSocket + # extraConfig = '' + # proxy_set_header Host $host; + # proxy_set_header Forwarded $proxy_add_x_forwarded_for; + # ''; + # }; + # extraConfig = '' + # chunked_transfer_encoding off; + # proxy_http_version 1.1; + # proxy_buffering off; + # proxy_cache off; + # ''; + # }; virtualHosts."webmail.urbit.cloud" = { enableACME = true; forceSSL = true; + serverAliases = [ + "mail.urbit.cloud" + "mta-sts.urbit.cloud" + ]; locations."/" = { proxyPass = "http://127.0.0.1:8888"; - # proxyWebsockets = true; # needed if you need to use WebSocket + proxyWebsockets = true; # needed if you need to use WebSocket extraConfig = '' proxy_set_header Host $host; proxy_set_header Forwarded $proxy_add_x_forwarded_for; diff --git a/hosts/cloud/packages.nix b/hosts/cloud/packages.nix index 64f2c95..89b7979 100644 --- a/hosts/cloud/packages.nix +++ b/hosts/cloud/packages.nix @@ -53,5 +53,6 @@ # databases # postgresql # sqlite + devenv ]; } diff --git a/hosts/local/s15/configuration.nix b/hosts/local/s15/configuration.nix index 20efcb5..8e06c2f 100644 --- a/hosts/local/s15/configuration.nix +++ b/hosts/local/s15/configuration.nix @@ -33,6 +33,7 @@ ../../editors.nix ../../pkgs.nix ../../server.nix + # ../../network.nix # ../../gpg.nix ]; environment.systemPackages = [ |