diff --git a/flake.lock b/flake.lock index 0fc6b83..f721ac3 100644 --- a/flake.lock +++ b/flake.lock @@ -255,11 +255,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1744700942, - "narHash": "sha256-86WB18bzMNSgNOvVYFdaKP7wc310oyunwBUgROCJuBU=", + "lastModified": 1744703824, + "narHash": "sha256-scv7M9HrjqtE5u7Zf8CUnq0HRi4cdZBaVitZPA/iXGA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e0d95e12d46914e0d5a35807b780e23dca21bdf3", + "rev": "8852da7e72ef9f41684d83925c2f428b06587a29", "type": "github" }, "original": { diff --git a/home/features/desktop/media.nix b/home/features/desktop/media.nix index 45e03ce..4c3688d 100644 --- a/home/features/desktop/media.nix +++ b/home/features/desktop/media.nix @@ -41,17 +41,6 @@ in { ]; programs = { - obs-studio = { - enable = true; - plugins = with pkgs.obs-studio-plugins; [ - obs-composite-blur - obs-vaapi - obs-vertical-canvas - obs-vkcapture - obs-webkitgtk - wlrobs - ]; - }; mpv = { enable = true; bindings = { diff --git a/hosts/m3-atlas/services/containers/default.nix b/hosts/m3-atlas/services/containers/default.nix index da64c3f..82f574c 100644 --- a/hosts/m3-atlas/services/containers/default.nix +++ b/hosts/m3-atlas/services/containers/default.nix @@ -4,7 +4,7 @@ ./ghost.nix ./littlelink.nix ./matomo.nix - ./n8n.nix + # ./n8n.nix # ./pangolin.nix ./restreamer.nix ./slash.nix diff --git a/hosts/m3-atlas/services/containers/ghost.nix b/hosts/m3-atlas/services/containers/ghost.nix index 8d94f89..3d64cb3 100644 --- a/hosts/m3-atlas/services/containers/ghost.nix +++ b/hosts/m3-atlas/services/containers/ghost.nix @@ -1,6 +1,6 @@ {config, ...}: { virtualisation.oci-containers.containers."ghost" = { - image = "docker.io/ghost:5.106.1"; + image = "docker.io/ghost:latest"; environmentFiles = [config.age.secrets.ghost-env.path]; ports = ["127.0.0.1:3002:2368"]; volumes = ["ghost_data:/var/lib/ghost/content"]; diff --git a/hosts/m3-atlas/services/default.nix b/hosts/m3-atlas/services/default.nix index 5eca34e..a5746cb 100644 --- a/hosts/m3-atlas/services/default.nix +++ b/hosts/m3-atlas/services/default.nix @@ -5,6 +5,7 @@ ./headscale.nix ./minio.nix ./mysql.nix + ./n8n.nix ./postgres.nix ./searx.nix ./tailscale.nix diff --git a/hosts/m3-atlas/services/n8n.nix b/hosts/m3-atlas/services/n8n.nix new file mode 100644 index 0000000..6d49c69 --- /dev/null +++ b/hosts/m3-atlas/services/n8n.nix @@ -0,0 +1,24 @@ +{ + services.n8n = { + enable = true; + webhookUrl = "https://wf.m3tam3re.com"; + }; + + # Traefik configuration specific to n8n + services.traefik.dynamicConfigOptions.http = { + services.n8n.loadBalancer.servers = [ + { + url = "http://localhost:5678/"; + } + ]; + + routers.n8n = { + rule = "Host(`wf.m3tam3re.com`)"; + tls = { + certResolver = "godaddy"; + }; + service = "n8n"; + entrypoints = "websecure"; + }; + }; +} diff --git a/hosts/m3-kratos/programs.nix b/hosts/m3-kratos/programs.nix index 29bcec3..81b67a1 100644 --- a/hosts/m3-kratos/programs.nix +++ b/hosts/m3-kratos/programs.nix @@ -20,6 +20,18 @@ dedicatedServer.openFirewall = true; gamescopeSession.enable = true; }; + programs.obs-studio = { + enable = true; + enableVirtualCamera = true; + plugins = with pkgs.obs-studio-plugins; [ + obs-composite-blur + obs-vaapi + obs-vertical-canvas + obs-vkcapture + obs-webkitgtk + wlrobs + ]; + }; programs.fish.enable = true; programs.thunar = { enable = true;