diff --git a/flake.nix b/flake.nix index 3a3c84a..df7abfe 100644 --- a/flake.nix +++ b/flake.nix @@ -280,7 +280,7 @@ ts1 = ./profiles/tailscale-inner.nix; ts2 = ./profiles/tailscale-outer.nix; tse = ./profiles/tailscale-exit-node.nix; - #rb = ./profiles/known-hosts.nix; # TODO + #rb = ./profiles/known-hosts; # TODO nixld = ./profiles/nix-ld.nix; dns64 = { config, ... }: { /* diff --git a/hosts/nixos/bjarte/configuration.nix b/hosts/nixos/bjarte/configuration.nix index 4405fcb..e0eb339 100644 --- a/hosts/nixos/bjarte/configuration.nix +++ b/hosts/nixos/bjarte/configuration.nix @@ -49,7 +49,7 @@ ../../../profiles/printing.nix - ../../../profiles/known-hosts.nix + ../../../profiles/known-hosts ]; environment.systemPackages = with pkgs; [ diff --git a/hosts/nixos/bolle/configuration.nix b/hosts/nixos/bolle/configuration.nix index e7d3621..e438997 100644 --- a/hosts/nixos/bolle/configuration.nix +++ b/hosts/nixos/bolle/configuration.nix @@ -22,7 +22,7 @@ ../../../profiles/shell.nix ../../../profiles/domeneshop-dyndns.nix - ../../../profiles/known-hosts.nix + ../../../profiles/known-hosts ]; services.domeneshop-updater.targets = [ config.networking.fqdn ]; diff --git a/hosts/nixos/eple/configuration.nix b/hosts/nixos/eple/configuration.nix index 931453c..45489c5 100644 --- a/hosts/nixos/eple/configuration.nix +++ b/hosts/nixos/eple/configuration.nix @@ -24,7 +24,7 @@ ../../../profiles/shell.nix ../../../profiles/domeneshop-dyndns.nix - ../../../profiles/known-hosts.nix + ../../../profiles/known-hosts ]; services.domeneshop-updater.targets = [ config.networking.fqdn ]; diff --git a/hosts/nixos/garp/configuration.nix b/hosts/nixos/garp/configuration.nix index ad0f678..fb25481 100644 --- a/hosts/nixos/garp/configuration.nix +++ b/hosts/nixos/garp/configuration.nix @@ -36,7 +36,7 @@ ../../../profiles/shell.nix ../../../profiles/domeneshop-dyndns.nix - ../../../profiles/known-hosts.nix + ../../../profiles/known-hosts ]; services.domeneshop-updater.targets = [ config.networking.fqdn ]; diff --git a/hosts/nixos/hasselknippe/configuration.nix b/hosts/nixos/hasselknippe/configuration.nix index 6af7df6..a3aa100 100644 --- a/hosts/nixos/hasselknippe/configuration.nix +++ b/hosts/nixos/hasselknippe/configuration.nix @@ -33,7 +33,7 @@ #../../../profiles/desktop/lutris.nix #../../../profiles/desktop/flatpak.nix - /* ../../../profiles/known-hosts.nix */ + /* ../../../profiles/known-hosts */ ]; networking.firewall.allowedTCPPorts = [ 57621 ]; # spotify local discovery diff --git a/hosts/nixos/nord/configuration.nix b/hosts/nixos/nord/configuration.nix index 6d68724..67345a0 100644 --- a/hosts/nixos/nord/configuration.nix +++ b/hosts/nixos/nord/configuration.nix @@ -42,7 +42,7 @@ ../../../profiles/desktop/retroarch.nix ../../../profiles/desktop/flatpak.nix - ../../../profiles/known-hosts.nix + ../../../profiles/known-hosts #../../../profiles/domeneshop-dyndns.nix # handled by noximilien ]; diff --git a/hosts/nixos/noximilien/configuration.nix b/hosts/nixos/noximilien/configuration.nix index 7a74caf..0a209c5 100644 --- a/hosts/nixos/noximilien/configuration.nix +++ b/hosts/nixos/noximilien/configuration.nix @@ -92,7 +92,7 @@ #../../../profiles/code-remote # TODO: move into web? services? ../../../profiles/domeneshop-dyndns.nix - ../../../profiles/known-hosts.nix + ../../../profiles/known-hosts /* ../../../profiles/autossh-reverse-tunnels */ #../../../profiles/xrdp ]; diff --git a/hosts/nixos/sopp/configuration.nix b/hosts/nixos/sopp/configuration.nix index 7f434df..e7003fd 100644 --- a/hosts/nixos/sopp/configuration.nix +++ b/hosts/nixos/sopp/configuration.nix @@ -64,7 +64,7 @@ ../../../profiles/desktop/lutris.nix ../../../profiles/desktop/flatpak.nix - ../../../profiles/known-hosts.nix + ../../../profiles/known-hosts #../../../profiles/domeneshop-dyndns.nix # handled by noximilien ]; diff --git a/hosts/system-manager/furiphoneflx1/configuration.nix b/hosts/system-manager/furiphoneflx1/configuration.nix index 0835e98..f5a1942 100644 --- a/hosts/system-manager/furiphoneflx1/configuration.nix +++ b/hosts/system-manager/furiphoneflx1/configuration.nix @@ -8,7 +8,7 @@ /* ../../../secrets */ /* ../../../profiles/lix.nix */ /* ../../../profiles/auto-upgrade.nix */ - /* ../../../profiles/known-hosts.nix */ + /* ../../../profiles/known-hosts */ ] # import modules from nixos # based on https://github.com/numtide/system-manager/blob/e09166d9d4eab2bf010c1589fbf4542a54b022e3/nix/modules/upstream/nixpkgs/default.nix#L9 diff --git a/profiles/known-hosts.nix b/profiles/known-hosts/default.nix similarity index 98% rename from profiles/known-hosts.nix rename to profiles/known-hosts/default.nix index 16ed673..dac0b67 100644 --- a/profiles/known-hosts.nix +++ b/profiles/known-hosts/default.nix @@ -30,7 +30,7 @@ let ''; known-hosts = let - known-hosts' = lib.importTOML ../hosts/known-hosts.toml; # TODO: eww + known-hosts' = lib.importTOML ./hosts.toml; # TODO: eww in lib.pipe known-hosts' [ (lib.flip lib.removeAttrs ["__default__"]) diff --git a/hosts/known-hosts.toml b/profiles/known-hosts/hosts.toml similarity index 100% rename from hosts/known-hosts.toml rename to profiles/known-hosts/hosts.toml