ctucx.git: nixfiles

darwin: move syncthing from machine configuration to general darwin-configuartion

diff --git a/configurations/common/darwin.nix b/configurations/common/darwin.nix
@@ -12,6 +12,11 @@
     ../darwin/skhd.nix
     ../darwin/yabai.nix
     ../darwin/speakers.nix
+    ../darwin/syncthing.nix
+
+    ../programs/cli/gpg.nix
+    ../programs/cli/password-store.nix
+    ../programs/cli/texlive.nix
   ];
 
   services.nix-daemon.enable = true;

diff --git a/configurations/darwin/syncthing.nix b/configurations/darwin/syncthing.nix
@@ -0,0 +1,21 @@
+{ inputs, pkgs, config, lib, ... }:
+
+let
+  syncthingConfig = import ../../configurations/syncthing.nix { inherit inputs; inherit pkgs; inherit config; inherit lib; };
+
+in {
+
+  services = {
+    syncthing = {
+      enable  = true;
+
+      user    = "leah";
+      group   = "staff";
+
+      dataDir = syncthingConfig.dataDir;
+      devices = syncthingConfig.devices;
+      folders = syncthingConfig.folders;
+    };
+  };
+
+}

diff --git a/machines/blechbuechse/darwin-configuration.nix b/machines/blechbuechse/darwin-configuration.nix
@@ -3,12 +3,6 @@
 {
   imports = [
     ../../configurations/common
-
-    ../../configurations/programs/cli/gpg.nix
-    ../../configurations/programs/cli/password-store.nix
-    ../../configurations/programs/cli/texlive.nix
-
-    ./syncthing.nix
   ];
 
   networking.hostName     = "blechbuechse";

diff --git a/machines/blechbuechse/syncthing.nix b/machines/blechbuechse/syncthing.nix
@@ -1,23 +0,0 @@
-{ inputs, pkgs, config, lib, ... }:
-
-let
-  syncthingConfig = import ../../configurations/syncthing.nix { inherit inputs; inherit pkgs; inherit config; inherit lib; };
-
-in {
-  imports = [
-    ../../modules/darwin/syncthing.nix
-  ];
-
-  services = {
-    syncthing = {
-      enable  = true;
-
-      user    = "leah";
-      group   = "staff";
-
-      dataDir = syncthingConfig.dataDir;
-      devices = syncthingConfig.devices;
-      folders = syncthingConfig.folders;
-    };
-  };
-}

diff --git a/machines/blechkasten/darwin-configuration.nix b/machines/blechkasten/darwin-configuration.nix
@@ -4,12 +4,6 @@
 
   imports = [
     ../../configurations/common
-
-    ../../configurations/programs/cli/gpg.nix
-    ../../configurations/programs/cli/password-store.nix
-    ../../configurations/programs/cli/texlive.nix
-
-    ./syncthing.nix
   ];
 
   networking.hostName     = "blechkasten";

diff --git a/machines/blechkasten/syncthing.nix b/machines/blechkasten/syncthing.nix
@@ -1,23 +0,0 @@
-{ inputs, pkgs, config, lib, ... }:
-
-let
-  syncthingConfig = import ../../configurations/syncthing.nix { inherit inputs; inherit pkgs; inherit config; inherit lib; };
-
-in {
-  imports = [
-    ../../modules/darwin/syncthing.nix
-  ];
-
-  services = {
-    syncthing = {
-      enable  = true;
-
-      user    = "leah";
-      group   = "staff";
-
-      dataDir = syncthingConfig.dataDir;
-      devices = syncthingConfig.devices;
-      folders = syncthingConfig.folders;
-    };
-  };
-}

diff --git a/modules/default.nix b/modules/default.nix
@@ -12,6 +12,7 @@
     (if (currentSystem == "aarch64-darwin") then [
       ./darwin/quirks.nix
       ./darwin/hidutil.nix
+      ./darwin/syncthing.nix
     ] else [])
   ]);