From 07eb62fc87a860d278b0c7643ef3ee3ea822ea37 Mon Sep 17 00:00:00 2001 From: Henri Dohmen Date: Fri, 10 Oct 2025 23:47:35 +0200 Subject: [PATCH] unison over vpn --- desktop/services.nix | 4 ++-- flake.lock | 17 +++++++++++++++++ flake.nix | 5 ++++- host/roam/firefox-sync.nix | 2 ++ 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/desktop/services.nix b/desktop/services.nix index 5e66b20..0f93d36 100644 --- a/desktop/services.nix +++ b/desktop/services.nix @@ -37,11 +37,11 @@ in pairs = { "docs".roots = [ "/home/hd/Documents" - "ssh://roam//home/hd/Documents" + "ssh://roam.lan//home/hd/Documents" ]; "desktop".roots = [ "/home/hd/Desktop" - "ssh://roam//home/hd/Desktop" + "ssh://roam.lan//home/hd/Desktop" ]; }; }; diff --git a/flake.lock b/flake.lock index 2f59eb4..1e996a4 100644 --- a/flake.lock +++ b/flake.lock @@ -198,6 +198,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1759994382, + "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -207,6 +223,7 @@ "home-manager": "home-manager_2", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", "vscode-extensions": "vscode-extensions" } }, diff --git a/flake.nix b/flake.nix index 316a2fb..77f2104 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; colmena = { url = "github:zhaofengli/colmena"; @@ -38,14 +39,16 @@ home-manager, nixos-hardware, nixpkgs, + nixpkgs-stable, vscode-extensions, }@inputs: let inherit (nixpkgs) lib; lib' = import ./lib.nix { inherit lib; }; + pkgs-stable = import nixpkgs-stable { system = "x86_64-linux"; }; specialArgs = rec { - inherit inputs lib'; + inherit inputs lib' pkgs-stable; var = import ./var { inherit lib; }; secrets = lib'.walk-dir ./secrets; }; diff --git a/host/roam/firefox-sync.nix b/host/roam/firefox-sync.nix index c2942f4..8de826b 100644 --- a/host/roam/firefox-sync.nix +++ b/host/roam/firefox-sync.nix @@ -1,5 +1,6 @@ { pkgs, + pkgs-stable, config, secrets, ... @@ -17,6 +18,7 @@ services.firefox-syncserver = { enable = true; + package = pkgs-stable.syncstorage-rs; secrets = config.age.secrets.roam-firefox-sync-secret.path; singleNode = { enable = true;