diff --git a/home-manager/common/desktops/plasma6/plasma-manager.nix b/home-manager/common/desktops/plasma6/plasma-manager.nix index 8bb8c2b5..bc3d1c6d 100644 --- a/home-manager/common/desktops/plasma6/plasma-manager.nix +++ b/home-manager/common/desktops/plasma6/plasma-manager.nix @@ -84,6 +84,7 @@ "applications:bitwarden.desktop" "applications:org.kde.konsole.desktop" "applications:steam.desktop" + "applications:logseq.desktop" ]; }; } diff --git a/nixos/common/services/syncthing.nix b/nixos/common/services/syncthing.nix index 0f8b29da..862729a9 100644 --- a/nixos/common/services/syncthing.nix +++ b/nixos/common/services/syncthing.nix @@ -1,4 +1,4 @@ -{pkgs, username, hostname, config, deployment_type, ... }: { +{ username, hostname, deployment_type, ... }: { # Set up the secrets file: sops.secrets."syncthing_cert" = { owner = "root"; @@ -11,8 +11,14 @@ restartUnits = [ "syncthing.service" ]; }; + networking.firewall.interfaces.tailscale0 = { + allowedTCPPorts = [ 8384 22000 ]; + allowedUDPPorts = [ 22000 21027 ]; + }; + services.syncthing = { enable = true; + urAccepted = "-1"; cert = "/run/secrets/syncthing_cert"; key = "/run/secrets/syncthing_key"; user = "${username}"; diff --git a/nixos/common/services/tailscale.nix b/nixos/common/services/tailscale.nix index ed37e679..ca547c80 100644 --- a/nixos/common/services/tailscale.nix +++ b/nixos/common/services/tailscale.nix @@ -1,4 +1,4 @@ -{ pkgs-unstable, pkgs, ... }: { +{ pkgs-unstable, ... }: { # Enable tailscale and open port 22 on it services.tailscale = { enable = true; @@ -19,6 +19,8 @@ # Because of the split DNS, hosts forget which IP # (external or internal) is promtail/loki. # Setting them manually here helps. + + # TODO: Update these when I move the server to warsaw-ovh-01 networking.extraHosts = '' 100.64.0.14 influx.sysctl.io 100.64.0.14 loki.sysctl.io diff --git a/nixos/containers/rdesktop/syncthing.nix b/nixos/containers/rdesktop/syncthing.nix index e87317ec..a4dc8888 100644 --- a/nixos/containers/rdesktop/syncthing.nix +++ b/nixos/containers/rdesktop/syncthing.nix @@ -7,7 +7,7 @@ "logseq" = { id = "logseq"; path = "/home/${username}/.logseq"; - devices = [ "framework-server" "nixos-desktop" "nixos-framework" "rdesktop" ]; + devices = [ "framework-server" "nixos-desktop" "nixos-framework" "rdesktop" ]; }; }; }; diff --git a/nixos/hosts/nixos-desktop/syncthing.nix b/nixos/hosts/nixos-desktop/syncthing.nix index 674f1b0c..503a8a67 100644 --- a/nixos/hosts/nixos-desktop/syncthing.nix +++ b/nixos/hosts/nixos-desktop/syncthing.nix @@ -1,4 +1,4 @@ -{ pkgs, config, hostname, username, ... }: { +{ username, ... }: { imports = [ ../../common/services/syncthing.nix ]; services.syncthing = {