diff --git a/hosts/fw/configuration.nix b/hosts/fw/configuration.nix index f1fa1f7..193a412 100644 --- a/hosts/fw/configuration.nix +++ b/hosts/fw/configuration.nix @@ -24,6 +24,7 @@ ./modules/podman.nix ./modules/omada.nix ./modules/ddclient.nix + ./modules/cloonar-assistant-config-server.nix # ./modules/wol.nix diff --git a/hosts/fw/modules/cloonar-assistant-config-server.nix b/hosts/fw/modules/cloonar-assistant-config-server.nix index 330e389..99745ea 100644 --- a/hosts/fw/modules/cloonar-assistant-config-server.nix +++ b/hosts/fw/modules/cloonar-assistant-config-server.nix @@ -23,7 +23,7 @@ in { }; # the little awk script to extract the key for $1 - "cloonar_assistant_ssh/sftp-fetch-key.sh" = { + "ssh/sftp-fetch-key.sh" = { text = '' #!/usr/bin/env bash awk -v u="$1" '$1==u { $1=""; sub(/^ +/, ""); print }' /etc/cloonar_assistant_ssh/sftp_users_keys diff --git a/hosts/fw/modules/gitea.nix b/hosts/fw/modules/gitea.nix index 3e2daef..2454521 100644 --- a/hosts/fw/modules/gitea.nix +++ b/hosts/fw/modules/gitea.nix @@ -46,7 +46,6 @@ in config = { lib, config, pkgs, ... }: { imports = [ ../fleet.nix - ../modules/cloonar-assistant-config-server.nix ]; environment.systemPackages = with pkgs; [ diff --git a/hosts/nb/modules/sway/sway.conf b/hosts/nb/modules/sway/sway.conf index 26769fd..77f32e0 100644 --- a/hosts/nb/modules/sway/sway.conf +++ b/hosts/nb/modules/sway/sway.conf @@ -315,13 +315,8 @@ exec mako --default-timeout=5000 output eDP-1 mode 2880x1920 scale 2 output eDP-1 bg #282a36 solid_color output eDP-1 bg ~/.wallpaper.png center -output DP-2 position 0 0 -output DP-2 bg #282a36 solid_color -output DP-2 bg ~/.wallpaper.png center -output DP-4 position 0 0 output DP-4 bg #282a36 solid_color output DP-4 bg ~/.wallpaper.png center -output DP-5 position 0 0 output DP-5 bg #282a36 solid_color output DP-5 bg ~/.wallpaper.png center diff --git a/hosts/web-arm/modules/updns.nix b/hosts/web-arm/modules/updns.nix index 07f23e8..c23b49a 100644 --- a/hosts/web-arm/modules/updns.nix +++ b/hosts/web-arm/modules/updns.nix @@ -31,10 +31,6 @@ hetzner: api_token_file: "${config.sops.secrets.updns-token.path}" clients: - test: - secret_hash: "$2a$10$D/R6lX9CGXDb/4j5EV1UYu2GfyDO6hLk1FhpszeqSzME/mI4REsQO" - exact: - - "test.smart.cloonar.com" ghetto_at: secret_hash: "$2a$10$jzRYwqTQzSqMHnQNe.s8L.O2YcvzoPqgHkO1LklQhsD9UBLpI7Knu" exact: