diff options
| author | Martin Fischer <martin@push-f.com> | 2026-10-17 10:25:41 +0200 |
|---|---|---|
| committer | Martin Fischer <martin@push-f.com> | 2026-10-17 11:55:49 +0200 |
| commit | c8165d2a72b9e2e2c67c4b1aad40a0c3e256dd4d (patch) | |
| tree | eb0f6fc5d3463c82410dd703a4fd45a979ccfa1f /nixos | |
| parent | b2f4c85a6c1afb74b257a14dcce9236ae021fe4a (diff) | |
refactor: use relative paths
They work with `gf` in vim.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/helpers.nix | 2 | ||||
| -rw-r--r-- | nixos/hosts/ev/default.nix | 16 | ||||
| -rw-r--r-- | nixos/hosts/ev/exporters.nix | 4 | ||||
| -rw-r--r-- | nixos/hosts/ev/qbittorrent.nix | 2 | ||||
| -rw-r--r-- | nixos/hosts/hamac/default.nix | 6 | ||||
| -rw-r--r-- | nixos/hosts/tente/default.nix | 12 | ||||
| -rw-r--r-- | nixos/hosts/tente/exporters.nix | 6 | ||||
| -rw-r--r-- | nixos/hosts/tente/git-web.nix | 2 | ||||
| -rw-r--r-- | nixos/hosts/tente/grafana.nix | 2 | ||||
| -rw-r--r-- | nixos/hosts/tente/web-personal.nix | 2 | ||||
| -rw-r--r-- | nixos/profiles/workstation/default.nix | 2 | ||||
| -rwxr-xr-x | nixos/rebuild | 2 | ||||
| -rw-r--r-- | nixos/shared/monitoring.nix | 2 |
13 files changed, 30 insertions, 30 deletions
diff --git a/nixos/helpers.nix b/nixos/helpers.nix index e64ef0a..4ee33ef 100644 --- a/nixos/helpers.nix +++ b/nixos/helpers.nix @@ -83,7 +83,7 @@ writeAlloyConfig = cfg: let - alloy-nix-config = "${pkgs.callPackage <top/shared/alloy-nix-config> {}}/bin/alloy-nix-config"; + alloy-nix-config = "${pkgs.callPackage ./shared/alloy-nix-config {}}/bin/alloy-nix-config"; in pkgs.runCommand "generated-config" {} '' ${alloy-nix-config} ${pkgs.writeText "input.json" (builtins.toJSON cfg)} $out diff --git a/nixos/hosts/ev/default.nix b/nixos/hosts/ev/default.nix index a528fe4..dc77416 100644 --- a/nixos/hosts/ev/default.nix +++ b/nixos/hosts/ev/default.nix @@ -6,7 +6,7 @@ let ports = import ./ports.nix; - helpers = import <top/helpers.nix> { inherit config lib pkgs; }; + helpers = import ../../helpers.nix { inherit config lib pkgs; }; backupHost = "u518695-sub2@u518695-sub2.your-storagebox.de"; pkgs-unstable = import sources.nixos-unstable {}; in @@ -14,13 +14,13 @@ in _module.args = { inherit pkgs-unstable; }; imports = [ ./hardware-configuration.nix - <top/profiles/server> - <top/shared/monitoring.nix> - <top/shared/postgresql.nix> - <top/shared/tailscale.nix> - <top/shared/basics-physical.nix> - <top/shared/vpn.nix> - <top/shared/restic-database-backups.nix> + ../../profiles/server + ../../shared/monitoring.nix + ../../shared/postgresql.nix + ../../shared/tailscale.nix + ../../shared/basics-physical.nix + ../../shared/vpn.nix + ../../shared/restic-database-backups.nix ./exporters.nix ./home-automation.nix ./kodi.nix diff --git a/nixos/hosts/ev/exporters.nix b/nixos/hosts/ev/exporters.nix index 097e3e5..f22f043 100644 --- a/nixos/hosts/ev/exporters.nix +++ b/nixos/hosts/ev/exporters.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - helpers = import <top/shared/postgres-collectors.nix> { inherit config lib pkgs; }; + helpers = import ../../shared/postgres-collectors.nix { inherit config lib pkgs; }; cfg = config.exporters; in { @@ -12,7 +12,7 @@ in }; imports = [ - <top/shared/prometheus-sql-exporter/service.nix> + ../../shared/prometheus-sql-exporter/service.nix ]; config = { diff --git a/nixos/hosts/ev/qbittorrent.nix b/nixos/hosts/ev/qbittorrent.nix index a666f55..6216eac 100644 --- a/nixos/hosts/ev/qbittorrent.nix +++ b/nixos/hosts/ev/qbittorrent.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - helpers = import <top/helpers.nix> { inherit config lib pkgs; }; + helpers = import ../../helpers.nix { inherit config lib pkgs; }; cfg = config.qbittorrent; in { diff --git a/nixos/hosts/hamac/default.nix b/nixos/hosts/hamac/default.nix index c68c408..b5c473e 100644 --- a/nixos/hosts/hamac/default.nix +++ b/nixos/hosts/hamac/default.nix @@ -9,9 +9,9 @@ in _module.args = { inherit pkgs-unstable; }; imports = [ ./hardware-configuration.nix - <top/profiles/workstation> - <top/shared/tailscale.nix> - <top/shared/vpn.nix> + ../../profiles/workstation + ../../shared/tailscale.nix + ../../shared/vpn.nix ]; workstation.username = "martin"; diff --git a/nixos/hosts/tente/default.nix b/nixos/hosts/tente/default.nix index 04a2c98..085924f 100644 --- a/nixos/hosts/tente/default.nix +++ b/nixos/hosts/tente/default.nix @@ -9,18 +9,18 @@ let acmeEmail = "martin@push-f.com"; backupHost = "u518695-sub1@u518695-sub1.your-storagebox.de"; ports = import ./ports.nix; - helpers = import <top/helpers.nix> { inherit config lib pkgs; }; + helpers = import ../../helpers.nix { inherit config lib pkgs; }; gitoliteDataDir = "/srv/gitolite"; reposDir = "${gitoliteDataDir}/repositories"; in { imports = [ ./hardware-configuration.nix - <top/profiles/server> - <top/shared/postgresql.nix> - <top/shared/tailscale.nix> - <top/shared/monitoring.nix> - <top/shared/restic-database-backups.nix> + ../../profiles/server + ../../shared/postgresql.nix + ../../shared/tailscale.nix + ../../shared/monitoring.nix + ../../shared/restic-database-backups.nix ./web-personal.nix ./git-web.nix ./gitolite.nix diff --git a/nixos/hosts/tente/exporters.nix b/nixos/hosts/tente/exporters.nix index 3a587e0..f146567 100644 --- a/nixos/hosts/tente/exporters.nix +++ b/nixos/hosts/tente/exporters.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - helpers = import <top/shared/postgres-collectors.nix> { inherit config lib pkgs; }; + helpers = import ../../shared/postgres-collectors.nix { inherit config lib pkgs; }; cfg = config.exporters; in { @@ -15,8 +15,8 @@ in }; imports = [ - <top/shared/prometheus-sql-exporter/service.nix> - <top/shared/prometheus-storagebox-exporter/service.nix> + ../../shared/prometheus-sql-exporter/service.nix + ../../shared/prometheus-storagebox-exporter/service.nix ]; config = { diff --git a/nixos/hosts/tente/git-web.nix b/nixos/hosts/tente/git-web.nix index c2fc709..9271697 100644 --- a/nixos/hosts/tente/git-web.nix +++ b/nixos/hosts/tente/git-web.nix @@ -2,7 +2,7 @@ let cfg = config.gitWeb; - helpers = import <top/helpers.nix> { inherit config lib pkgs; }; + helpers = import ../../helpers.nix { inherit config lib pkgs; }; in { options.gitWeb = { diff --git a/nixos/hosts/tente/grafana.nix b/nixos/hosts/tente/grafana.nix index 1a1da1f..3d7812c 100644 --- a/nixos/hosts/tente/grafana.nix +++ b/nixos/hosts/tente/grafana.nix @@ -3,7 +3,7 @@ let cfg = config.grafana; ports = import ./ports.nix; - evPorts = import <top/hosts/ev/ports.nix>; + evPorts = import ../ev/ports.nix; in { options.grafana = { diff --git a/nixos/hosts/tente/web-personal.nix b/nixos/hosts/tente/web-personal.nix index d41356f..5bc6362 100644 --- a/nixos/hosts/tente/web-personal.nix +++ b/nixos/hosts/tente/web-personal.nix @@ -2,7 +2,7 @@ let cfg = config.web-personal; - helpers = import <top/helpers.nix> { inherit config lib pkgs; }; + helpers = import ../../helpers.nix { inherit config lib pkgs; }; in { options.web-personal = { diff --git a/nixos/profiles/workstation/default.nix b/nixos/profiles/workstation/default.nix index 0961a24..578cece 100644 --- a/nixos/profiles/workstation/default.nix +++ b/nixos/profiles/workstation/default.nix @@ -13,7 +13,7 @@ in imports = [ ../common - <top/shared/basics-physical.nix> + ../../shared/basics-physical.nix (import ./graphical.nix { inherit config pkgs cmd50; }) ./firefox.nix ./dev.nix diff --git a/nixos/rebuild b/nixos/rebuild index dc7ee5d..3c675b2 100755 --- a/nixos/rebuild +++ b/nixos/rebuild @@ -47,5 +47,5 @@ nixpkgsPath=$( # nixos-rebuild always reads Nixpkgs from the NIX_PATH, # so we need to set it explicitly to our pinned version - exec nixos-rebuild "$@" --file "$top/system.nix" -I nixpkgs="$nixpkgsPath" -I nixos-config="$configPath" -I top="$top" + exec nixos-rebuild "$@" --file "$top/system.nix" -I nixpkgs="$nixpkgsPath" -I nixos-config="$configPath" ) diff --git a/nixos/shared/monitoring.nix b/nixos/shared/monitoring.nix index 5ef10a6..ede2189 100644 --- a/nixos/shared/monitoring.nix +++ b/nixos/shared/monitoring.nix @@ -2,7 +2,7 @@ let cfg = config.monitoring; - helpers = import <top/helpers.nix> { inherit config lib pkgs; }; + helpers = import ../helpers.nix { inherit config lib pkgs; }; in { options.monitoring = { |
