From 0fe2bdbcc5b67415098c73117b8aabfc86bc7900 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sat, 9 Dec 2023 10:31:06 +0100 Subject: [PATCH] hopefully fix mastodon --- nixos/common/hm-modules/rust.nix | 2 +- nixos/common/users/vivian.nix | 1 - nixos/hosts/hades/nginx/configuration.nix | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/common/hm-modules/rust.nix b/nixos/common/hm-modules/rust.nix index be046f1c..f1f56790 100644 --- a/nixos/common/hm-modules/rust.nix +++ b/nixos/common/hm-modules/rust.nix @@ -5,7 +5,7 @@ in { options.programs.v.rust = { enable = mkEnableOption "rust"; }; config = mkIf cfg.enable { home = { - packages = with pkgs; [ rustup cargo-nextest cargo-msrv ]; + packages = with pkgs; [ rustup cargo-nextest cargo-msrv cargo-dist cargo-cross]; file = { ".cargo/config.toml".text = '' diff --git a/nixos/common/users/vivian.nix b/nixos/common/users/vivian.nix index 35138b2f..17e4a7df 100644 --- a/nixos/common/users/vivian.nix +++ b/nixos/common/users/vivian.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { # The block that specifies my user account. users.extraUsers.vivian = { - uid = 1000; # This account is intended for a non-system user. isNormalUser = true; diff --git a/nixos/hosts/hades/nginx/configuration.nix b/nixos/hosts/hades/nginx/configuration.nix index 43738fdf..9b3f24ed 100644 --- a/nixos/hosts/hades/nginx/configuration.nix +++ b/nixos/hosts/hades/nginx/configuration.nix @@ -52,6 +52,10 @@ in locations."= /.well-known/host-meta".extraConfig = '' return 301 https://fedi.xirion.net$request_uri; ''; + locations."/.well-known/webfinger".extraConfig = '' + add_header Access-Control-Allow-Origin '*'; + return 301 https://fedi.xirion.net$request_uri; + ''; }; # virtualHosts."blog.xirion.net" = proxy "http://10.10.10.12"; "git.xirion.net" = proxy "http://10.10.10.12";