diff --git a/configs/common.nix b/configs/common.nix index f7ad2d4..f02a143 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -70,6 +70,8 @@ in neovim ripgrep wget + + ghostty.terminfo ]; hm = { diff --git a/configs/server.nix b/configs/server.nix index 3ed62c1..0177506 100644 --- a/configs/server.nix +++ b/configs/server.nix @@ -1,5 +1,4 @@ { - pkgs, config, _utils, ... @@ -23,10 +22,6 @@ in hermetic = false; # hermetic fucks up for cross-system deployments }; - environment.systemPackages = with pkgs; [ - ghostty.terminfo - ]; - services = { tailscale.extraUpFlags = [ "--advertise-exit-node" ]; diff --git a/global/utils.nix b/global/utils.nix index a98b0a5..d89af09 100644 --- a/global/utils.nix +++ b/global/utils.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ lib, ... }: { setupSecrets = _config: @@ -96,19 +96,4 @@ } ]; }; - - # 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}"; - }; } diff --git a/systems/default.nix b/systems/default.nix index 18937a3..92a0646 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -4,7 +4,7 @@ ... }: let - mkUtils = import ../global/utils.nix; + _utils = import ../global/utils.nix { inherit lib; }; toSystem = name: @@ -24,10 +24,7 @@ let ]; specialArgs = inputs // { - _utils = mkUtils { - inherit lib; - pkgs = inputs.nixpkgs.legacyPackages.${system}; - }; + inherit _utils; }; }; in