...flakes

2 files changed, 30 insertions, 2 deletions

diff --git a/accounts/gkleen@skadhi/default.nix b/accounts/gkleen@skadhi/default.nix
index c32014f7..f8de3182 100644
--- a/accounts/gkleen@skadhi/default.nix
+++ b/accounts/gkleen@skadhi/default.nix
@@ -75,6 +75,7 @@ in {
           ".config/chromium"
           ".config/sops"
           ".local/share/etesync-dav"
+          (lib.removePrefix (config.home.homeDirectory + "/") config.services.unison.pairs."documents".stateDirectory)
         ];
       };
 
@@ -290,6 +291,29 @@ in {
       };
 
       programs.chromium.enable = true;
+
+      services.unison = {
+        enable = true;
+        pairs = {
+          documents = {
+            roots = ["${config.home.homeDirectory}/documents" "ssh://vidhar/documents"];
+            stateDirectory = "${config.xdg.stateHome}/documents.unison";
+            commandOptions = {
+              auto = "true";
+              batch = "true";
+              log = "false";
+              repeat = "watch";
+              sshcmd = toString (pkgs.runCommand "ssh-wrapped" {
+                buildInputs = [ pkgs.makeWrapper ];
+              } ''
+                makeWrapper ${lib.getExe' pkgs.openssh "ssh"} $out \
+                  --add-flags ${lib.escapeShellArg "-o ControlMaster=no -o BatchMode=yes"}
+              '');
+              ui = "text";
+            };
+          };
+        };
+      };
     };
   };
 }
diff --git a/accounts/gkleen@vidhar.nix b/accounts/gkleen@vidhar.nix
index 3a37c4bd..aecba7d5 100644
--- a/accounts/gkleen@vidhar.nix
+++ b/accounts/gkleen@vidhar.nix
@@ -11,7 +11,7 @@
       ];
     };
 
-    home-manager.users.${userName} = {
+    home-manager.users.${userName} = { sysConfig, config, ... }: {
       home.stateVersion = "20.09";
 
       programs.ssh.matchBlocks = {
@@ -36,9 +36,13 @@
       };
       home.file = {
         ".config/user-tmpfiles.d/gnupg.conf".text = ''
-          d /run/user/${toString config.users.users.${userName}.uid}/gnupg 0700 ${userName} ${config.users.users.${userName}.group} -
+          d /run/user/${toString sysConfig.users.users.${userName}.uid}/gnupg 0700 ${userName} ${sysConfig.users.users.${userName}.group} -
         '';
       };
+
+      home.packages = [
+        flake.nixosConfigurations.skadhi.config.home-manager.users.gkleen.services.unison.package
+      ];
     };
   };
 }