aaa

2023-07-14 14:29:09 +03:00 · 2023-07-14 14:29:09 +03:00 · 47eb04eee0
commit 47eb04eee0
parent 7ac9ae504d
9 changed files with 145 additions and 24 deletions
--- a/flake.lock
+++ b/flake.lock
@ -138,11 +138,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1680688749,
-        "narHash": "sha256-j+jnjBbWMCbjxwIA0oh7Qwwg5e009kGWBqrCj9hQ9nY=",
+        "lastModified": 1688999735,
+        "narHash": "sha256-pJNcfOVM9TBDblSRIviXmuLLm+w/gtjhxWfLYPK0beI=",
        "owner": "famedly",
        "repo": "conduit",
-        "rev": "1b9e63f4269988a957a2e376355b2dacd2295c08",
+        "rev": "ad06d475debc9657d36414bebb5a28f1ba3efcc7",
        "type": "gitlab"
      },
      "original": {
@ -181,11 +181,11 @@
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1680584903,
-        "narHash": "sha256-uraq+D3jcLzw/UVk0xMHcnfILfIMa0DLrtAEq2nNlxU=",
+        "lastModified": 1686621798,
+        "narHash": "sha256-FUwWszmSiDzUdTk8f69xwMoYlhdPaLvDaIYOE/y6VXc=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "65d3f6a3970cd46bef5eedfd458300f72c56b3c5",
+        "rev": "75f7d715f8088f741be9981405f6444e2d49efdd",
        "type": "github"
      },
      "original": {
@ -545,11 +545,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1680607374,
-        "narHash": "sha256-U5iiPqbAanr+sQCCZ7zxYhwCXdcDpish8Uy4ELZeXM0=",
+        "lastModified": 1687004852,
+        "narHash": "sha256-wRSUs+v8xtIJaFlWO5NLFQjkq5+eYhxHHXnZKsZ9DpQ=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "e70d498e97017daa59363eafa054619d4fa160c3",
+        "rev": "df0a6e4ec44b4a276acfa5a96d2a83cb2dfdc791",
        "type": "github"
      },
      "original": {
@ -639,12 +639,15 @@
      }
    },
    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
      "locked": {
-        "lastModified": 1678901627,
-        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
        "type": "github"
      },
      "original": {
@ -837,7 +840,7 @@
          "nixpkgs"
        ],
        "parts": "parts_6",
-        "systems": "systems"
+        "systems": "systems_2"
      },
      "locked": {
        "lastModified": 1683646918,
@ -1341,11 +1344,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1680435407,
-        "narHash": "sha256-IPBtZCOh3BdrR+V77cL7r6WQnclWcZ/85BDYnmq/GnQ=",
+        "lastModified": 1686936697,
+        "narHash": "sha256-mCoPr1nNWKpsoGMBFaK/sswkLloRCZuoWi2a+OKs3vk=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "236576227a299fd19ba836b1834ab50c948af994",
+        "rev": "a5a71c75e62a0eaa1b42a376f7cf3d348cb5dec6",
        "type": "github"
      },
      "original": {
@ -1385,11 +1388,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1680488274,
-        "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
+        "lastModified": 1685759304,
+        "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
+        "rev": "c535b4f3327910c96dcf21851bbdd074d0760290",
        "type": "github"
      },
      "original": {
@ -1488,6 +1491,21 @@
      }
    },
    "systems": {
+      "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": 1680978846,
        "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
--- a/hosts/tkaronto/modules/waydroid.nix
+++ b/hosts/tkaronto/modules/waydroid.nix
@ -0,0 +1,6 @@
+{config, ...}: {
+  virtualisation.waydroid.enable = true;
+  environment.persistence."${config.system.persistDir}" = {
+    directories = ["/var/lib/waydroid"];
+  };
+}
--- a/hosts/wolumonde/modules/conduit.nix
+++ b/hosts/wolumonde/modules/conduit.nix
@ -6,7 +6,10 @@
 }: let
  _wellKnownFileClient = pkgs.writeText "client" (
    builtins.toJSON
-    {"m.homeserver"."base_url" = "https://matrix.gaze.systems";}
+    {
+      "m.homeserver"."base_url" = "https://matrix.gaze.systems";
+      "org.matrix.msc3575.proxy"."url" = "https://matrix.gaze.systems";
+    }
  );
  _wellKnownFileServer =
    pkgs.writeText "server"
@ -28,6 +31,7 @@ in {
      trusted_servers = ["matrix.org" "nixos.dev" "conduit.rs"];
      address = "::1";
      port = 6167;
+      database_backend = "rocksdb";
    };
  };

--- a/hosts/wolumonde/modules/secrets.nix
+++ b/hosts/wolumonde/modules/secrets.nix
@ -7,4 +7,5 @@
    group = "systemd-network";
  };
  age.secrets.musikquadConfig.file = ../../../secrets/musikquadConfig.age;
+  age.secrets.tmodloaderServerPass.file = ../../../secrets/tmodloaderServerPass.age;
 }
