Skip to content

Commit

Permalink
trusted and tf-nix inputs removed
Browse files Browse the repository at this point in the history
  • Loading branch information
arcnmx committed Apr 29, 2023
1 parent f6ec9f3 commit dbf7789
Show file tree
Hide file tree
Showing 20 changed files with 24 additions and 632 deletions.
3 changes: 0 additions & 3 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ FLAKE_ARGS=()
if [[ $(id -un) = kat ]]; then
git pull
fi
if [[ -e trusted/trusted/flake.nix ]]; then
export TRUSTED=1
fi

source_env_if_exists .envrc.conf

Expand Down
4 changes: 0 additions & 4 deletions .gitmodules

This file was deleted.

2 changes: 1 addition & 1 deletion .sops.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ keys:
- &tewi_gen age17haatqc7gpk9t690affyqcvwmhmz0us95en2r7qpqzw29tpq3ffspld0cf
- &tewi_osh age172nhlv3py990k2rgw64hy27hffmnpv6ssxyu9fepww7zxfgg347qna4gzt
creation_rules:
- path_regex: nixos/systems/[^/]+/secrets\.yaml$
- path_regex: '[^/]+/secrets\.yaml$'
shamir_threshold: 1
key_groups:
- pgp:
Expand Down
2 changes: 1 addition & 1 deletion ci/flake-cron.nix
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ in {
environment = ["CACHIX_SIGNING_KEY" "GITHUB_REF"];
command = let
filteredHosts = ["tewi"];
nodeBuildString = concatMapStringsSep " && " (node: "nix build -Lf . network.nodes.${node}.deploy.system -o result-${node} && nix-collect-garbage -d") filteredHosts;
nodeBuildString = concatMapStringsSep " && " (node: "nix build -Lf . network.nodes.${node}.system.build.toplevel -o result-${node} && nix-collect-garbage -d") filteredHosts;
in ''
# ${toString builtins.currentTime}
nix flake update
Expand Down
2 changes: 1 addition & 1 deletion ci/nodes.nix
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ with lib; {
enabledHosts = ["tewi"];
in
mapAttrs' (k: nameValuePair "${k}") (genAttrs enabledHosts (host: {
tasks.${host}.inputs = channels.nixfiles.network.nodes.${host}.deploy.system;
tasks.${host}.inputs = channels.nixfiles.network.nodes.${host}.system.build.toplevel;
}));

ci.gh-actions.checkoutOptions.submodules = false;
Expand Down
3 changes: 0 additions & 3 deletions devShell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ let
'';
nf-update = pkgs.writeShellScriptBin "nf-update" ''
nix flake update
if [[ -n $TRUSTED ]]; then
nix flake lock ./trusted --update-input trusted
fi
'';
nf-deploy = pkgs.writeShellScriptBin "nf-deploy" ''
exec /usr/bin/env bash ${./nixos/deploy.sh} "$@"
Expand Down
Loading

0 comments on commit dbf7789

Please sign in to comment.