diff --git a/systems/gandalf/default.nix b/systems/gandalf/default.nix
index 7de9441..9687772 100644
--- a/systems/gandalf/default.nix
+++ b/systems/gandalf/default.nix
@@ -52,9 +52,10 @@
       boot.kernelPackages = pkgs.linuxPackages_zen;
     };
   };
-  
+
   services = {
     # Bluetooth fixes
+    # Can be removed when https://github.com/NixOS/nixpkgs/pull/499670 is merged and in 25.11
     udev.extraRules = ''
       SUBSYSTEM=="usb", ENV{ID_VENDOR_ID}=="0489", ENV{ID_MODEL_ID}=="e111", ENV{UDISKS_IGNORE}="1", ENV{ID_MEDIA_PLAYER}="", ENV{ID_MTP_DEVICE}="", ENV{ID_GPHOTO2}="", ENV{ID_INPUT}="", ENV{SOLID_IGNORE}="1", TAG-="uaccess"
 
diff --git a/systems/modules/home/programs/nvim.nix b/systems/modules/home/programs/nvim.nix
index d266d91..4f2a001 100644
--- a/systems/modules/home/programs/nvim.nix
+++ b/systems/modules/home/programs/nvim.nix
@@ -3,6 +3,7 @@
 {
   programs.neovim = {
     enable = true;
+    defaultEditor = true;
     extraLuaPackages = ps: [ ps.magick ];
     extraPackages = [
       pkgs.ueberzugpp