diff --git a/home/alex/home.nix b/home/alex/home.nix
index 2acbe90..ab61f3e 100644
--- a/home/alex/home.nix
+++ b/home/alex/home.nix
@@ -13,6 +13,7 @@
     ./services/screen-locker
     ./services/blueman-applet
     ./services/syncthing
+    ./services/git-sync
   ];
 
   home = {
diff --git a/home/alex/programs/emacs/doom/config.el b/home/alex/programs/emacs/doom/config.el
index eb4df10..6632d8b 100644
--- a/home/alex/programs/emacs/doom/config.el
+++ b/home/alex/programs/emacs/doom/config.el
@@ -159,7 +159,7 @@
         :desc "Capture"        "X"  #'org-gtd-capture
         (:prefix ("d" . "org-gtd")
          :desc "Capture"        "c"  #'org-gtd-capture
-         :desc "Engage"         "e"  #'org-gtd-engage-grouped-by-context
+         :desc "Engage"         "e"  #'org-gtd-engage
          :desc "Process inbox"  "p"  #'org-gtd-process-inbox
          :desc "Show all next"  "n"  #'org-gtd-show-all-next
          (:prefix ("r" . "Review")
@@ -172,7 +172,7 @@
         :desc "Organize this item" "C-c C-c" #'org-gtd-organize)
   :bind
   (("C-c d c" . #'org-gtd-capture)
-   ("C-c d e" . #'org-gtd-engage-grouped-by-context)
+   ("C-c d e" . #'org-gtd-engage)
    ("C-c d p" . #'org-gtd-process-inbox)
    ("C-c d n" . #'org-gtd-show-all-next)
    ("C-c d r p" . #'org-gtd-review-stuck-projects))
diff --git a/home/alex/services/git-sync/default.nix b/home/alex/services/git-sync/default.nix
new file mode 100644
index 0000000..6b095c2
--- /dev/null
+++ b/home/alex/services/git-sync/default.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+{
+  config.services.git-sync = {
+    enable = true;
+    repositories = {
+      "org" = {
+        path = "${config.home.homeDirectory}/org";
+        uri = "git+ssh://gitea@git.failco.de:jakalx/org.git";
+      };
+    };
+  };
+}
diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix
index 186fa29..ff43a6b 100644
--- a/hosts/dregil/configuration.nix
+++ b/hosts/dregil/configuration.nix
@@ -100,9 +100,10 @@ in {
 
   services.blueman.enable = true;
 
-  # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 5223 ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Open ports in the firewall
+  # 22000, 21027 syncthing discovery and connectivity
+  networking.firewall.allowedTCPPorts = [ 22000 ];
+  networking.firewall.allowedUDPPorts = [ 21027 22000 ];
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
 
diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix
index 3eb7eb4..56cd004 100644
--- a/hosts/thrall/default.nix
+++ b/hosts/thrall/default.nix
@@ -331,7 +331,7 @@ in {
       folders = {
         "org" = {
           path = "/home/alex/org";
-          devices = [ "redmi" ];
+          devices = [ "redmi" "dregil" ];
         };
         "scan" = {
           path = "/home/alex/media/scan";
@@ -347,6 +347,10 @@ in {
           id =
             "C43WITF-2HS2UCD-X6QFM4H-SC7XQJ7-X5F73EB-7FZHMII-KQNSH5D-NMICIAW";
         };
+        "dregil" = {
+          id =
+            "SMVQO7Q-EB2V7PC-B4LP5IN-SM2UUE4-FUI2RI4-LARFW3S-LXHPAT5-FLNY7QH";
+        };
       };
     };
   };