From 2c6fa4dc3e594de8761847a17bf6334be1780c33 Mon Sep 17 00:00:00 2001 From: Madeleine Date: Wed, 17 May 2023 20:03:37 +0100 Subject: [PATCH] updated --- flake.lock | 18 +++++------ systems/mdesktop/syncthing.nix | 56 +++++++++++++++++++--------------- 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 16b0149..2920f65 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1683754942, - "narHash": "sha256-L+Bj8EL4XLmODRIuOkk9sI6FDECVzK+C8jeZFv7q6eY=", + "lastModified": 1684148371, + "narHash": "sha256-CEVaArsziqantqU418XXruNDjPZN/HC3x1rqr2D4g+o=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "252541bd05a7f55f3704a3d014ad1badc1e3360d", + "rev": "0dbf1c2fb1a5a0372a324eff1ba44f9da66febd2", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1683989410, - "narHash": "sha256-puF/QsIkp4ch0sf6M5mNzbdZtYcq2MJHcKre9wJ3ZYo=", + "lastModified": 1684189380, + "narHash": "sha256-GUp9OkZynocyppLur1VX8oAjtXGue0oKRHbsksOMUm0=", "owner": "nix-community", "repo": "home-manager", - "rev": "6702b22b9805bc1879715d4111e3764cd4237aed", + "rev": "b7d814c5744dca7e70b3dc2638f06568dce96ca6", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683777345, - "narHash": "sha256-V2p/A4RpEGqEZussOnHYMU6XglxBJGCODdzoyvcwig8=", + "lastModified": 1684242266, + "narHash": "sha256-uaCQ2k1bmojHKjWQngvnnnxQJMY8zi1zq527HdWgQf8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "635a306fc8ede2e34cb3dd0d6d0a5d49362150ed", + "rev": "7e0743a5aea1dc755d4b761daf75b20aa486fdad", "type": "github" }, "original": { diff --git a/systems/mdesktop/syncthing.nix b/systems/mdesktop/syncthing.nix index fdeaccb..ab6dd0e 100644 --- a/systems/mdesktop/syncthing.nix +++ b/systems/mdesktop/syncthing.nix @@ -10,32 +10,38 @@ guiAddress = "0.0.0.0:8384"; overrideFolders = true; overrideDevices = true; - devices = { - "M.Phone.Pixel" = { id = "WMGWVOU-DFZQSZO-46XQJQA-Q5XD5ZB-NDXK5SP-LXNAADH-Z2KJN4P-4P4UXA5"; }; - "M.MacBookPro" = { id = "A5HRCSI-RWYZ6GG-SCBZ2OJ-PG6T7VP-WKDN2VP-CNXIQ3B-VCJ7ZHO-MTV63QP"; }; - "Lambda" = { id = "ZYNSFWR-F3ZNDDT-66TSJWB-PRP3KQK-IWTTABU-GGWT5DL-RWC7VAE-LI5AXQQ"; }; - }; - folders = { - "Documents" = { - path = "/home/${username}/Documents"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; + settings = { + devices = { + "M.Phone.Pixel" = { id = "WMGWVOU-DFZQSZO-46XQJQA-Q5XD5ZB-NDXK5SP-LXNAADH-Z2KJN4P-4P4UXA5"; }; + "M.MacBookPro" = { id = "A5HRCSI-RWYZ6GG-SCBZ2OJ-PG6T7VP-WKDN2VP-CNXIQ3B-VCJ7ZHO-MTV63QP"; }; + "Lambda" = { id = "ZYNSFWR-F3ZNDDT-66TSJWB-PRP3KQK-IWTTABU-GGWT5DL-RWC7VAE-LI5AXQQ"; }; }; - "Pictures" = { - path = "/home/${username}/Pictures"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; - }; - "Videos" = { - path = "/home/${username}/Videos"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; - }; - "Music" = { - path = "/home/${username}/Music"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; - }; - "Android Camera" = { - id = "pixel_7_pro_2qyx-photos"; - path = "/home/${username}/Pictures/DCIM"; - devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; + folders = { + "Documents" = { + path = "/home/${username}/Documents"; + devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; + }; + "Pictures" = { + path = "/home/${username}/Pictures"; + devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; + }; + "Videos" = { + path = "/home/${username}/Videos"; + devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; + }; + "Music" = { + path = "/home/${username}/Music"; + devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; + }; + "Android Camera" = { + id = "pixel_7_pro_2qyx-photos"; + path = "/home/${username}/Pictures/DCIM"; + devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; + }; + ".Hidden" = { + path = "/home/${username}/.Hidden"; + devices = [ "M.Phone.Pixel" ]; + }; }; }; };