ctucx.git: nixfiles

configurations/common/syncthing-config: comment out lollo-old

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 .DS_Store
 result
-secrets/syncthing-ids.nix

diff --git a/configurations/common/syncthing-config.nix b/configurations/common/syncthing-config.nix
@@ -1,29 +1,27 @@
 { inputs, pkgs, config, lib, ... }:
 
 let
-  syncthing-ids = import ../../secrets/syncthing-ids.nix;
-
   devices = {
     #mobile devices
-    blechkasten.id    = syncthing-ids.blechkasten;
-    iphone.id         = syncthing-ids.iphone;
-    ipad.id           = syncthing-ids.ipad;
+    blechkasten.id    = "HGPWBVY-RD4JKBQ-X3V53IB-KRVDXEQ-4YLN5F2-WPPSMYR-SOXGTY6-IDFOAAC";
+    iphone.id         = "3SM3LJV-XMHYW2D-MU5WQ3T-KGYUJOI-LXOL6YI-BSVZ2B5-QJ6GVXN-MPWMKQ7";
+    ipad.id           = "WVQIZTE-RULPSEW-IZF4UWI-Q2LX3WJ-MXDUZI3-DF5YHXS-CORBZ27-BCA6XAR";
 
     #servers
     lollo = {
       name = "lollo.ctu.cx";
-      id   = syncthing-ids.lollo;
+      id   = "OJBJJWI-YLA2ALO-NJYJW4L-NSZEOLT-WLWHDMQ-HB56RNN-PELSHOM-47ZQDQZ";
     };
 
-    lollo-old = {
-      name = "lollo-old.ctu.cx";
-      id   = syncthing-ids.lollo-old;
-    };
+    #lollo-old = {
+    #  name = "lollo-old.ctu.cx";
+    #  id   = "QI2EPUE-4VMZ3XV-LXX3GXP-RHCWTRY-AACLSGL-YG7MIYV-THST74N-KJGIBQ6";
+    #};
   };
 
   isaDevices = {
-    isa-x390.id  = syncthing-ids.isa-x390;
-    isa-mba13.id = syncthing-ids.isa-mba13;
+    isa-x390.id  = "PRJAOU7-I4HWOE7-PDSJAK6-OPTVOEO-26Z3AWV-C63NQGK-7MXWSQ2-YSIUVAG";
+    isa-mba13.id = "U5KFHD3-GEX3QQK-7UOC7PY-IAJWZSU-MYO6KWL-GWZ3NHF-CBLJRSE-OTIUAAS";
   };
 
   enabledShares = {

@@ -37,11 +35,11 @@ let
       "Blechelse"
     ];
 
-    lollo-old = [
-      "ctucx-music-orig"
-      "ctucx-media"
-      "Blechelse"
-    ];
+    #lollo-old = [
+    #  "ctucx-music-orig"
+    #  "ctucx-media"
+    #  "Blechelse"
+    #];
   };
 
   deviceNames       = builtins.attrNames (lib.filterAttrs isCurrentHost devices);

diff --git a/hive.nix b/hive.nix
@@ -17,7 +17,7 @@ inputs: overlays:
   defaults     = import ./configurations/common;
 
   lollo        = import ./machines/lollo/configuration.nix;
-  lollo-old    = import ./machines/lollo-old/configuration.nix;
+  #lollo-old    = import ./machines/lollo-old/configuration.nix;
 
   trabbi       = import ./machines/trabbi/configuration.nix;
   wanderduene  = import ./machines/wanderduene/configuration.nix;

diff --git a/secrets/secrets b/secrets/secrets
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-cd "$(dirname "$0")"
-
-tempfile=$(mktemp)
-
-trap "rm -f $tempfile" SIGINT SIGTERM ERR EXIT
-
-touch $tempfile
-chmod 600 $tempfile
-
-echo "$(pass agenix-privkey)" > $tempfile
-
-case $1 in
-  "-e")
-    if [ -f "syncthing-ids.nix" ]; then
-      age -i $tempfile --encrypt --armor --output syncthing-ids.nix.age syncthing-ids.nix
-    else
-      echo "There is no 'syncthing-ids.nix' file!"
-      exit 1
-    fi
-  ;;
-
-  "-d")
-    age -i $tempfile --decrypt --output syncthing-ids.nix syncthing-ids.nix.age
-  ;;
-
-  "")
-    echo "No option given!"
-    exit 1
-  ;;
-
-  *)
-    echo "Unknown option: $1"
-    exit 1
-  ;;
-
-esac

diff --git a/secrets/syncthing-ids.nix.age b/secrets/syncthing-ids.nix.age
@@ -1,21 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTeitqbDNqVXZQT3J2SVkz
-Smcvbks0NUxMaGQrSVI2K3QrZnBVeDdsR2xBCkUzUWt1emN1YjlmRVdZcWhyZkxB
-MlhoZnU3ZFZ2SUM1d2Q4VHI2bWVETmMKLS0tIGFjdEdBOVNTS0dtb3pQc0cveEdh
-SzFCRFZEU29iam5IWGNrM1pkM09jbW8KbtFnFuVKgdGAtZUDx31Oad8Y9E2SdtRc
-Z3eZtTCtgwSYWjQvxrNdn8OA3v5BUNKji/98UF8m2ZkrnivPg6men9Bk/X6bRObA
-Qff+XfvmO/hmmOXSltCXfgaJOvufFX/Z+nj/McnRCyH4Y0Rouj7f0fGwnVkP7O97
-WIxI805hoHSmUtymUSJ/L3JlOFlKf03b6a9D2dPUxHsyzYVUpXSTDGG5oq6HaIPF
-Q/MPEtpSP8cYu7JBo9XwpTUSrEHXIdu2q66gv7XlS1zK2mrgxC4EATUctDObmuz4
-dX+lXs41cMB81sh0TO9dNxnf2h7PopBn/DWby8rkGEUVFkifMwq3AG88CSg16vyZ
-9dvmYuXXS2M2T0l9SCu+BwWYIdMUV+ld5aOu9M9lX0dy7G3gXCEB9j8LllbcYCyL
-pxkKhUeG0PJQi5OdqQFzMkQoi18Hae2bQtJfdnAk3w+eHzJbkirWcU134r8KY/Yf
-X0so+N3hMU9Js6YhkGnFVfwrW+gSpKXDo4UqIxW+rUGWs3Yzheg1fhMd/4yl1IVi
-eSR7IQXY8jm/sSfhoLBdTu10kengOeEoo9eV6n8ofEVADVfn8L0YDpOprdh56hVJ
-TdDXtWYk5RoyjdKlwJ64koVYa5e1t2S2paqGf0MaD26q2Mc5gLl2ATXRWrO3Qa9P
-ew4w750vVoLUrpDO/d2LvaJKx+lRSKXIXWxuPUIyR33gOPMF5hUZK0qQGcsgk7Z0
-c6Vr5j8dE13UFsSJrmLw94xAdlrODJnlPy1r2BUooTFAYFA2wdHMiNEX8mbwsAnf
-A04BOoNWZrPOtCY6FG0LtL9A5DWHyg26naoSCR8mynwVmX5NdLpQuJM8y+S5h6JT
-mxk0v/uLgisNT/l8haDVGw/SUyx7pZ4EGgDo6kOh3DFsMN8U9GhCEqBtSrXAQDeq
-I1YgK3Wo0FbUtGg6PVHVlr9/RYNSWRH5YSD8BKlf+Pc=
------END AGE ENCRYPTED FILE-----