Merge branch 'main' of ssh://git.0x76.dev:42/v/infrastructure

nixos/hosts/hades/rtorrent/configuration.nix

@@ -30,14 +30,14 @@ in {
   in {
     wg0 = {
       address = [ "10.66.153.191/32" "fc00:bbbb:bbbb:bb01::3:99be/128" ];
-      dns = [ "193.138.218.74" ];
+      dns = [ "10.64.0.1" ];
       privateKeyFile = "${vs.rtorrent}/wireguardKey";
       postUp = "${postUpScript}/bin/post_up || true";
 
       peers = [{
-        publicKey = "hnRorSW0YHlHAzGb4Uc/sjOqQIrqDnpJnTQi/n7Rp1c=";
+        publicKey = "DVui+5aifNFRIVDjH3v2y+dQ+uwI+HFZOd21ajbEpBo=";
         allowedIPs = [ "0.0.0.0/0" "::/0" ];
-        endpoint = "185.65.134.223:51820";
+        endpoint = "185.65.134.82:51820";
         persistentKeepalive = 25;
       }];
     };

nixos/hosts/thalassa/aoife/README.md

@@ -5,11 +5,18 @@ This is the NixOS config for my laptop `aoife`.
 This is a Thinkpad Z16 Gen 1.
 
 **CPU**: AMD Ryzen 9 PRO 6950H (16 cores) @ 4.935GHz
+
 **RAM**: 32GB LPDDR5 6400MHz
+
 **SCREEN**: 16" 3840 x 2400 OLED
+
 **GPU**: AMD Radeon™ RX 6500M, 4 GB, GDDR6
 
+
 ## Software
 **OS**: NixOS
+
 **DE**: Gnome
+
 **Shell**: ZSH (grml)
+

nixos/pkgs/glitch-soc/default.nix

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     yarnOfflineCache = fetchYarnDeps {
       yarnLock = "${src}/yarn.lock";
     #   sha256 = lib.fakeSha256;
-      sha256 = "sha256-ObCGLw7R6wvq8GQj5MHa/0KV2TYABdNC4sQQ3x1YoQE=";
+     sha256 = "sha256-LfpNEZAV4xCiPDQrSOezgRqOLQgDqMplIbu48dOlk3k=";
     };
 
     nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodon-gems mastodon-gems.wrappedRuby ];

nixos/pkgs/glitch-soc/source.nix

@@ -2,8 +2,8 @@
 { fetchgit, applyPatches }: let
   src = fetchgit {
     url = "https://github.com/glitch-soc/mastodon.git";
-    rev = "ee4250545236e4330c46b43f4abfe94ad323d4d4";
-    sha256 = "12rwz4dy107p711d1pj33lsd32fwns0b2nif755mwrz0vzp29gr6";
+    rev = "00fe0f6cb4a736bbb5e633c567ddf7ac9a09ce69";
+    sha256 = "1shpwdxf2cjm0bqlsnarm6x3h7db784r7qda80bqy3ki5w65lwaf";
   };
 in applyPatches {
   inherit src;

nixos/pkgs/glitch-soc/version.nix

@@ -1 +1 @@
-"4.1.0"
+"4.1.1"