diff --git a/hosts/nixos/tahani/default.nix b/hosts/nixos/tahani/default.nix index ae1177b..ae3f20d 100644 --- a/hosts/nixos/tahani/default.nix +++ b/hosts/nixos/tahani/default.nix @@ -65,28 +65,6 @@ }; }; - services.syncthing = { - enable = true; - openDefaultPorts = true; - dataDir = "/home/${user}/.local/share/syncthing"; - configDir = "/home/${user}/.config/syncthing"; - user = "${user}"; - group = "users"; - guiAddress = "0.0.0.0:8384"; - overrideFolders = true; - overrideDevices = true; - - settings = { - devices = {}; - options.globalAnnounceEnabled = false; - }; - folders = { - "Projects" = { - path = "/home/${user}/Projects"; - devices = []; - }; - }; - }; services.postgresql = { enable = true; diff --git a/modules/platform/darwin/default.nix b/modules/platform/darwin/default.nix index a97f526..96b2b6b 100644 --- a/modules/platform/darwin/default.nix +++ b/modules/platform/darwin/default.nix @@ -1,17 +1,20 @@ { config, - pkgs, - nixvim, - user, constants, + nixvim, + pkgs, + user, + sops-nix, ... }: { imports = [ ../../core ../../networking/tailscale.nix - ./system.nix - ./homebrew.nix + ../../services/syncthing.nix ./dock + ./homebrew.nix + ./system.nix + sops-nix.darwinModules.sops ]; system = { diff --git a/modules/platform/nixos/default.nix b/modules/platform/nixos/default.nix index 0ef2819..a94ad9c 100644 --- a/modules/platform/nixos/default.nix +++ b/modules/platform/nixos/default.nix @@ -10,8 +10,9 @@ ../../core ../../networking/firewall.nix ../../networking/ssh.nix - ./tailscale.nix ../../services/adguard.nix + ../../services/syncthing.nix + ./tailscale.nix sops-nix.nixosModules.sops ]; diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix new file mode 100644 index 0000000..ea5d51b --- /dev/null +++ b/modules/services/syncthing.nix @@ -0,0 +1,24 @@ +{user, ...}: { + services.syncthing = { + enable = true; + openDefaultPorts = true; + dataDir = "/home/${user}/.local/share/syncthing"; + configDir = "/home/${user}/.config/syncthing"; + user = "${user}"; + group = "users"; + guiAddress = "0.0.0.0:8384"; + overrideFolders = true; + overrideDevices = true; + + settings = { + devices = {}; + folders = { + "Projects" = { + path = "/home/${user}/Projects"; + devices = []; + }; + }; + options.globalAnnounceEnabled = false; + }; + }; +}