summaryrefslogtreecommitdiff
path: root/profiles/core
diff options
context:
space:
mode:
Diffstat (limited to 'profiles/core')
-rw-r--r--profiles/core/configuration.nix3
-rw-r--r--profiles/core/syncthing.nix14
2 files changed, 11 insertions, 6 deletions
diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix
index 8d113cb..36dc255 100644
--- a/profiles/core/configuration.nix
+++ b/profiles/core/configuration.nix
@@ -1,4 +1,5 @@
{
+ machine,
config,
pkgs,
lib,
@@ -65,7 +66,7 @@
file
pstree
bc
- ] ++ optionals (!pkgs.stdenv.isDarwin) [
+ ] ++ optionals (!machine.isDarwin) [
pkgsi686Linux.glibc
gdb
pciutils
diff --git a/profiles/core/syncthing.nix b/profiles/core/syncthing.nix
index d735cca..e5c19f7 100644
--- a/profiles/core/syncthing.nix
+++ b/profiles/core/syncthing.nix
@@ -1,4 +1,4 @@
-{lib,...}: with lib; {
+{config, lib,...}: with lib; {
services.syncthing = {
enable = true;
user = ivi.username;
@@ -6,9 +6,13 @@
overrideDevices = true;
overrideFolders = true;
- devices = mapAttrs (_: m: {
- inherit (m.syncthing) id;
- introducer = m.isServer;
- }) (filterAttrs (_: m: m.syncthing.enable) ivi.machines);
+ key = config.secrets.syncthing.path;
+
+ settings = {
+ devices = mapAttrs (_: m: {
+ inherit (m.syncthing) id;
+ introducer = m.isServer;
+ }) (filterAttrs (_: m: m.syncthing.enable) ivi.machines);
+ };
};
}