--- a/hosts/wolumonde/modules/terraria.disabled
+++ b/hosts/wolumonde/modules/terraria.disabled
@ -0,0 +1,71 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  mods = [
+    "2817496179"
+    "2669644269"
+    "2824688072"
+    "2826111637"
+    "2824688804"
+    "2793782057"
+    "2570931073"
+    "2776422822"
+    "2913232891"
+    "2797072909"
+    "2565639705"
+    "2760520795"
+    "2619954303"
+    "2899871898"
+    "2790924965"
+    "2785100219"
+    "2563862309"
+    "2909886416"
+    "2563851005"
+    "2827446882"
+    "2618946390"
+    "2597324266"
+    "2599842771"
+    "2563309347"
+    #"2893332653" mod of redemption
+    "2835407664"
+    "2562997415"
+    "2634682993"
+    "2563098343"
+    "2815540735"
+    "2831752947"
+    "2580273153"
+    "2565540604"
+    "2816694149"
+    "2802867430"
+    "2797518634"
+    "2562915378"
+  ];
+  modsToUse = lib.concatStringsSep "," mods;
+in {
+  virtualisation.oci-containers.containers = {
+    tmodloader = {
+      image = "jacobsmile/tmodloader1.4:v2022.09.47.49";
+      environment = {
+        TMOD_MAXPLAYERS = "6";
+        TMOD_WORLDNAME = "cbt";
+        TMOD_WORLDSEED = "cockandballtorture";
+        TMOD_MOTD = "You should kill yourself, NOW!";
+        TMOD_WORLDSIZE = "2";
+        TMOD_AUTODOWNLOAD = modsToUse;
+        TMOD_ENABLEDMODS = modsToUse;
+      };
+      environmentFiles = [config.age.secrets.tmodloaderServerPass.path];
+      ports = ["7777:7777"];
+      volumes = [
+        "/var/lib/terraria/worlds:/home/terraria/.local/share/Terraria/tModLoader/Worlds"
+      ];
+    };
+  };
+
+  networking.firewall = {
+    allowedTCPPorts = [7777];
+    allowedUDPPorts = [7777];
+  };
+}
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@ -8,4 +8,5 @@ in {
  "musikquadConfig.age".publicKeys = [yusdacra wolumonde];
  "nixGithubAccessToken.age".publicKeys = [yusdacra];
  "nixBuildKey.age".publicKeys = [yusdacra];
+  "tmodloaderServerPass.age".publicKeys = [yusdacra wolumonde];
 }
--- a/secrets/tmodloaderServerPass.age
+++ b/secrets/tmodloaderServerPass.age
@ -0,0 +1,19 @@
+age-encryption.org/v1
+-> ssh-rsa Abmvag
+0F4C6sVSL7x9LUPXO1REpj8tnlnEbQWUaebc79Tc0nj8YJ4c4mrR3IVYq8UiObUV
+xUMDjO0+XgHd4udJjmThD2UtBVYApmhYEc9Zv7199CHZARrXIgaFfNQvCnNC1E02
+FKUGSh42eQuXcQIGpmj5fU9HVoAfp6VKHvp1CFYRn3J03u9yB589ROIH4ySdWSQP
+cetenbKXKaZCYO8ipERumxyb76sninZjWc6BGj8HNF2ePEtXVcFOc5C/DrYX8xrs
+0wzCtzj2bUZhtYFT5OAiaDBOi1dbC+eyER1uK6qC4ZFNMAuhVLeU6774QxQ5dL7G
+g3FTNkyZdS9KZWl+4yntX0yFfXQbRGJErSRWW2g4w43EPniIgrMcqK5N1X+pycBD
+gt1qofz07YGwXUPJfurWkuFpHcsO2/0SXsOSpuxYyzuu/tIdmjGMmiEilQUtQC++
+yXdIXQzIyB9jWTwoXUMPMfsLtjwcok8l/dH+/9VWjgQZ+4wycHPDemhawnI33CDg
+04zAJEimqoavHY2BD9K88qJSJViKBfSvMPSittblBlMNjvOQ0uedGwB98axXe9mh
+LXa4rHnF48uL10HI0byYivamJNyfFug5G9WpH2fSjn1n90o1lp8ZPWKDVR/kj6+9
+01zzFthLXqBQ6s5AyVtOP9yLWU06d2lhhBr+g5+J5WU
+-> ssh-ed25519 KjIL7g sFHELT2wiMJBp/8HrwSbJPMWthkbpU72Kizvkikc60A
+l6kk0fyz1mX8E5y37srUgW3zaZVtKdXyBoD55EgQaaY
+-> N/}--grease Y
+iItOxVW8A6Mv+7+7bPiMfkxX80VizsYC
+--- hfAvTCpVuTOQnTkLljMOpbH9g6gYN+V9FruGBG99YdM
+‹Å35ÁW¬í@…€®ælgäñùGÆ<47>†¯ì¬ØT-N¾Á[{è´üqEÚ!L"ù¹/Í~
--- a/users/patriot/default.nix
+++ b/users/patriot/default.nix
@ -206,12 +206,13 @@ in {
      command-not-found.enable =
        nixosConfig.programs.command-not-found.enable;
      git = {
-        signing = {
-          key = "E1C119F91F4CAE53E8445CAFBB57FCE7E35984F6";
-          signByDefault = true;
-        };
        userName = name;
        userEmail = email;
+        extraConfig = {
+          gpg.format = "ssh";
+          commit.gpgsign = true;
+          user.signingkey = builtins.readFile ../../secrets/yusdacra.key.pub;
+        };
      };
    };
    services = {
--- a/users/patriot/wallpaper.png
+++ b/users/patriot/wallpaper.png