diff --git a/bert/services/http/index.nix b/bert/services/http/index.nix index c358bb0..07342bc 100644 --- a/bert/services/http/index.nix +++ b/bert/services/http/index.nix @@ -23,5 +23,30 @@ metrics # Enable Prometheus monitoring } ''; + virtualHosts.":80" = { + serverAliases = [":443"]; + extraConfig = '' + respond < + + + not found - chandlerswift.com + + + +

not found - chandlerswift.com

+

This page is hosted with chandlerswift.com, + but the site couldn't be found.

+ + + EOF 404 + ''; + }; }; } diff --git a/bert/services/http/swiftgang.net.nix b/bert/services/http/swiftgang.net.nix index 1de094e..7ae5ec7 100644 --- a/bert/services/http/swiftgang.net.nix +++ b/bert/services/http/swiftgang.net.nix @@ -1,6 +1,9 @@ { - services.caddy.virtualHosts."swiftgang.net".extraConfig = '' + # GoDaddy can't do flattening to apply a CNAME to an apex record. So we use + # their "forwarding" (redirect-as-a-service) to redirect to www.…, which we + # _can_ CNAME. + services.caddy.virtualHosts."www.swiftgang.net".extraConfig = '' encode zstd gzip file_server root * /srv/www/swiftgang.net diff --git a/oscar/configuration.nix b/oscar/configuration.nix index c690607..b72ebfc 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -124,8 +124,8 @@ home-manager.users.chandler = { pkgs, ... }: { nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "factorio-alpha" "discord" + "factorio-space-age" ]; home.packages = with pkgs; [ @@ -145,7 +145,6 @@ qgis # command line applications - beets iperf units @@ -165,7 +164,7 @@ # Unfree: discord - factorio + factorio-space-age ]; programs.thunderbird.enable = true; @@ -218,6 +217,7 @@ "*~" "\\#*\\#" "venv" + ".direnv" ]; hooks = { pre-commit = ./git-pre-commit-hook; @@ -251,6 +251,21 @@ # }; }; + programs.beets = { + enable = true; + settings = { + directory = "~/nas/chandler/public/media/music"; + library = "~/nas/chandler/public/media/music/beets.db"; + plugins = [ + "fetchart" + # "lyrics" + # "subsonicupdate" # TODO + "mbsubmit" + "edit" + ]; + }; + }; + programs.chromium = { enable = true; extensions = [