diff --git a/modules/home/gdb/default.nix b/modules/home/gdb/default.nix
index fe8eb69..ab51938 100644
--- a/modules/home/gdb/default.nix
+++ b/modules/home/gdb/default.nix
@@ -26,14 +26,7 @@ in
         gdb
       ];
 
-      xdg = {
-        configFile."gdb/gdbinit".source = ./gdbinit;
-        dataFile. "gdb/.keep".text = "";
-      };
-
-      home.sessionVariables = {
-        GDBHISTFILE = "${config.xdg.dataHome}/gdb/gdb_history";
-      };
+      xdg.configFile."gdb/gdbinit".source = ./gdbinit;
     }
 
     (lib.mkIf cfg.rr.enable {
diff --git a/modules/home/vim/plugin/settings/null-ls.lua b/modules/home/vim/plugin/settings/null-ls.lua
index 50d12e0..c372751 100644
--- a/modules/home/vim/plugin/settings/null-ls.lua
+++ b/modules/home/vim/plugin/settings/null-ls.lua
@@ -31,9 +31,11 @@ null_ls.register({
 -- Nix
 null_ls.register({
     null_ls.builtins.formatting.nixpkgs_fmt.with({
-        -- Only used if available, but prefer LSP if available
+        -- Only used if available, but prefer rnix if available
         condition = function()
-            return utils.is_executable("nixpkgs-fmt") and not utils.is_executable("nil")
+            return utils.is_executable("nixpkgs-fmt")
+                and not utils.is_executable("rnix-lsp")
+                and not utils.is_executable("nil")
         end,
     }),
 })
diff --git a/modules/home/xdg/default.nix b/modules/home/xdg/default.nix
index fb2668c..8b01696 100644
--- a/modules/home/xdg/default.nix
+++ b/modules/home/xdg/default.nix
@@ -42,6 +42,7 @@ in
     ANDROID_USER_HOME = "${configHome}/android";
     CARGO_HOME = "${dataHome}/cargo";
     DOCKER_CONFIG = "${configHome}/docker";
+    GDBHISTFILE = "${dataHome}/gdb/gdb_history";
     GRADLE_USER_HOME = "${dataHome}/gradle";
     HISTFILE = "${dataHome}/bash/history";
     INPUTRC = "${configHome}/readline/inputrc";