From a06d843d5c1e0ca289ce7ac304e6ce977b9f6b12 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 24 Oct 2024 13:58:51 +1000
Subject: [PATCH] 'toString inputs' -> 'inputs'

---
 hosts/build02/nixpkgs-update-backup.nix | 2 +-
 hosts/build02/nixpkgs-update.nix        | 2 +-
 modules/darwin/hercules-ci.nix          | 4 ++--
 modules/nixos/common/sops-nix.nix       | 2 +-
 modules/nixos/common/users.nix          | 2 +-
 modules/nixos/github-org-backup.nix     | 2 +-
 modules/nixos/hercules-ci.nix           | 6 +++---
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hosts/build02/nixpkgs-update-backup.nix b/hosts/build02/nixpkgs-update-backup.nix
index fe27bdc..6d93360 100644
--- a/hosts/build02/nixpkgs-update-backup.nix
+++ b/hosts/build02/nixpkgs-update-backup.nix
@@ -3,7 +3,7 @@
   # 100GB storagebox is attached to the build02 server
 
   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 = {
diff --git a/hosts/build02/nixpkgs-update.nix b/hosts/build02/nixpkgs-update.nix
index cc35006..f106249 100644
--- a/hosts/build02/nixpkgs-update.nix
+++ b/hosts/build02/nixpkgs-update.nix
@@ -6,7 +6,7 @@
   ...
 }:
 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";
 
diff --git a/modules/darwin/hercules-ci.nix b/modules/darwin/hercules-ci.nix
index ede2ddf..a68140b 100644
--- a/modules/darwin/hercules-ci.nix
+++ b/modules/darwin/hercules-ci.nix
@@ -1,14 +1,14 @@
 { config, inputs, ... }:
 {
   age.secrets.hercules-binary-caches = {
-    file = "${toString inputs.self}/secrets/hercules-binary-caches.age";
+    file = "${inputs.self}/secrets/hercules-binary-caches.age";
     mode = "600";
     owner = "_hercules-ci-agent";
     group = "_hercules-ci-agent";
   };
 
   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";
     owner = "_hercules-ci-agent";
     group = "_hercules-ci-agent";
diff --git a/modules/nixos/common/sops-nix.nix b/modules/nixos/common/sops-nix.nix
index 6858440..1e1e81a 100644
--- a/modules/nixos/common/sops-nix.nix
+++ b/modules/nixos/common/sops-nix.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  defaultSopsPath = "${toString inputs.self}/hosts/${config.networking.hostName}/secrets.yaml";
+  defaultSopsPath = "${inputs.self}/hosts/${config.networking.hostName}/secrets.yaml";
 in
 {
   imports = [
diff --git a/modules/nixos/common/users.nix b/modules/nixos/common/users.nix
index 29f321a..9f116ac 100644
--- a/modules/nixos/common/users.nix
+++ b/modules/nixos/common/users.nix
@@ -1,7 +1,7 @@
 { inputs, lib, ... }:
 
 let
-  usersDir = "${toString inputs.self}/users";
+  usersDir = "${inputs.self}/users";
   userImports =
     let
       toUserPath = f: usersDir + "/${f}";
diff --git a/modules/nixos/github-org-backup.nix b/modules/nixos/github-org-backup.nix
index 9de2c55..469868e 100644
--- a/modules/nixos/github-org-backup.nix
+++ b/modules/nixos/github-org-backup.nix
@@ -32,7 +32,7 @@
   };
 
   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 = {
diff --git a/modules/nixos/hercules-ci.nix b/modules/nixos/hercules-ci.nix
index 6f7a88a..5d5d006 100644
--- a/modules/nixos/hercules-ci.nix
+++ b/modules/nixos/hercules-ci.nix
@@ -1,17 +1,17 @@
 { config, inputs, ... }:
 {
   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";
   };
 
   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";
   };
 
   age.secrets.hercules-secrets = {
-    file = "${toString inputs.self}/secrets/hercules-secrets.age";
+    file = "${inputs.self}/secrets/hercules-secrets.age";
     owner = "hercules-ci-agent";
   };