home

commit 6e74c6534823513661ca4543fffa91ade5e66784
parent 07c1873201c87e73ab92beb41d7712680cba67c7
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Sun,  5 Apr 2020 18:05:33 +0200

machines: migrate honshu to sakhalin 🌹

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
tmp/nixos-configuration/machine/honshu.nix
 | 
74
--------------------------------------------------------------------------
M
tmp/nixos-configuration/machine/sakhalin.nix
 | 
146
++++++++++++++++++++++++++++++++++++++++----------------------------------------

2 files changed, 73 insertions(+), 147 deletions(-)
diff --git a/tmp/nixos-configuration/machine/honshu.nix b/tmp/nixos-configuration/machine/honshu.nix
@@ -32,78 +32,4 @@ with import ../assets/machines.nix; {
       endpointPublicKey = wireguard.kerkouane.publicKey;
     };
   };
-  # -----------------------------------
-  environment.etc."vrsync".text = ''
-/home/vincent/desktop/pictures/screenshots/ vincent@synodine.home:/volumeUSB2/usbshare/pictures/screenshots/
-/home/vincent/desktop/pictures/wallpapers/ vincent@synodine.home:/volumeUSB2/usbshare/pictures/wallpapers/
-/home/vincent/desktop/documents/ vincent@synodine.home:/volume1/documents/
-/mnt/Toshito/photos/ vincent@synodine.home:/volumeUSB2/usbshare/pictures/photos/
-/mnt/Toshito/music/ vincent@synodine.home:/volumeUSB2/usbshare/music/
-  '';
-  systemd.services.vrsync = {
-    description = "vrsync - sync folders to NAS";
-    requires = [ "network-online.target" ];
-    after    = [ "network-online.target" ];
-
-    unitConfig.X-StopOnRemoval = false;
-    restartIfChanged = false;
-
-    path = with pkgs; [ rsync coreutils bash openssh ];
-    script = ''
-    ${pkgs.vrsync}/bin/vrsync
-    '';
-
-    startAt = "hourly";
-    serviceConfig = {
-      Type = "oneshot";
-      OnFailure = "status-email-root@%n.service";
-    };
-  };
-  # ape – sync git mirrors
-  systemd.services.ape = {
-    description = "Ape - sync git mirrors";
-    requires = [ "network-online.target" ];
-    after    = [ "network-online.target" ];
-
-    restartIfChanged = false;
-    unitConfig.X-StopOnRemoval = false;
-
-    serviceConfig = {
-      Type = "oneshot";
-      User = "vincent";
-      OnFailure = "status-email-root@%n.service";
-    };
-
-    path = with pkgs; [ git ];
-    script = ''
-    ${pkgs.nur.repos.vdemeester.ape}/bin/ape up /home/vincent/var/mirrors
-    '';
-
-    startAt = "hourly";
-  };
-  # mr -i u daily
-  systemd.services.mr = {
-    description = "Update configs daily";
-    requires = [ "network-online.target" ];
-    after    = [ "network-online.target" ];
-
-    restartIfChanged = false;
-    unitConfig.X-StopOnRemoval = false;
-
-    serviceConfig = {
-      Type = "oneshot";
-      User = "vincent";
-      OnFailure = "status-email-root@%n.service";
-    };
-
-    path = with pkgs; [ git mr ];
-    script = ''
-    set -e
-     cd /mnt/synodine/volumeUSB2/usbshare/src/github.com/vdemeester/configs/
-     mr -t run git reset --hard
-     mr -t u
-    '';
-
-    startAt = "daily";
-  };
 }
diff --git a/tmp/nixos-configuration/machine/sakhalin.nix b/tmp/nixos-configuration/machine/sakhalin.nix
@@ -74,77 +74,77 @@ with import ../assets/machines.nix; {
   };
   security.apparmor.enable = true;
   # -----------------------------------
