Compare commits

...

2 commits

Author SHA1 Message Date
uku
da0324ccf9
chore(common): move ghostty terminfo to server 2025-01-07 18:51:47 +01:00
uku
f6ed5e951b
feat(utils): add mkNginxFile 2025-01-07 18:50:30 +01:00
4 changed files with 26 additions and 5 deletions

View file

@ -70,8 +70,6 @@ in
neovim neovim
ripgrep ripgrep
wget wget
ghostty.terminfo
]; ];
hm = { hm = {

View file

@ -1,4 +1,5 @@
{ {
pkgs,
config, config,
_utils, _utils,
... ...
@ -22,6 +23,10 @@ in
hermetic = false; # hermetic fucks up for cross-system deployments hermetic = false; # hermetic fucks up for cross-system deployments
}; };
environment.systemPackages = with pkgs; [
ghostty.terminfo
];
services = { services = {
tailscale.extraUpFlags = [ "--advertise-exit-node" ]; tailscale.extraUpFlags = [ "--advertise-exit-node" ];

View file

@ -1,4 +1,4 @@
{ lib, ... }: { lib, pkgs, ... }:
{ {
setupSecrets = setupSecrets =
_config: _config:
@ -96,4 +96,19 @@
} }
]; ];
}; };
# shamelessly stolen from soopyc's gensokyo
mkNginxFile =
{
filename ? "index.html",
content,
status ? 200,
}:
{
# gets the store path of the directory in which the file is contained
# we have to use writeTextDir because we don't want to expose the whole nix store to nginx
# and because you can't just return an absolute path to a file
alias = builtins.toString (pkgs.writeTextDir filename content) + "/";
tryFiles = "${filename} =${builtins.toString status}";
};
} }

View file

@ -4,7 +4,7 @@
... ...
}: }:
let let
_utils = import ../global/utils.nix { inherit lib; }; mkUtils = import ../global/utils.nix;
toSystem = toSystem =
name: name:
@ -24,7 +24,10 @@ let
]; ];
specialArgs = inputs // { specialArgs = inputs // {
inherit _utils; _utils = mkUtils {
inherit lib;
pkgs = inputs.nixpkgs.legacyPackages.${system};
};
}; };
}; };
in in