diff --git a/configs/sterni/syncthing.nix b/configs/sterni/syncthing.nix index 9292c1e..d4a67c7 100644 --- a/configs/sterni/syncthing.nix +++ b/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 # ----------------------- diff --git a/configs/workhorse/property.nix b/configs/workhorse/property.nix index 4665490..d807f45 100644 --- a/configs/workhorse/property.nix +++ b/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; [ - flask - selenium - beautifulsoup4 - urllib3 - sqlalchemy - mysqlclient - pytest - dateparser - geopy - nltk - click - ])) + (pkgs.python3.withPackages (ps: + with ps; [ + flask + selenium + beautifulsoup4 + urllib3 + sqlalchemy + mysqlclient + pytest + dateparser + geopy + nltk + click + ])) ]; serviceConfig = { User = "property"; }; diff --git a/configs/workout/syncthing.nix b/configs/workout/syncthing.nix index 7f137ea..fd10366 100644 --- a/configs/workout/syncthing.nix +++ b/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 # ----------------------- diff --git a/pkgs/default.nix b/pkgs/default.nix index 48dc6c7..d8ab3a4 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -46,9 +46,7 @@ in { emo = callPackage ./emoji { }; - processing = callPackage ./processing { - jdk = super.oraclejdk8; - }; + processing = callPackage ./processing { jdk = super.oraclejdk8; }; otpmenu = callPackage ./otpmenu { }; diff --git a/shell.nix b/shell.nix index ff994d6..509e369 100644 --- a/shell.nix +++ b/shell.nix @@ -39,18 +39,17 @@ let }; system = name: - let - exclusive = name: - if name == "workhorse" then { - property.file = toString ./submodules/property; - } else { - }; - in - { - system.file = toString ./system; - configs.file = toString ./configs; - nixos-config.symlink = "configs/${name}/configuration.nix"; - } // (exclusive name); + let + exclusive = name: + if name == "workhorse" then { + property.file = toString ./submodules/property; + } else + { }; + in { + system.file = toString ./system; + configs.file = toString ./configs; + nixos-config.symlink = "configs/${name}/configuration.nix"; + } // (exclusive name); desktopSecrets = { desktop_secrets.pass = { diff --git a/system/all/syncthing.nix b/system/all/syncthing.nix index b7cbbae..8d6d22c 100644 --- a/system/all/syncthing.nix +++ b/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 # ---------------------------------------- diff --git a/system/desktop/packages.nix b/system/desktop/packages.nix index 862bd92..fc5b914 100644 --- a/system/desktop/packages.nix +++ b/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")