diff --git a/flake.lock b/flake.lock
index b79be45..0a85d0e 100755
--- a/flake.lock
+++ b/flake.lock
@@ -154,6 +154,29 @@
         "url": "https://codeberg.org/gibbert/micro-vivify"
       }
     },
+    "nix-git-cherry-picker": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1780916435,
+        "narHash": "sha256-fVqBAaQroqNEDovWRSILm1GuRhssnd5G+IbZLjlsdUI=",
+        "owner": "tomasriveral",
+        "repo": "nix-git-cherry-picker",
+        "rev": "5ceff7e0a376c45278ad667c97a4dd3e6834eec0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tomasriveral",
+        "repo": "nix-git-cherry-picker",
+        "type": "github"
+      }
+    },
     "nixos-grub-themes": {
       "inputs": {
         "nixpkgs": "nixpkgs"
@@ -327,6 +350,7 @@
         "home-manager": "home-manager",
         "import-tree": "import-tree",
         "microPlugins-vivify": "microPlugins-vivify",
+        "nix-git-cherry-picker": "nix-git-cherry-picker",
         "nixos-grub-themes": "nixos-grub-themes",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-master": "nixpkgs-master",
diff --git a/flake.nix b/flake.nix
index 23a0ce0..bbdc9c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,6 +26,11 @@
       inputs.flake-utils.follows = "flake-utils";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
+    nix-git-cherry-picker = {
+      url = "github:tomasriveral/nix-git-cherry-picker";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
     caelestia-shell = {
       # based on quickshell. See https://github.com/caelestia-dots/shell
       url = "github:caelestia-dots/shell";
diff --git a/modules/hosts/laptop.nix b/modules/hosts/laptop.nix
index 1f5d426..c55f940 100644
--- a/modules/hosts/laptop.nix
+++ b/modules/hosts/laptop.nix
@@ -65,6 +65,7 @@
       librewolf
       mullvad
       neovim
+      nixGitCherryPicker-laptop
       notewrapper
       oh-my-zsh
       ripgrep
diff --git a/modules/utilities/nixGitCherryPicker.nix b/modules/utilities/nixGitCherryPicker.nix
new file mode 100644
index 0000000..50769e6
--- /dev/null
+++ b/modules/utilities/nixGitCherryPicker.nix
@@ -0,0 +1,18 @@
+{inputs, ...}: {
+  flake.homeModules.nixGitCherryPicker-laptop = {pkgs, ...}: {
+    home.packages = [
+      inputs.nix-git-cherry-picker.packages.${pkgs.system}.default
+    ];
+    home.file.".config/nix-git-cherry-picker/config.json" = {
+      enable = true;
+      text = ''
+        {
+          "localBranch": "laptop",
+          "remoteBranch": "desktop",
+          "nixConfigPath": "~/nixos/"
+        }
+      '';
+      force = true;
+    };
+  };
+}