From 7a4177f36027b2edec43f9517cdb39137361fa13 Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 17 Mar 2024 16:14:54 +0100 Subject: [PATCH] pkgs/nixfiles: rename nixfiles-updated-inputs to clerie-update-nixfiles --- flake.nix | 2 +- hosts/osmium/nixfiles-updated-inputs.nix | 14 +++++++------- ...uts-ssh.age => clerie-update-nixfiles-ssh.age} | Bin .../clerie-update-nixfiles.nix} | 4 ++-- .../clerie-update-nixfiles.sh} | 0 pkgs/overlay.nix | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename hosts/osmium/secrets/{nixfiles-updated-inputs-ssh.age => clerie-update-nixfiles-ssh.age} (100%) rename pkgs/{nixfiles/nixfiles-updated-inputs.nix => clerie-update-nixfiles/clerie-update-nixfiles.nix} (54%) rename pkgs/{nixfiles/nixfiles-updated-inputs.sh => clerie-update-nixfiles/clerie-update-nixfiles.sh} (100%) diff --git a/flake.nix b/flake.nix index 00f5920..192ddd4 100644 --- a/flake.nix +++ b/flake.nix @@ -113,6 +113,7 @@ in { inherit (pkgs) clerie-system-upgrade + clerie-update-nixfiles chromium-incognito iot-data nix-remove-result-links @@ -120,7 +121,6 @@ nixfiles-auto-install nixfiles-generate-backup-secrets nixfiles-generate-config - nixfiles-updated-inputs nixfiles-update-ssh-host-keys update-from-hydra uptimestatus; diff --git a/hosts/osmium/nixfiles-updated-inputs.nix b/hosts/osmium/nixfiles-updated-inputs.nix index cff6766..3327e80 100644 --- a/hosts/osmium/nixfiles-updated-inputs.nix +++ b/hosts/osmium/nixfiles-updated-inputs.nix @@ -1,20 +1,20 @@ { config, pkgs, ... }: { - systemd.services.nixfiles-updated-inputs = { + systemd.services.clerie-update-nixfiles = { 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 - HOME = "/var/lib/nixfiles-updated-inputs"; + HOME = "/var/lib/clerie-update-nixfiles"; }; serviceConfig = { Type = "oneshot"; - ExecStart = pkgs.nixfiles-updated-inputs + "/bin/nixfiles-updated-inputs"; - StateDirectory = "nixfiles-updated-inputs"; - WorkingDirectory = "/var/lib/nixfiles-updated-inputs"; + ExecStart = pkgs.clerie-update-nixfiles + "/bin/clerie-update-nixfiles"; + StateDirectory = "clerie-update-nixfiles"; + WorkingDirectory = "/var/lib/clerie-update-nixfiles"; DynamicUser = true; # 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"; }; diff --git a/hosts/osmium/secrets/nixfiles-updated-inputs-ssh.age b/hosts/osmium/secrets/clerie-update-nixfiles-ssh.age similarity index 100% rename from hosts/osmium/secrets/nixfiles-updated-inputs-ssh.age rename to hosts/osmium/secrets/clerie-update-nixfiles-ssh.age diff --git a/pkgs/nixfiles/nixfiles-updated-inputs.nix b/pkgs/clerie-update-nixfiles/clerie-update-nixfiles.nix similarity index 54% rename from pkgs/nixfiles/nixfiles-updated-inputs.nix rename to pkgs/clerie-update-nixfiles/clerie-update-nixfiles.nix index bab538a..bed20c8 100644 --- a/pkgs/nixfiles/nixfiles-updated-inputs.nix +++ b/pkgs/clerie-update-nixfiles/clerie-update-nixfiles.nix @@ -1,8 +1,8 @@ { pkgs, ... }: pkgs.writeShellApplication { - name = "nixfiles-updated-inputs"; - text = builtins.readFile ./nixfiles-updated-inputs.sh; + name = "clerie-update-nixfiles"; + text = builtins.readFile ./clerie-update-nixfiles.sh; runtimeInputs = with pkgs; [ git nix diff --git a/pkgs/nixfiles/nixfiles-updated-inputs.sh b/pkgs/clerie-update-nixfiles/clerie-update-nixfiles.sh similarity index 100% rename from pkgs/nixfiles/nixfiles-updated-inputs.sh rename to pkgs/clerie-update-nixfiles/clerie-update-nixfiles.sh diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 5a0267f..5a6c751 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -1,5 +1,6 @@ final: prev: { 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 {}; iot-data = final.python3.pkgs.callPackage ./iot-data {}; 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-generate-backup-secrets = final.callPackage ./nixfiles/nixfiles-generate-backup-secrets.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 {}; update-from-hydra = final.callPackage ./update-from-hydra {}; uptimestatus = final.python3.pkgs.callPackage ./uptimestatus {};