diff --git a/flake.lock b/flake.lock index cd264159..3536e033 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,7 @@ "nodes": { "alejandra": { "inputs": { - "fenix": "fenix_3", + "fenix": "fenix_2", "flakeCompat": "flakeCompat", "nixpkgs": [ "webcord", @@ -65,11 +65,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1711386353, - "narHash": "sha256-gWEpb8Hybnoqb4O4tmpohGZk6+aerAbJpywKcFIiMlg=", + "lastModified": 1728263678, + "narHash": "sha256-gyUVsPAWY9AgVKjrNPoowrIr5BvK4gI0UkDXvv8iSxA=", "owner": "zhaofengli", "repo": "colmena", - "rev": "cd65ef7a25cdc75052fbd04b120aeb066c3881db", + "rev": "b0a62f234fae02a006123e661ff70e62af16106b", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1725498219, - "narHash": "sha256-Fk7fHaPVBtfQe+iZJ2NeUFYyJQJysxWU/74LG9vWjPI=", + "lastModified": 1729107833, + "narHash": "sha256-ZlBvb0LAkTxF/jQvSwRk/USx0sJmvvmBICLd6JM92q8=", "owner": "nix-community", "repo": "comma", - "rev": "e77d5799da844bdc7f2c0ee8d48d166c3119a2c4", + "rev": "dd41970e949b3e41d6dbf306f5511d8e52da712a", "type": "github" }, "original": { @@ -100,18 +100,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "lastModified": 1730060262, + "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", "owner": "ipetkov", "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", "type": "github" }, "original": { @@ -143,11 +137,11 @@ "utils": "utils_2" }, "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": { @@ -164,11 +158,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -246,34 +240,12 @@ } }, "fenix": { - "inputs": { - "nixpkgs": [ - "microvm", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1722580276, - "narHash": "sha256-VaNcSh7n8OaFW/DJsR6Fm23V+EGpSei0DyF71RKB+90=", - "owner": "nix-community", - "repo": "fenix", - "rev": "286f371b3cfeaa5c856c8e6dfb893018e86cc947", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_2": { "inputs": { "nixpkgs": [ "riff", "nixpkgs" ], - "rust-analyzer-src": "rust-analyzer-src_2" + "rust-analyzer-src": "rust-analyzer-src" }, "locked": { "lastModified": 1686896497, @@ -289,7 +261,7 @@ "type": "github" } }, - "fenix_3": { + "fenix_2": { "inputs": { "nixpkgs": [ "webcord", @@ -297,7 +269,7 @@ "alejandra", "nixpkgs" ], - "rust-analyzer-src": "rust-analyzer-src_3" + "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { "lastModified": 1657607339, @@ -431,11 +403,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -452,11 +424,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -554,11 +526,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -572,11 +544,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -652,11 +624,11 @@ ] }, "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -718,7 +690,7 @@ "lastModified": 1711359349, "narHash": "sha256-dSHWgOtipLWgSSZFq9tvlaQF9b8Jfk/2mYCX4QS4x50=", "ref": "refs/heads/main", - "rev": "1017642795eb398881eff78a822621f2d2a93be7", + "rev": "06279869e7a26dc91ca3e3abb84a3508d7f977cb", "revCount": 10, "type": "git", "url": "https://git.0x76.dev/v/gnome-autounlock-keyring.git" @@ -751,11 +723,11 @@ ] }, "locked": { - "lastModified": 1725628988, - "narHash": "sha256-Y6TBMTGu4bddUwszGjlcOuN0soVc1Gv43hp+1sT/GNI=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "127ccc3eb7e36fa75e8c3fbd8a343154f66cc1c6", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -772,11 +744,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -785,6 +757,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729544999, + "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "65c207c92befec93e22086da9456d3906a4e999c", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.5", + "repo": "ixx", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -797,11 +797,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725379389, - "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", + "lastModified": 1730107060, + "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", + "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2", "type": "github" }, "original": { @@ -850,17 +850,16 @@ }, "microvm": { "inputs": { - "fenix": "fenix", "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_6", "spectrum": "spectrum" }, "locked": { - "lastModified": 1725388988, - "narHash": "sha256-hjO/ZpmaXUHUzTSefzbj0Bosj6inFHRplbb+YqQQULc=", + "lastModified": 1730167839, + "narHash": "sha256-V9ON7dVdjBg8mwx78chSSyBZsw+Q8m+HO9UfUOIo9L8=", "owner": "astro", "repo": "microvm.nix", - "rev": "d52082cc2668b8cd788e3133526c8693ee71f6a5", + "rev": "46ed88edeee85cb80063c1a511318fe39f9f846f", "type": "github" }, "original": { @@ -920,11 +919,11 @@ ] }, "locked": { - "lastModified": 1724561770, - "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", + "lastModified": 1729982130, + "narHash": "sha256-HmLLQbX07rYD0RXPxbf3kJtUo66XvEIX9Y+N5QHQ9aY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", + "rev": "2eb472230a5400c81d9008014888b4bff23bcf44", "type": "github" }, "original": { @@ -951,11 +950,11 @@ }, "nixlib": { "locked": { - "lastModified": 1725152544, - "narHash": "sha256-Tm344cnFM9f2YZsgWtJduvhIrvLr3Bi8J4Xc+UZDKYE=", + "lastModified": 1729386149, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "7f0b9e4fbd91826cb9ce6babbc11c87903191051", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "type": "github" }, "original": { @@ -972,11 +971,11 @@ ] }, "locked": { - "lastModified": 1725497951, - "narHash": "sha256-fayKyVs/9FQdYH+3SCOkQM1GCsEPPVE+lSiVGlYQ7i0=", + "lastModified": 1729472750, + "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "15a07ebf4a041bf232026263f1f96f2af390f3bc", + "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", "type": "github" }, "original": { @@ -987,11 +986,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725477728, - "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", + "lastModified": 1730161780, + "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", + "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8", "type": "github" }, "original": { @@ -1002,11 +1001,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -1178,11 +1177,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { @@ -1194,11 +1193,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1725432240, - "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad416d066ca1222956472ab7d0555a6946746a80", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -1209,11 +1208,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -1267,11 +1266,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725631974, - "narHash": "sha256-7r3WWcombWthNv28cHRzNChG3Jt6a3Wdp/zq1HsCQRg=", + "lastModified": 1730150629, + "narHash": "sha256-5afcjZhCy5EcCdNGKTPoUdywm2yppTSf7GwX/2Rq6Ig=", "owner": "pta2002", "repo": "nixvim", - "rev": "9a156ae60cacce99bdec4d94275f38e7d5ca12fe", + "rev": "a4c3ad01cd0755dd1e93473d74efdd89a1cf5999", "type": "github" }, "original": { @@ -1282,11 +1281,11 @@ }, "nur": { "locked": { - "lastModified": 1725643706, - "narHash": "sha256-W3T6S6HW1gJBgxoELQS6dAkSMYUo4ZgnlI5vUOZ0MtU=", + "lastModified": 1730186143, + "narHash": "sha256-5wi2z2JQp6jhGu1YB1CI0jmLt1knjh8LGQ8lkU0DJgs=", "owner": "nix-community", "repo": "NUR", - "rev": "9e5f0ee9815088b03c619b3f10e8cc944faffae9", + "rev": "47b74dec0590af547549be4d70d43d8245ef3832", "type": "github" }, "original": { @@ -1298,17 +1297,18 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_5", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1724584782, - "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", + "lastModified": 1730044642, + "narHash": "sha256-DbyV9l3hkrSWcN34S6d9M4kAFss0gEHGtjqqMdG9eAs=", "owner": "NuschtOS", "repo": "search", - "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", + "rev": "e373332c1f8237fc1263901745b0fe747228c8ba", "type": "github" }, "original": { @@ -1375,11 +1375,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -1390,7 +1390,7 @@ }, "riff": { "inputs": { - "fenix": "fenix_2", + "fenix": "fenix", "naersk": "naersk_2", "nixpkgs": "nixpkgs_9" }, @@ -1432,23 +1432,6 @@ } }, "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1722521768, - "narHash": "sha256-FvJ4FaMy1kJbZ3Iw1RyvuiUAsbHJXoU2HwylzaFzj1o=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "f149dc5029d8406fae8b2c541603bcac06e30deb", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-analyzer-src_2": { "flake": false, "locked": { "lastModified": 1686818168, @@ -1465,7 +1448,7 @@ "type": "github" } }, - "rust-analyzer-src_3": { + "rust-analyzer-src_2": { "flake": false, "locked": { "lastModified": 1657557289, @@ -1490,11 +1473,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1729996302, + "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", "type": "github" }, "original": { @@ -1506,11 +1489,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1720264467, - "narHash": "sha256-xzM92n3Q9L90faJIJrkrTtTx+JqCGRHMkHWztkV4PuY=", + "lastModified": 1729945407, + "narHash": "sha256-iGNMamNOAnVTETnIVqDWd6fl74J8fLEi1ejdZiNjEtY=", "ref": "refs/heads/main", - "rev": "fb59d42542049f586c84b0f8bb86ff3be338e9d3", - "revCount": 674, + "rev": "f1d94ee7029af18637dbd5fdf4749621533693fa", + "revCount": 764, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, @@ -1521,16 +1504,16 @@ }, "stable": { "locked": { - "lastModified": 1696039360, - "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1648,11 +1631,11 @@ ] }, "locked": { - "lastModified": 1724833132, - "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", + "lastModified": 1730025913, + "narHash": "sha256-Y9NtFmP8ciLyRsopcCx1tyoaaStKeq+EndwtGCgww7I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", + "rev": "bae131e525cc8718da22fbeb8d8c7c43c4ea502a", "type": "github" }, "original": { @@ -1722,11 +1705,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1683013874, - "narHash": "sha256-B8bQb9IMkrDvtqFUoF/PuBma8Qa2jU7Xv7cFSchg9V8=", + "lastModified": 1729410873, + "narHash": "sha256-gWcGwGxRSsHtVXGEaCw1bhmqnJaVIjbxJkt98F9HxLE=", "ref": "refs/heads/main", - "rev": "91e7262e87878609c2d6619210988b241e8f8f62", - "revCount": 11, + "rev": "f05093a8d608892d2e4499e02117428b405f82a1", + "revCount": 12, "type": "git", "url": "https://git.0x76.dev/v/vault-unseal.git" }, diff --git a/nixos/hosts/hades/mastodon/configuration.nix b/nixos/hosts/hades/mastodon/configuration.nix index cec0219b..ef981183 100644 --- a/nixos/hosts/hades/mastodon/configuration.nix +++ b/nixos/hosts/hades/mastodon/configuration.nix @@ -8,7 +8,6 @@ in { networking.interfaces.eth0.useDHCP = true; # Better cache hits - environment.noXlibs = lib.mkForce false; services = { elasticsearch = { enable = true; @@ -84,6 +83,8 @@ in { AUTHORIZED_FETCH = "true"; + MAX_TOOT_CHARS = "8192"; + # https://github.com/cybrespace/cybrespace-meta/blob/master/s3.md; # https://shivering-isles.com/Mastodon-and-Amazon-S3 S3_ENABLED = "true"; diff --git a/nixos/hosts/hades/storage/configuration.nix b/nixos/hosts/hades/storage/configuration.nix index fa7fbae5..6b632346 100644 --- a/nixos/hosts/hades/storage/configuration.nix +++ b/nixos/hosts/hades/storage/configuration.nix @@ -6,9 +6,35 @@ ./fs.nix ]; - boot.loader.systemd-boot.enable = true; services = { + scrutiny = { + enable = true; + openFirewall = true; + influxdb.enable = true; + collector.enable = true; + collector.settings = { + host.id = "storage-vm"; + devices = [ + { + device = "/dev/disk/by-id/ata-QEMU_HARDDISK_QM00013"; + ignore = true; + } + { + device = "/dev/disk/by-id/ata-QEMU_HARDDISK_QM00015"; + ignore = true; + } + { + device = "/dev/disk/by-id/ata-QEMU_HARDDISK_QM00017"; + ignore = true; + } + { + device = "/dev/disk/by-id/ata-QEMU_HARDDISK_QM00019"; + ignore = true; + } + ]; + }; + }; # Enable the OpenSSH daemon. openssh.enable = true; @@ -55,6 +81,18 @@ }; }; + users.groups.backup = { + gid = 10000; + members = [ "vivian" "syncthing" ]; + }; + + services.syncthing = { + enable = true; + openDefaultPorts = true; + guiAddress = "0.0.0.0:8384"; + group = "backup"; + }; + # Disable firewall, as NFS makes it annoying networking.firewall.enable = false; diff --git a/nixos/hosts/olympus/mailserver/configuration.nix b/nixos/hosts/olympus/mailserver/configuration.nix index c434d166..2515dab8 100644 --- a/nixos/hosts/olympus/mailserver/configuration.nix +++ b/nixos/hosts/olympus/mailserver/configuration.nix @@ -48,11 +48,12 @@ in { aliases = [ "postmaster@0x76.dev" "abuse@0x76.dev" - - "v@meowy.tech" "abuse@meowy.tech" "postmaster@meowy.tech" + "abuse@xirion.net" + "postmaster@xirion.net" + "@meowy.tech" "@xirion.net" "@0x76.dev" ]; diff --git a/nixos/hosts/olympus/mosquitto/configuration.nix b/nixos/hosts/olympus/mosquitto/configuration.nix index 56cb9b65..de79e2c9 100644 --- a/nixos/hosts/olympus/mosquitto/configuration.nix +++ b/nixos/hosts/olympus/mosquitto/configuration.nix @@ -3,8 +3,10 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { config, pkgs, ... }: -let mosquittoPort = 1883; -in { +let + mosquittoPort = 1883; +in +{ imports = [ ]; # This value determines the NixOS release from which the default @@ -20,15 +22,21 @@ in { services.mosquitto = { enable = true; - listeners = [{ - port = mosquittoPort; - settings.allow_anonymous = true; - acl = [ "topic readwrite #" ]; - users = { - vivian = { acl = [ "readwrite #" ]; }; - zigbee2mqtt = { acl = [ "readwrite #" ]; }; - }; - }]; + listeners = [ + { + port = mosquittoPort; + settings.allow_anonymous = true; + acl = [ "topic readwrite #" ]; + users = { + vivian = { + acl = [ "readwrite #" ]; + }; + zigbee2mqtt = { + acl = [ "readwrite #" ]; + }; + }; + } + ]; }; @@ -39,7 +47,9 @@ in { homeassistant = true; permit_join = false; - serial = { port = "/dev/ttyUSB0"; }; + serial = { + port = "/dev/ttyUSB0"; + }; mqtt = { base_topic = "zigbee2mqtt"; @@ -47,10 +57,14 @@ in { user = "zigbee2mqtt"; }; - frontend = { port = 8080; }; + frontend = { + port = 8080; + }; }; }; - networking.firewall.allowedTCPPorts = - [ mosquittoPort config.services.zigbee2mqtt.settings.frontend.port ]; + networking.firewall.allowedTCPPorts = [ + mosquittoPort + config.services.zigbee2mqtt.settings.frontend.port + ]; } diff --git a/nixos/hosts/olympus/nginx/configuration.nix b/nixos/hosts/olympus/nginx/configuration.nix index 9eba8dd9..6c90493c 100644 --- a/nixos/hosts/olympus/nginx/configuration.nix +++ b/nixos/hosts/olympus/nginx/configuration.nix @@ -5,9 +5,9 @@ let base_url = "https://chat.meowy.tech"; server_name = "meowy.tech"; }; - "org.matrix.msc3575.proxy" = { - "url" = "https://sliding-chat.meowy.tech"; - }; + # "org.matrix.msc3575.proxy" = { + # "url" = "https://sliding-chat.meowy.tech"; + # }; }; serverConfig."m.server" = "chat.meowy.tech:443"; mkWellKnown = data: '' @@ -127,7 +127,7 @@ in return 303 https://element.chat.meowy.tech; ''; "= /.well-known/matrix/client".extraConfig = mkWellKnown clientConfig; - "= /_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://synapse.olympus:8009"; + # "= /_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://synapse.olympus:8009"; "/_matrix".proxyPass = "http://synapse.olympus:8008"; "/_synapse/client".proxyPass = "http://synapse.olympus:8008"; "/_synapse/admin" = { @@ -146,11 +146,11 @@ in }; }; }; - "sliding-chat.meowy.tech" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://synapse.olympus:8009"; - }; + # "sliding-chat.meowy.tech" = { + # enableACME = true; + # forceSSL = true; + # locations."/".proxyPass = "http://synapse.olympus:8009"; + # }; "element.chat.meowy.tech" = { enableACME = true; forceSSL = true; diff --git a/nixos/hosts/olympus/synapse/configuration.nix b/nixos/hosts/olympus/synapse/configuration.nix index 89bbbb76..35c9ce4e 100644 --- a/nixos/hosts/olympus/synapse/configuration.nix +++ b/nixos/hosts/olympus/synapse/configuration.nix @@ -43,7 +43,7 @@ in }; services.matrix-sliding-sync = { - enable = true; + enable = false; createDatabase = true; environmentFile = "${vs.synapse}/sync"; settings = { diff --git a/nixos/pkgs/plex-pass/sources.json b/nixos/pkgs/plex-pass/sources.json index 7aee0d60..9b5024d2 100644 --- a/nixos/pkgs/plex-pass/sources.json +++ b/nixos/pkgs/plex-pass/sources.json @@ -1,14 +1,14 @@ [ { - "version": "1.41.0.8930", + "version": "1.41.0.8992", "platform": "aarch64-linux", - "url": "https://downloads.plex.tv/plex-media-server-new/1.41.0.8930-056c2ed26/debian/plexmediaserver_1.41.0.8930-056c2ed26_arm64.deb", - "hash": "1l06c005zxr4w9jqq2rj98gv9jbch10wppg5cvw6g2p0bs661ar5" + "url": "https://downloads.plex.tv/plex-media-server-new/1.41.0.8992-8463ad060/debian/plexmediaserver_1.41.0.8992-8463ad060_arm64.deb", + "hash": "1hv8bg2cy1s6cn1yp5s75kma5v2fr3dncbslglvpn3srba1xafgz" }, { - "version": "1.41.0.8930", + "version": "1.41.0.8992", "platform": "x86_64-linux", - "url": "https://downloads.plex.tv/plex-media-server-new/1.41.0.8930-056c2ed26/debian/plexmediaserver_1.41.0.8930-056c2ed26_amd64.deb", - "hash": "0fvmi7pym3lqp5v2358srq9v4q85mw8j42hzic9grnkiddwgpzr9" + "url": "https://downloads.plex.tv/plex-media-server-new/1.41.0.8992-8463ad060/debian/plexmediaserver_1.41.0.8992-8463ad060_amd64.deb", + "hash": "0gwwlh47rfnayra3k8lwi794wiayl30crjjvzhqkg5zad77lkl4m" } ]