chore(git): set pull strategy to merge by default

The experimental xwayland-native-scaling feature causes XWayland
connection loss when KiCad fullscreens on the second monitor,
crashing the application. Fractional scaling is retained via
scale-monitor-framebuffer.

configuration.nix

@@ -255,7 +255,7 @@
   
   services.desktopManager.gnome.extraGSettingsOverrides = ''
     [org.gnome.mutter]
-    experimental-features=['scale-monitor-framebuffer', 'xwayland-native-scaling']
+    experimental-features=['scale-monitor-framebuffer']
   '';
   
   environment.gnome.excludePackages = with pkgs; [

home.nix

@@ -124,6 +124,7 @@
         name = "0xWheatyz";
         email = "wyatt@leeworks.dev";
       };
+      pull.rebase = "false";
       init.defaultBranch = "master";
       push.autoSetupRemote = "true";
       alias.lg = "log --graph --pretty=format:'%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%cr)%Creset %C(bold blue)<%an>%Creset' --abbrev-commit";