diff --git a/configuration-native.nix b/configuration-native.nix
new file mode 100644
index 0000000..52174ff
--- /dev/null
+++ b/configuration-native.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, lib, ... }:
+{
+  config = lib.mkIf (pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform) {
+    environment.systemPackages = with pkgs; [
+      meld
+    ];
+
+    programs.git.config.merge.tool = "meld";
+  };
+
+}
diff --git a/configuration.nix b/configuration.nix
index c0867a8..1dc3241 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 {
-  imports = [ ./overlays/packages.nix ];
+  imports = [ ./overlays/packages.nix ./configuration-native.nix ];
   nixpkgs.config.allowUnfree = true;
 
   nix.settings.extra-experimental-features = "nix-command flakes";
@@ -37,7 +37,6 @@
     stdenv.cc
     stdenv.cc.bintools  # bins but not manpages included in stdenv.cc
     patchelf
-    meld
 
     (python3.withPackages (p: with p; [
       virtualenvwrapper
@@ -94,7 +93,6 @@
         core.editor = "nvim";
         init.defaultBranch = "main";
         blame.markUnblamableLines = true;
-        merge.tool = "meld";
         credential.helper = "store";
         url."ssh://git@".insteadOf = "git://";
       };