kat/nixfiles
1
0
Fork 0
mirror of https://github.com/kittywitch/nixfiles.git synced 2026-02-10 04:49:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

building without tf state

Browse source
This commit is contained in:
arcnmx 2022-12-17 18:44:05 -08:00
parent e4bd7ee5e6
commit 6779ac1c65
5 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/meta/tailscale.nix
View file

@ -1,6 +1,7 @@
{ config, pkgs, lib, root, ... }: with lib; let { config, pkgs, lib, tree, ... }: with lib; let
home = config.deploy.targets.home.tf; home = config.deploy.targets.home.tf;
in { in {
imports = lib.optional (tree.pure.trusted ? modules.meta) tree.pure.trusted.modules.meta.tailscale;
options = { options = {
tailnet_uri = mkOption { tailnet_uri = mkOption {
type = types.str; type = types.str;

2
nixos/systems/tewi/nixos.nix
View file

@ -15,7 +15,7 @@
./postgres.nix ./postgres.nix
./nginx.nix ./nginx.nix
../../gui/nfs.nix ../../gui/nfs.nix
]; ] ++ lib.optional (meta.trusted ? nixos.systems.tewi.default) meta.trusted.nixos.systems.tewi.default;
services.cockroachdb.locality = "provider=local,network=gensokyo,host=${config.networking.hostName}"; services.cockroachdb.locality = "provider=local,network=gensokyo,host=${config.networking.hostName}";

4
system/root.nix
View file

@ -1,3 +1,5 @@
{ config, ... }: { { config, meta, lib, ... }: {
imports = lib.optional (meta.trusted ? modules.nixos) meta.trusted.modules.nixos.deploy;
home-manager.users.root.home.stateVersion = "20.09"; home-manager.users.root.home.stateVersion = "20.09";
} }

16
trusted/flake.lock generated
View file

@ -610,18 +610,18 @@
"trusted": { "trusted": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1664745519, "lastModified": 1671330960,
"narHash": "sha256-tUNmmEjJ6KOOPkHCkJytv4KemXf4idM8erPQgOr7SWc=", "narHash": "sha256-r8yqTEoOhZmTNlpThApRrZOAwc7+xrBBIXEk6nyx1pc=",
"ref": "main", "ref": "shim",
"rev": "f89074f4500dddb1962d49f3f542ce41d7beee87", "rev": "7848692e19091222d1fcafa51ffd48ceeb037ab6",
"revCount": 93, "revCount": 1,
"type": "git", "type": "git",
"url": "ssh://git@github.com/kittywitch/nixfiles-trusted" "url": "gcrypt::ssh://git@github.com/arcnmx/kat-nixfiles-trusted.git"
}, },
"original": { "original": {
"ref": "main", "ref": "shim",
"type": "git", "type": "git",
"url": "ssh://git@github.com/kittywitch/nixfiles-trusted" "url": "gcrypt::ssh://git@github.com/arcnmx/kat-nixfiles-trusted.git"
} }
}, },
"ts-fold": { "ts-fold": {

4
trusted/flake.nix
View file

@ -1,7 +1,9 @@
{ {
inputs = { inputs = {
trusted = { trusted = {
url = "git+ssh://git@github.com/kittywitch/nixfiles-trusted?ref=main"; type = "git";
url = "gcrypt::ssh://git@github.com/arcnmx/kat-nixfiles-trusted.git";
ref = "shim";
flake = false; flake = false;
}; };
nixfiles = { nixfiles = {