From 57684db260b6a4a3a73ff41e624af2e0c70a049b Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Wed, 30 Apr 2025 15:54:01 +0200 Subject: [PATCH 1/3] fix: sway display layout --- hosts/nb/modules/sway/sway.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/nb/modules/sway/sway.conf b/hosts/nb/modules/sway/sway.conf index 77f32e0..26769fd 100644 --- a/hosts/nb/modules/sway/sway.conf +++ b/hosts/nb/modules/sway/sway.conf @@ -315,8 +315,13 @@ 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 From 7ac54dd9878e7c73113a45023bf2e30cfc550014 Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Wed, 30 Apr 2025 15:54:18 +0200 Subject: [PATCH 2/3] feat: add test to updns --- hosts/web-arm/modules/updns.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/web-arm/modules/updns.nix b/hosts/web-arm/modules/updns.nix index c23b49a..07f23e8 100644 --- a/hosts/web-arm/modules/updns.nix +++ b/hosts/web-arm/modules/updns.nix @@ -31,6 +31,10 @@ 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: From 6f9b384caae89417a70099f3b1b978e29e3bc063 Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Wed, 30 Apr 2025 15:54:45 +0200 Subject: [PATCH 3/3] fix: cloonar assistant config server --- hosts/fw/configuration.nix | 1 - hosts/fw/modules/cloonar-assistant-config-server.nix | 2 +- hosts/fw/modules/gitea.nix | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/fw/configuration.nix b/hosts/fw/configuration.nix index 193a412..f1fa1f7 100644 --- a/hosts/fw/configuration.nix +++ b/hosts/fw/configuration.nix @@ -24,7 +24,6 @@ ./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 99745ea..330e389 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 - "ssh/sftp-fetch-key.sh" = { + "cloonar_assistant_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 2454521..3e2daef 100644 --- a/hosts/fw/modules/gitea.nix +++ b/hosts/fw/modules/gitea.nix @@ -46,6 +46,7 @@ in config = { lib, config, pkgs, ... }: { imports = [ ../fleet.nix + ../modules/cloonar-assistant-config-server.nix ]; environment.systemPackages = with pkgs; [