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

inject queer.af IP addr
2024-02-14 15:29:57 +01:00 · 2024-02-14 15:27:32 +01:00
7 changed files with 54 additions and 40 deletions
--- a/flake.lock
+++ b/flake.lock
@ -470,11 +470,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1704982712,
-        "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=",
+        "lastModified": 1706830856,
+        "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "07f6395285469419cf9d078f59b5b49993198c00",
+        "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
        "type": "github"
      },
      "original": {
@ -786,11 +786,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706798041,
-        "narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=",
+        "lastModified": 1707029945,
+        "narHash": "sha256-GA6IOAKouQlTbile9PvAa3UUh7s5mi6NsZMX8lpgozg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e",
+        "rev": "230836bb7ca318aec7bad8442954da611d06a172",
        "type": "github"
      },
      "original": {
@ -807,11 +807,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706306660,
-        "narHash": "sha256-lZvgkHtVeduGByPb0Tz9LpAi4olfkEm8XPgv0o7GRsk=",
+        "lastModified": 1706955260,
+        "narHash": "sha256-W3y0j77IDVbmbajudHoUr46RpswujUCl+D5Vru53UsI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "b2f56952074cb46e93902ecaabfb04dd93733434",
+        "rev": "880d9bc2110f7cae59698f715b8ca42cdc53670c",
        "type": "github"
      },
      "original": {
@ -889,11 +889,11 @@
        "utils": "utils_3"
      },
      "locked": {
-        "lastModified": 1706219574,
-        "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=",
+        "lastModified": 1706742486,
+        "narHash": "sha256-sv/MISTeD0rqeVivpZJpynboMWJp6i62OmrZX1rGl38=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf",
+        "rev": "9e36323ae3dde787f761420465c3ae560f3dbf29",
        "type": "gitlab"
      },
      "original": {
@ -992,11 +992,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1705915768,
-        "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=",
+        "lastModified": 1706833576,
+        "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b",
+        "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7",
        "type": "github"
      },
      "original": {
@ -1376,11 +1376,11 @@
    },
    "nixpkgs_9": {
      "locked": {
-        "lastModified": 1706191920,
-        "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
+        "lastModified": 1706732774,
+        "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
+        "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d",
        "type": "github"
      },
      "original": {
@ -1414,11 +1414,11 @@
        "pre-commit-hooks": "pre-commit-hooks"
      },
      "locked": {
-        "lastModified": 1706870624,
-        "narHash": "sha256-73pux7f82JcIamAsQSMy/coTJQIZt0CvMMXNwZ11qGY=",
+        "lastModified": 1706997840,
+        "narHash": "sha256-GbfTveveq/FNJ+xVcj1w3jW2ftsc8dmwxVS5vFehq+I=",
        "owner": "pta2002",
        "repo": "nixvim",
-        "rev": "079c03228c20c9cf49ab4dda2aa65fc27233fc53",
+        "rev": "81f54bcdd6f6a83372dce7723c83b8605769e9a5",
        "type": "github"
      },
      "original": {
@ -1429,11 +1429,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1706895935,
-        "narHash": "sha256-C7y30vhn3xt/Sy5sap5LftMG6UVXhYmGIc6KeFDqloU=",
+        "lastModified": 1707043111,
+        "narHash": "sha256-d3tdmq/3+SE4mJ4STVlInkAdQ64wz4V4jVEr78AEoak=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "04a91253344796e363f4938ff9b1f7e15a943f80",
+        "rev": "51b44c67a6d45183f55b79a5d691d2093b2a046e",
        "type": "github"
      },
      "original": {
@ -1474,11 +1474,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1705757126,
-        "narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=",
+        "lastModified": 1706424699,
+        "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc",
+        "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf",
        "type": "github"
      },
      "original": {
--- a/nixos/hosts/hades/dns/configuration.nix
+++ b/nixos/hosts/hades/dns/configuration.nix
@ -34,6 +34,7 @@
      "fedi.xirion.net typetransparent"
      "grist.tud.0x76.dev typetransparent"
      "dex.tud.0x76.dev typetransparent"
+      "queer.af typetransparent"
    ];

    local-data = [
@ -51,6 +52,7 @@
      ''"fedi.xirion.net A 192.168.0.122"''
      ''"grist.tud.0x76.dev A 192.168.0.122"''
      ''"dex.tud.0x76.dev A 192.168.0.122"''
+      ''"queer.af A 65.108.48.233"''
    ];
  };
 }
--- a/nixos/hosts/hades/storage/configuration.nix
+++ b/nixos/hosts/hades/storage/configuration.nix
@ -32,6 +32,7 @@
        d5 = "/mnt/disk5";
        d6 = "/mnt/disk6";
        d7 = "/mnt/disk7";
+        # d8 = "/mnt/disk8";
      };
      contentFiles = [
        "/var/lib/snapraid/snapraid.content"
--- a/nixos/hosts/hades/storage/fs.nix
+++ b/nixos/hosts/hades/storage/fs.nix
@ -41,6 +41,11 @@
      device = "/dev/disk/by-uuid/6c568887-9d2e-45ce-ab85-4c48cca2226a";
    };

+    # "/mnt/disk8" = {
+      # fsType = "ext4";
+      # device = "/dev/disk/by-partuuid/73d8eea4-c648-4c91-99dc-19940832ffe7";
+    # };
+
    "/mnt/parity1" = {
      fsType = "ext4";
      device = "/dev/disk/by-partuuid/7c9b88ed-b8f8-40c9-bbc3-b75d30e04e01";
--- a/nixos/hosts/thalassa/default.nix
+++ b/nixos/hosts/thalassa/default.nix
@ -2,5 +2,6 @@
  "aoife" = {
    type = "local";
    mac = "04:7b:cb:b6:2d:88";
+    nix = false;
  };
 }
--- a/nixos/pkgs/glitch-soc/default.nix
+++ b/nixos/pkgs/glitch-soc/default.nix
@ -7,6 +7,8 @@ https://git.catgirl.cloud/999eagle/dotfiles-nix/-/blob/main/overlay/mastodon/gli
 */

 { lib, stdenv, nodejs-slim, bundlerEnv, nixosTests
+, yarn, callPackage, ruby, writeShellScript
+, fetchYarnDeps, prefetch-yarn-deps
 , yarn-berry, callPackage, imagemagick, ffmpeg, file, ruby, writeShellScript
 , brotli

@ -29,18 +31,6 @@ stdenv.mkDerivation rec {
    name = "${pname}-gems-${version}";
    inherit version gemset ruby;
    gemdir = src;
-    # This fix (copied from https://github.com/NixOS/nixpkgs/pull/76765) replaces the gem
-    # symlinks with directories, resolving this error when running rake:
-    #   /nix/store/451rhxkggw53h7253izpbq55nrhs7iv0-mastodon-gems-3.0.1/lib/ruby/gems/2.6.0/gems/bundler-1.17.3/lib/bundler/settings.rb:6:in `<module:Bundler>': uninitialized constant Bundler::Settings (NameError)
-    postBuild = ''
-      for gem in "$out"/lib/ruby/gems/*/gems/*; do
-        cp -a "$gem/" "$gem.new"
-        rm "$gem"
-        # needed on macOS, otherwise the mv yields permission denied
-        chmod +w "$gem.new"
-        mv "$gem.new" "$gem"
-      done
-    '';
  };

  mastodonModules = stdenv.mkDerivation {
@ -107,7 +97,8 @@ stdenv.mkDerivation rec {
    '';
  };

-  propagatedBuildInputs = [ imagemagick ffmpeg file mastodonGems.wrappedRuby ];
+  propagatedBuildInputs = [ mastodonGems.wrappedRuby ];
+  nativeBuildInputs = [ brotli ];
  buildInputs = [ mastodonGems nodejs-slim ];

  buildPhase = ''
--- a/nixos/pkgs/glitch-soc/source.nix
+++ b/nixos/pkgs/glitch-soc/source.nix
@ -1,14 +1,27 @@
 # This file was generated by pkgs.mastodon.updateScript.
 { fetchFromGitHub, applyPatches, patches ? [] }:
 let
+<<<<<<< HEAD
+  version = "bc39b3196db8c79719c5a6c920c780284b8266a";
+=======
  version = "5bc39b3";
  revision = "5bc39b3196db8c79719c5a6c920c780284b8266a";
+>>>>>>> 8ec4a162da27435bf9deb68fa41bbfaf0c7d3f49
 in
 (
  applyPatches {
    src = fetchFromGitHub {
      owner = "glitch-soc";
      repo = "mastodon";
+<<<<<<< HEAD
+      rev = "v${version}";
+      hash = "sha256-6ipYkF0PP3D15PD7vyN1cGqnxoBRrXEaRsrto7ZXej0=";
+    };
+    patches = patches ++ [];
+  }) // {
+  inherit version;
+  yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+=======
      rev = "${revision}";
      hash = "sha256-6ipYkF0PP3D15PD7vyN1cGqnxoBRrXEaRsrto7ZXej0=";
    };
@ -16,4 +29,5 @@ in
  }) // {
  inherit version;
  yarnHash = "sha256-CIIz5wwWzvDKc/VbSIT7Z5D9kwOLoErXoO0WQWfV/g4=";
+>>>>>>> 8ec4a162da27435bf9deb68fa41bbfaf0c7d3f49
 }
Author	SHA1	Message	Date
Vivian	6d809c1c22	Merge branch 'main' of ssh://git.0x76.dev:42/v/infrastructure Lint / lint (push) Failing after 2m28s Details Plex Update / update (push) Failing after 2m12s Details	2024-02-14 15:29:57 +01:00
Vivian	c35292fd82	inject queer.af IP addr	2024-02-14 15:27:32 +01:00