diff options
| author | lassulus <lassulus@lassul.us> | 2022-03-02 16:37:48 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2022-03-02 16:37:48 +0100 |
| commit | 44a42bb268e163e3fa43fe6ea6c4b979da0f49e9 (patch) | |
| tree | 0e9475b0a40464b8122ac19ddcc63fe0daab3cd4 /makefu/1systems/x | |
| parent | 6002189225e347418f07a99d6a85b033fa0edaf7 (diff) | |
| parent | 81817007edda4601c95a8f95aa99ce15320e224a (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/x')
| -rw-r--r-- | makefu/1systems/x/config.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 224277861..3edfcecc1 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -137,6 +137,8 @@ # <stockholm/makefu/2configs/share/anon-ftp.nix> # <stockholm/makefu/2configs/share/anon-sftp.nix> <stockholm/makefu/2configs/share/gum-client.nix> + <stockholm/makefu/2configs/share/hetzner-client.nix> + <stockholm/makefu/2configs/share> # <stockholm/makefu/2configs/share/temp-share-samba.nix> @@ -145,6 +147,7 @@ <stockholm/makefu/2configs/mail-client.nix> <stockholm/makefu/2configs/printer.nix> # <stockholm/makefu/2configs/syncthing.nix> + <stockholm/makefu/2configs/sync> # Virtualization # <stockholm/makefu/2configs/virtualisation/libvirt.nix> @@ -167,7 +170,7 @@ # <stockholm/makefu/2configs/remote-build/gum.nix> # { nixpkgs.overlays = [ (self: super: super.prefer-remote-fetch self super) ]; } - <stockholm/makefu/2configs/binary-cache/gum.nix> + # <stockholm/makefu/2configs/binary-cache/gum.nix> <stockholm/makefu/2configs/binary-cache/lass.nix> @@ -223,7 +226,8 @@ krebs.build.host = config.krebs.hosts.x; - krebs.tinc.retiolum.connectTo = [ "omo" "prism" "nextgum" "wbob" ]; + #krebs.tinc.retiolum.connectTo = lib.mkForce [ "gum" ]; + #krebs.tinc.retiolum.extraConfig = "AutoConnect = no"; environment.systemPackages = [ pkgs.passwdqc-utils ]; @@ -245,6 +249,6 @@ "/home/makefu/.config/syncthing" ]; - services.syncthing.user = lib.mkForce "makefu"; - services.syncthing.dataDir = lib.mkForce "/home/makefu/.config/syncthing/"; + # services.syncthing.user = lib.mkForce "makefu"; + # services.syncthing.dataDir = lib.mkForce "/home/makefu/.config/syncthing/"; } |