sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

'toString inputs' -> 'inputs'

Browse source
This commit is contained in:
zowoq 2024-10-24 13:58:51 +10:00
parent b54704e0e3
commit a06d843d5c
7 changed files with 10 additions and 10 deletions

2
hosts/build02/nixpkgs-update-backup.nix
View file

@ -3,7 +3,7 @@
# 100GB storagebox is attached to the build02 server # 100GB storagebox is attached to the build02 server
age.secrets.hetzner-borgbackup-ssh = { age.secrets.hetzner-borgbackup-ssh = {
file = "${toString inputs.self}/secrets/hetzner-borgbackup-ssh.age"; file = "${inputs.self}/secrets/hetzner-borgbackup-ssh.age";
}; };
systemd.services.borgbackup-job-nixpkgs-update = { systemd.services.borgbackup-job-nixpkgs-update = {

2
hosts/build02/nixpkgs-update.nix
View file

@ -6,7 +6,7 @@
... ...
}: }:
let let
userLib = import "${toString inputs.self}/users/lib.nix" { inherit lib; }; userLib = import "${inputs.self}/users/lib.nix" { inherit lib; };
nixpkgs-update-bin = "/var/lib/nixpkgs-update/bin/nixpkgs-update"; nixpkgs-update-bin = "/var/lib/nixpkgs-update/bin/nixpkgs-update";

4
modules/darwin/hercules-ci.nix
View file

@ -1,14 +1,14 @@
{ config, inputs, ... }: { config, inputs, ... }:
{ {
age.secrets.hercules-binary-caches = { age.secrets.hercules-binary-caches = {
file = "${toString inputs.self}/secrets/hercules-binary-caches.age"; file = "${inputs.self}/secrets/hercules-binary-caches.age";
mode = "600"; mode = "600";
owner = "_hercules-ci-agent"; owner = "_hercules-ci-agent";
group = "_hercules-ci-agent"; group = "_hercules-ci-agent";
}; };
age.secrets.hercules-cluster-join-token = { age.secrets.hercules-cluster-join-token = {
file = "${toString inputs.self}/secrets/hercules-cluster-join-token.age"; file = "${inputs.self}/secrets/hercules-cluster-join-token.age";
mode = "600"; mode = "600";
owner = "_hercules-ci-agent"; owner = "_hercules-ci-agent";
group = "_hercules-ci-agent"; group = "_hercules-ci-agent";

2
modules/nixos/common/sops-nix.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
defaultSopsPath = "${toString inputs.self}/hosts/${config.networking.hostName}/secrets.yaml"; defaultSopsPath = "${inputs.self}/hosts/${config.networking.hostName}/secrets.yaml";
in in
{ {
imports = [ imports = [

2
modules/nixos/common/users.nix
View file

@ -1,7 +1,7 @@
{ inputs, lib, ... }: { inputs, lib, ... }:
let let
usersDir = "${toString inputs.self}/users"; usersDir = "${inputs.self}/users";
userImports = userImports =
let let
toUserPath = f: usersDir + "/${f}"; toUserPath = f: usersDir + "/${f}";

2
modules/nixos/github-org-backup.nix
View file

@ -32,7 +32,7 @@
}; };
age.secrets.hetzner-borgbackup-ssh = { age.secrets.hetzner-borgbackup-ssh = {
file = "${toString inputs.self}/secrets/hetzner-borgbackup-ssh.age"; file = "${inputs.self}/secrets/hetzner-borgbackup-ssh.age";
}; };
systemd.services.borgbackup-job-github-org = { systemd.services.borgbackup-job-github-org = {

6
modules/nixos/hercules-ci.nix
View file

@ -1,17 +1,17 @@
{ config, inputs, ... }: { config, inputs, ... }:
{ {
age.secrets.hercules-binary-caches = { age.secrets.hercules-binary-caches = {
file = "${toString inputs.self}/secrets/hercules-binary-caches.age"; file = "${inputs.self}/secrets/hercules-binary-caches.age";
owner = "hercules-ci-agent"; owner = "hercules-ci-agent";
}; };
age.secrets.hercules-cluster-join-token = { age.secrets.hercules-cluster-join-token = {
file = "${toString inputs.self}/secrets/hercules-cluster-join-token.age"; file = "${inputs.self}/secrets/hercules-cluster-join-token.age";
owner = "hercules-ci-agent"; owner = "hercules-ci-agent";
}; };
age.secrets.hercules-secrets = { age.secrets.hercules-secrets = {
file = "${toString inputs.self}/secrets/hercules-secrets.age"; file = "${inputs.self}/secrets/hercules-secrets.age";
owner = "hercules-ci-agent"; owner = "hercules-ci-agent";
}; };