From b12cacc9d7327170b624cfdaaa3514dfdece1cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 17 Mar 2025 11:56:59 +0100
Subject: nixos: switch to new syncthing
---
nixos/configurations/errol.nix | 8 --------
nixos/configurations/lipwig.nix | 23 +++++++----------------
nixos/configurations/ridcully.nix | 8 --------
3 files changed, 7 insertions(+), 32 deletions(-)
(limited to 'nixos/configurations')
diff --git a/nixos/configurations/errol.nix b/nixos/configurations/errol.nix
index 0ece262..f986631 100644
--- a/nixos/configurations/errol.nix
+++ b/nixos/configurations/errol.nix
@@ -94,15 +94,7 @@ in {
services = {
syncthing = {
enable = true;
- user = mkDefault "cynerd";
- group = mkDefault "cynerd";
- openDefaultPorts = true;
-
- overrideDevices = false;
- overrideFolders = false;
-
dataDir = "/home/cynerd";
- configDir = "/home/cynerd/.config/syncthing";
};
home-assistant = {
diff --git a/nixos/configurations/lipwig.nix b/nixos/configurations/lipwig.nix
index c70bedd..4dc51c7 100644
--- a/nixos/configurations/lipwig.nix
+++ b/nixos/configurations/lipwig.nix
@@ -20,10 +20,6 @@
hw = false;
drives = false;
};
- syncthing = {
- enable = false;
- baseDir = "/nas";
- };
wireguard = true;
borgjobs = {
postgresql.dumpCommand = pkgs.writeScript "postgreqsl-backup.sh" ''
@@ -236,7 +232,6 @@
previewgenerator
spreed
tasks
- #twofactor_nextcloud_notification
twofactor_webauthn
;
# Additional modules can be fetched with:
@@ -252,13 +247,13 @@
license = "agpl3Plus";
};
money = pkgs.fetchNextcloudApp {
- url = "https://github.com/powerpaul17/nc_money/releases/download/v0.29.0/money.tar.gz";
- hash = "sha256-EXcY69z5h6rT0RdkmOhQYKSWmVBr2zaWuSRj/m5dMkI=";
+ url = "https://github.com/powerpaul17/nc_money/releases/download/v0.29.1/money.tar.gz";
+ hash = "sha256-6ZCVcJRmE2gNsp+Tg7Jcddwv6yqmNFATFHn9x6UJL7c=";
license = "agpl3Plus";
};
passwords = pkgs.fetchNextcloudApp {
- url = "https://git.mdns.eu/api/v4/projects/45/packages/generic/passwords/2024.12.1/passwords.tar.gz";
- hash = "sha256-I0+w8H56Lam9CChAPrGbA6VvEmkNi3FhmBuOUgvlTaE=";
+ url = "https://git.mdns.eu/api/v4/projects/45/packages/generic/passwords/2025.2.0/passwords.tar.gz";
+ hash = "sha256-Nu6WViFawQWby9CEEezAwoBNdp7O5O8a9IhDp/me/E0=";
license = "agpl3Plus";
};
};
@@ -354,16 +349,12 @@
};
users.groups.searx.members = ["nginx"];
- # Old Syncthing ############################################################
+ # Syncthing ################################################################
services.syncthing = {
enable = true;
- openDefaultPorts = true;
-
- overrideDevices = false;
- overrideFolders = false;
-
+ user = "syncthing";
+ group = "syncthing";
dataDir = "/nas/sync";
- configDir = "/nas/sync/.syncthing";
};
};
}
diff --git a/nixos/configurations/ridcully.nix b/nixos/configurations/ridcully.nix
index 310b5b0..0b2705c 100644
--- a/nixos/configurations/ridcully.nix
+++ b/nixos/configurations/ridcully.nix
@@ -75,15 +75,7 @@ in {
services.syncthing = {
enable = true;
- user = mkDefault "cynerd";
- group = mkDefault "cynerd";
- openDefaultPorts = true;
-
- overrideDevices = false;
- overrideFolders = false;
-
dataDir = "/home/cynerd";
- configDir = "/home/cynerd/.config/syncthing";
};
# Force nix to use less jobs
--
cgit v1.2.3