-  #   environment.etc."vrsync".text = ''
-  # /home/vincent/desktop/pictures/screenshots/ vincent@synodine.home:/volumeUSB2/usbshare/pictures/screenshots/
-  # /home/vincent/desktop/pictures/wallpapers/ vincent@synodine.home:/volumeUSB2/usbshare/pictures/wallpapers/
-  # /home/vincent/desktop/documents/ vincent@synodine.home:/volume1/documents/
-  # /mnt/Toshito/photos/ vincent@synodine.home:/volumeUSB2/usbshare/pictures/photos/
-  # /mnt/Toshito/music/ vincent@synodine.home:/volumeUSB2/usbshare/music/
-  #   '';
-  #   systemd.services.vrsync = {
-  #     description = "vrsync - sync folders to NAS";
-  #     requires = [ "network-online.target" ];
-  #     after    = [ "network-online.target" ];
-  #
-  #     unitConfig.X-StopOnRemoval = false;
-  #     restartIfChanged = false;
-  #
-  #     path = with pkgs; [ rsync coreutils bash openssh ];
-  #     script = ''
-  #     ${pkgs.vrsync}/bin/vrsync
-  #     '';
-  #
-  #     startAt = "hourly";
-  #     serviceConfig = {
-  #       Type = "oneshot";
-  #       OnFailure = "status-email-root@%n.service";
-  #     };
-  #   };
-  #   # ape – sync git mirrors
-  #   systemd.services.ape = {
-  #     description = "Ape - sync git mirrors";
-  #     requires = [ "network-online.target" ];
-  #     after    = [ "network-online.target" ];
-  #
-  #     restartIfChanged = false;
-  #     unitConfig.X-StopOnRemoval = false;
-  #
-  #     serviceConfig = {
-  #       Type = "oneshot";
-  #       User = "vincent";
-  #       OnFailure = "status-email-root@%n.service";
-  #     };
-  #
-  #     path = with pkgs; [ git ];
-  #     script = ''
-  #     ${pkgs.nur.repos.vdemeester.ape}/bin/ape up /home/vincent/var/mirrors
-  #     '';
-  #
-  #     startAt = "hourly";
-  #   };
-  #   # mr -i u daily
-  #   systemd.services.mr = {
-  #     description = "Update configs daily";
-  #     requires = [ "network-online.target" ];
-  #     after    = [ "network-online.target" ];
-  #
-  #     restartIfChanged = false;
-  #     unitConfig.X-StopOnRemoval = false;
-  #
-  #     serviceConfig = {
-  #       Type = "oneshot";
-  #       User = "vincent";
-  #       OnFailure = "status-email-root@%n.service";
-  #     };
-  #
-  #     path = with pkgs; [ git mr ];
-  #     script = ''
-  #     set -e
-  #      cd /mnt/synodine/volumeUSB2/usbshare/src/github.com/vdemeester/configs/
-  #      mr -t run git reset --hard
-  #      mr -t u
-  #     '';
-  #
-  #     startAt = "daily";
-  #   };
+  environment.etc."vrsync".text = ''
+    /home/vincent/desktop/pictures/screenshots/ vincent@synodine.home:/volumeUSB2/usbshare/pictures/screenshots/
+    /home/vincent/desktop/pictures/wallpapers/ vincent@synodine.home:/volumeUSB2/usbshare/pictures/wallpapers/
+    /home/vincent/desktop/documents/ vincent@synodine.home:/volume1/documents/
+    /mnt/Toshito/photos/ vincent@synodine.home:/volumeUSB2/usbshare/pictures/photos/
+    /mnt/Toshito/music/ vincent@synodine.home:/volumeUSB2/usbshare/music/
+  '';
+  systemd.services.vrsync = {
+    description = "vrsync - sync folders to NAS";
+    requires = [ "network-online.target" ];
+    after = [ "network-online.target" ];
+
+    unitConfig.X-StopOnRemoval = false;
+    restartIfChanged = false;
+
+    path = with pkgs; [ rsync coreutils bash openssh ];
+    script = ''
+      ${pkgs.vrsync}/bin/vrsync
+    '';
+
+    startAt = "hourly";
+    serviceConfig = {
+      Type = "oneshot";
+      OnFailure = "status-email-root@%n.service";
+    };
+  };
+  # ape – sync git mirrors
+  systemd.services.ape = {
+    description = "Ape - sync git mirrors";
+    requires = [ "network-online.target" ];
+    after = [ "network-online.target" ];
+
+    restartIfChanged = false;
+    unitConfig.X-StopOnRemoval = false;
+
+    serviceConfig = {
+      Type = "oneshot";
+      User = "vincent";
+      OnFailure = "status-email-root@%n.service";
+    };
+
+    path = with pkgs; [ git ];
+    script = ''
+      ${pkgs.nur.repos.vdemeester.ape}/bin/ape up /home/vincent/var/mirrors
+    '';
+
+    startAt = "hourly";
+  };
+  # mr -i u daily
+  systemd.services.mr = {
+    description = "Update configs daily";
+    requires = [ "network-online.target" ];
+    after = [ "network-online.target" ];
+
+    restartIfChanged = false;
+    unitConfig.X-StopOnRemoval = false;
+
+    serviceConfig = {
+      Type = "oneshot";
+      User = "vincent";
+      OnFailure = "status-email-root@%n.service";
+    };
+
+    path = with pkgs; [ git mr ];
+    script = ''
+      set -e
+       cd /mnt/gaia/src/configs/
+       mr -t run git reset --hard
+       mr -t u
+    '';
+
+    startAt = "daily";
+  };
 }