diff --git a/machines/Everest/configuration.nix b/machines/Everest/configuration.nix index 1d88a68..fd2f6de 100755 --- a/machines/Everest/configuration.nix +++ b/machines/Everest/configuration.nix @@ -59,9 +59,10 @@ }; # Open ports in the firewall. - # No idea what ports 5201 and 21027 do tho - networking.firewall.allowedTCPPorts = [ 5201 ]; - networking.firewall.allowedUDPPorts = [ 5201 21027]; + # 8384 is syncthing's webui, and 22000 is syncthing related too + # No idea what 5201 and 21027 do tho + networking.firewall.allowedTCPPorts = [ 5201 8384 22000 ]; + networking.firewall.allowedUDPPorts = [ 5201 22000 21027]; # Or disable the firewall altogether. # networking.firewall.enable = false; } diff --git a/roles/common/services/syncthing.nix b/roles/common/services/syncthing.nix index da9174f..551063a 100755 --- a/roles/common/services/syncthing.nix +++ b/roles/common/services/syncthing.nix @@ -1,16 +1,8 @@ { config, ... }: { + # Set up devices and folders common to every device services.syncthing = { - overrideDevices = true; - overrideFolders = true; - openDefaultPorts = true; - extraOptions = { - options = { - urAccepted = 3; - }; - }; - # Set up devices and folders common to every device devices = { "phone" = { name = "Xiaomi Redmi Note 10 Pro"; @@ -24,16 +16,12 @@ name = "Steam Deck"; id = "DLQPL74-KEQTPM5-X4PDZHB-4HLQYHV-UCMJLOB-P6W3KWU-QLJADBY-V4KEMA5"; }; - "server" = { - name = "Everest"; - id = "BVJBCAZ-WDIWBFR-CK3WB3N-TWH3UXX-EPZXVWE-BLQ3IDU-U7MHVVB-WO4BKAJ"; - }; }; folders = { "passwords" = { label = "KeePassXC Passwords"; id = "rdyaq-ex659"; - devices = [ "phone" "pc" "steamdeck" "server"]; + devices = [ "phone" "pc" "steamdeck"]; }; }; }; diff --git a/roles/desktop/services/default.nix b/roles/desktop/services/default.nix index 6393486..19921e3 100644 --- a/roles/desktop/services/default.nix +++ b/roles/desktop/services/default.nix @@ -4,6 +4,5 @@ imports = [ ./ssh-agent.nix ./flatpak.nix - ./syncthing.nix ]; } diff --git a/roles/desktop/services/syncthing.nix b/roles/desktop/services/syncthing.nix deleted file mode 100644 index 728dd0e..0000000 --- a/roles/desktop/services/syncthing.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, ... }: - -{ - services.syncthing = { - enable = true; - user = "toast"; - group = "users"; - dataDir = config.users.users.toast.home; - folders."passwords".path = "~/Documents/Passwords"; - }; -}