updated syncthing

configs/sterni/syncthing.nix

@@ -38,6 +38,10 @@
           enable = true;
           path = "/home/palo/zettlr";
         };
+        programs = {
+          enable = true;
+          path = "/home/palo/programs";
+        };
 
         # no need to be encrypted
         # -----------------------

configs/workhorse/property.nix

@@ -1,25 +1,25 @@
-{ lib, pkgs, config, ... }:
+{ lib, pkgs, config, ... }: {
-{
 
-  users.users.property = {};
+  users.users.property = { };
 
   systemd.services.property = {
     enable = true;
     wantedBy = [ "multi-user.target" ];
     path = [
-      (pkgs.python3.withPackages (ps: with ps; [
+      (pkgs.python3.withPackages (ps:
-        flask
+        with ps; [
-        selenium
+          flask
-        beautifulsoup4
+          selenium
-        urllib3
+          beautifulsoup4
-        sqlalchemy
+          urllib3
-        mysqlclient
+          sqlalchemy
-        pytest
+          mysqlclient
-        dateparser
+          pytest
-        geopy
+          dateparser
-        nltk
+          geopy
-        click
+          nltk
-      ]))
+          click
+        ]))
     ];
 
     serviceConfig = { User = "property"; };

configs/workout/syncthing.nix

@@ -31,6 +31,10 @@
           enable = true;
           path = "/home/palo/fotos";
         };
+        programs = {
+          enable = true;
+          path = "/home/palo/programs";
+        };
 
         # no need to be encrypted
         # -----------------------

pkgs/default.nix

@@ -46,9 +46,7 @@ in {
 
   emo = callPackage ./emoji { };
 
-  processing = callPackage ./processing {
+  processing = callPackage ./processing { jdk = super.oraclejdk8; };
-    jdk = super.oraclejdk8;
-  };
 
   otpmenu = callPackage ./otpmenu { };
 

shell.nix

@@ -39,18 +39,17 @@ let
     };
 
     system = name:
-    let
+      let
-      exclusive = name:
+        exclusive = name:
-      if name == "workhorse" then {
+          if name == "workhorse" then {
-        property.file = toString ./submodules/property;
+            property.file = toString ./submodules/property;
-      } else {
+          } else
-      };
+            { };
-    in
+      in {
-    {
+        system.file = toString ./system;
-      system.file = toString ./system;
+        configs.file = toString ./configs;
-      configs.file = toString ./configs;
+        nixos-config.symlink = "configs/${name}/configuration.nix";
-      nixos-config.symlink = "configs/${name}/configuration.nix";
+      } // (exclusive name);
-    } // (exclusive name);
 
     desktopSecrets = {
       desktop_secrets.pass = {

system/all/syncthing.nix

@@ -97,6 +97,15 @@ with lib; {
             params.keep = "10";
           };
         };
+        programs = {
+          enable = lib.mkDefault false;
+          watch = true;
+          devices = [ "workout" "sterni" ];
+          versioning = {
+            type = "simple";
+            params.keep = "1";
+          };
+        };
 
         # no need to be stored on encrypted drives
         # ----------------------------------------

system/desktop/packages.nix

@@ -318,6 +318,10 @@ in {
       nixfmt
       dateutils
 
+      # needed for pycairo (in venv)
+      pkgconf
+      cairo
+
       # etc-info stuff
       (pkgs.writers.writeDashBin "etc-info-sync" (lib.concatStringsSep "\n"
         (map (host: "rsync -avLz ${host}.private:/etc/info/ ~/.etc_info")