From 289406ddf0b525ea85c98416d390776562f14307 Mon Sep 17 00:00:00 2001 From: Drew Haven Date: Wed, 2 Apr 2025 11:25:23 -0700 Subject: [PATCH] [ssh] Adds vega's key. [syncthing] Sets up static config --- home-manager/features/notes.nix | 47 +++++++++++++++++++++++++++++---- system/authorized-keys.nix | 1 + 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/home-manager/features/notes.nix b/home-manager/features/notes.nix index cc4fc12..8ea30bd 100644 --- a/home-manager/features/notes.nix +++ b/home-manager/features/notes.nix @@ -5,16 +5,53 @@ tray = { enable = lib.mkDefault true; }; + # This will override any locally configured devices and folders + overrideDevices = true; + overrideFolders = true; settings = { - folders.Notes = { - path = "~/Documents/Notes"; + folders = { + Notes = { + label = "Notes"; + path = "~/Documents/Notes"; + devices = [ "altair" "mcp" "vega" ]; + }; + }; + devices = { + mcp = { + id = "6O3U5QK-PR4RAAB-L32TR6K-USM7PER-VJBIKCI-FOWNA2G-7CQU5HF-R2OXNQ2"; + name = "mcp"; + addresses = [ + "tcp://mcp.blazestar.net" + ]; + compression = "always"; + }; + vega = { + id = "U55HQDN-YTUQAGA-G4O4LMZ-OAVAUVZ-RBDD2S6-JAWAUF2-Z4VZ7BM-TIIVUA4"; + name = "vega"; + addresses = [ + "tcp://vega.blazestar.net" + ]; + compression = "always"; + }; + altair = { + id = "W5QZDM6-CUVQJIG-DR4BJCU-IQ7UGTJ-NQUSW73-E3GWSLU-A2QEMKR-BRDH3Q3"; + name = "altair"; + addresses = [ + "tcp://altair.blazestar.net" + ]; + compression = "always"; + }; }; options = { localAnnounceEnabled = false; + globalAnnounceEnabled = false; relaysEnabled = true; - globalAnnounceEnabled = true; - globalAnnounceServer = "relay://mcp:22067"; - listenAddress = "relay://mcp:22067"; + listenAddress = "relay://syncthing.blazestar.net:22067"; + # Whether the user has accepted submitting usage data. 0 is no-choice. + # -1 means no. A positive integer means yes. + urAccepted = -1; + # Disable NAT port-mapping + natEnabled = false; }; }; }; diff --git a/system/authorized-keys.nix b/system/authorized-keys.nix index 3e4dbb3..1aa804f 100644 --- a/system/authorized-keys.nix +++ b/system/authorized-keys.nix @@ -3,5 +3,6 @@ users.users.drew.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPL+uF46A1oe+TgYoCcBQFcWtx5UJMdgczX+/rG/i55t drew@altair" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB0NbnQByo8sFmzsX5/0I6kWh+unTKxns2TsEPSzgYbD drew@mcp" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKPiqbLAXpBkjXnHLvz3VCd5i+VmYdd9dAcRt+8E1OQX drew@vega" ]; }