diff --git a/config/instance-20221213-1915.nix b/config/instance-20221213-1915.nix index 20714995..80f6eb85 100644 --- a/config/instance-20221213-1915.nix +++ b/config/instance-20221213-1915.nix @@ -14,7 +14,6 @@ ./server.nix ./wireguard/public-server.nix ./services/named-submissive.nix - ./services/shitalloverme.nix ./users/remote-build.nix ./services/atticd.nix #./services/minecraft.nix diff --git a/config/nixos-8gb-fsn1-1.nix b/config/nixos-8gb-fsn1-1.nix index 4728efe5..c5b77038 100644 --- a/config/nixos-8gb-fsn1-1.nix +++ b/config/nixos-8gb-fsn1-1.nix @@ -27,7 +27,6 @@ ./services/peertube ./services/rspamd.nix ./wireguard/public-server.nix - ./services/shitalloverme.nix ./services/initrd-ssh.nix ./wireguard ./zfs.nix diff --git a/config/services/shitalloverme.nix b/config/services/shitalloverme.nix deleted file mode 100644 index ad767115..00000000 --- a/config/services/shitalloverme.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - system, - pkgs, - ... -}: let - input = "${pkgs.lotte-art}/2022-12-27-rexyi-scatych.jxl"; - sizes = [1 2 4 8 16 32 64 128 256 512 1024 2000]; - formats = ["jxl" "avif" "heic" "webp" "jpeg" "png"]; - mkImage = format: size: let - pkg = pkgs.stdenvNoCC.mkDerivation { - src = pkgs.emptyDirectory; - name = "${toString size}.${format}"; - nativeBuildInputs = with pkgs; [imagemagick]; - buildPhase = '' - mkdir $out - convert ${input} -resize ${toString size}x${toString size} $out/${toString size}.${format} - ''; - installPhase = "true"; - }; - in "${pkg}/${toString size}.${format}"; - files = builtins.concatMap (format: map (mkImage format) sizes) formats; - shitalloverme = pkgs.stdenvNoCC.mkDerivation { - src = pkgs.emptyDirectory; - name = "shitallover.me"; - buildPhase = "true"; - installPhase = '' - mkdir $out - ln -sv ${../../extra/shitalloverme.html} $out/index.html - for f in ${toString files}; do - ln -sv $f $out - done - ''; - }; -in { - services.caddy.virtualHosts."shitallover.me" = { - useACMEHost = "shitallover.me"; - logFormat = pkgs.lib.mkForce ""; - extraConfig = '' - import baseConfig - - root * ${shitalloverme} - file_server - ''; - }; -}