clerie/nixfiles
1
0
Fork 0
Code

pkgs/nixfiles: rename nixfiles-updated-inputs to clerie-update-nixfiles

Browse Source
This commit is contained in:
clerie 2024-03-17 16:14:54 +01:00
parent 23d05a3e5d
commit 7a4177f360
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -113,6 +113,7 @@
in { in {
inherit (pkgs) inherit (pkgs)
clerie-system-upgrade clerie-system-upgrade
clerie-update-nixfiles
chromium-incognito chromium-incognito
iot-data iot-data
nix-remove-result-links nix-remove-result-links
@ -120,7 +121,6 @@
nixfiles-auto-install nixfiles-auto-install
nixfiles-generate-backup-secrets nixfiles-generate-backup-secrets
nixfiles-generate-config nixfiles-generate-config
nixfiles-updated-inputs
nixfiles-update-ssh-host-keys nixfiles-update-ssh-host-keys
update-from-hydra update-from-hydra
uptimestatus; uptimestatus;

14
hosts/osmium/nixfiles-updated-inputs.nix
View File

@ -1,20 +1,20 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
systemd.services.nixfiles-updated-inputs = { systemd.services.clerie-update-nixfiles = {
environment = { environment = {
GIT_SSH_COMMAND = "ssh -o UserKnownHostsFile=${pkgs.writeText "known_hosts" "git.clerie.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIHQDwfRlw6L+pkLjXDgW2BUWlY1zNEDtVhNEsClgqaL"} -i %d/nixfiles-updated-inputs-ssh"; GIT_SSH_COMMAND = "ssh -o UserKnownHostsFile=${pkgs.writeText "known_hosts" "git.clerie.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIHQDwfRlw6L+pkLjXDgW2BUWlY1zNEDtVhNEsClgqaL"} -i %d/clerie-update-nixfiles-ssh";
# nix likes a home directory to place the cache there # nix likes a home directory to place the cache there
HOME = "/var/lib/nixfiles-updated-inputs"; HOME = "/var/lib/clerie-update-nixfiles";
}; };
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = pkgs.nixfiles-updated-inputs + "/bin/nixfiles-updated-inputs"; ExecStart = pkgs.clerie-update-nixfiles + "/bin/clerie-update-nixfiles";
StateDirectory = "nixfiles-updated-inputs"; StateDirectory = "clerie-update-nixfiles";
WorkingDirectory = "/var/lib/nixfiles-updated-inputs"; WorkingDirectory = "/var/lib/clerie-update-nixfiles";
DynamicUser = true; DynamicUser = true;
# this sets the correct file permissions for the ssh key because we use DynamicUser # this sets the correct file permissions for the ssh key because we use DynamicUser
LoadCredential = "nixfiles-updated-inputs-ssh:${config.age.secrets."nixfiles-updated-inputs-ssh".path}"; LoadCredential = "clerie-update-nixfiles-ssh:${config.age.secrets."clerie-update-nixfiles-ssh".path}";
}; };
startAt = "*-*-* 03:03:00"; startAt = "*-*-* 03:03:00";
}; };

0
hosts/osmium/secrets/nixfiles-updated-inputs-ssh.age → hosts/osmium/secrets/clerie-update-nixfiles-ssh.age
View File

4
pkgs/nixfiles/nixfiles-updated-inputs.nix → pkgs/clerie-update-nixfiles/clerie-update-nixfiles.nix
View File

@ -1,8 +1,8 @@
{ pkgs, ... }: { pkgs, ... }:
pkgs.writeShellApplication { pkgs.writeShellApplication {
name = "nixfiles-updated-inputs"; name = "clerie-update-nixfiles";
text = builtins.readFile ./nixfiles-updated-inputs.sh; text = builtins.readFile ./clerie-update-nixfiles.sh;
runtimeInputs = with pkgs; [ runtimeInputs = with pkgs; [
git git
nix nix

0
pkgs/nixfiles/nixfiles-updated-inputs.sh → pkgs/clerie-update-nixfiles/clerie-update-nixfiles.sh
View File

2
pkgs/overlay.nix
View File

@ -1,5 +1,6 @@
final: prev: { final: prev: {
clerie-system-upgrade = final.callPackage ./clerie-system-upgrade/clerie-system-upgrade.nix {}; clerie-system-upgrade = final.callPackage ./clerie-system-upgrade/clerie-system-upgrade.nix {};
clerie-update-nixfiles = final.callPackage ./clerie-update-nixfiles/clerie-update-nixfiles.nix {};
chromium-incognito = final.callPackage ./chromium-incognito {}; chromium-incognito = final.callPackage ./chromium-incognito {};
iot-data = final.python3.pkgs.callPackage ./iot-data {}; iot-data = final.python3.pkgs.callPackage ./iot-data {};
nix-remove-result-links = final.callPackage ./nix-remove-result-links {}; nix-remove-result-links = final.callPackage ./nix-remove-result-links {};
@ -7,7 +8,6 @@ final: prev: {
nixfiles-auto-install = final.callPackage ./nixfiles/nixfiles-auto-install.nix {}; nixfiles-auto-install = final.callPackage ./nixfiles/nixfiles-auto-install.nix {};
nixfiles-generate-backup-secrets = final.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {}; nixfiles-generate-backup-secrets = final.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {};
nixfiles-generate-config = final.callPackage ./nixfiles/nixfiles-generate-config.nix {}; nixfiles-generate-config = final.callPackage ./nixfiles/nixfiles-generate-config.nix {};
nixfiles-updated-inputs = final.callPackage ./nixfiles/nixfiles-updated-inputs.nix {};
nixfiles-update-ssh-host-keys = final.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {}; nixfiles-update-ssh-host-keys = final.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {};
update-from-hydra = final.callPackage ./update-from-hydra {}; update-from-hydra = final.callPackage ./update-from-hydra {};
uptimestatus = final.python3.pkgs.callPackage ./uptimestatus {}; uptimestatus = final.python3.pkgs.callPackage ./uptimestatus {};