all: start using xin instead of xin-status

This commit is contained in:
Aaron Bieber 2024-06-25 15:31:51 -06:00
parent a708943107
commit cefd396924
No known key found for this signature in database
2 changed files with 6 additions and 1 deletions

View File

@ -13,13 +13,14 @@ let
breakGlassKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA6CO4aa8ymIgPgHRMwVLPnkUXwFQRKJa66R3wGXrAS0 BreakGlass";
managementKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDM2k2C6Ufx5RNf4qWA9BdQHJfAkskOaqEWf8yjpySwH Nix Manager";
statusKey = ''
command="/run/current-system/sw/bin/xin-status",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9PIhQ+yWfBM2tEG+W8W8HXJXqISXif8BcPZHakKvLM xin-status
command="/run/current-system/sw/bin/xin",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9PIhQ+yWfBM2tEG+W8W8HXJXqISXif8BcPZHakKvLM xin-status
'';
gosignify = pkgs.callPackage ./pkgs/gosignify.nix { inherit isUnstable; };
myOpenSSH = pkgs.pkgsMusl.callPackage ./pkgs/openssh.nix {
inherit config;
inherit xinlib;
};
xin = pkgs.perlPackages.callPackage ./bins/xin { inherit pkgs; };
in
{
imports = [
@ -192,6 +193,8 @@ in
ripgrep
sshfs
tmux
xin
]
++ (
if isUnstable

View File

@ -348,6 +348,8 @@
inherit (traygent.packages.${system}) traygent;
inherit (spkgs) matrix-synapse;
xin = upkgs.callPackage ./bins/xin { inherit upkgs; };
});
templates = {