diff --git a/programs/git/default.nix b/programs/git/default.nix
index e044ac4..5dad237 100644
--- a/programs/git/default.nix
+++ b/programs/git/default.nix
@@ -7,16 +7,16 @@ let
       pager  = "diff-so-fancy | less --tabs=4 -RFX";
     };
     init.defaultBranch = "main";
-    merge.conflictStyle = "diff3";
-    merge.tool = "intellij";
-    mergetool = {
-      cmd = "idea merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"";
-      trustExitCode = true;
+    merge.conflictstyle = "diff3";
+    merge.tool = "nvim";
+    mergetool.nvim = {
+      cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"";
       prompt = false;
+      keepBackup = false;
     };
-    diff.tool = "intellij";
-    difftool = {
-      cmd = "idea diff \"$LOCAL\" \"$REMOTE\"";
+    diff.tool = "nvim";
+    difftool.nvim = {
+      cmd = "nvim -d \"$LOCAL\" \"$REMOTE\"";
       prompt = false;
     };
     url = {
diff --git a/programs/neovim/init.lua b/programs/neovim/init.lua
index 8e2dd7a..3eb875f 100644
--- a/programs/neovim/init.lua
+++ b/programs/neovim/init.lua
@@ -85,7 +85,7 @@ _G.load_config = function()
     show_status_when_no_battery = true, -- Don't show any icon or text when no battery found (desktop for example)
     show_plugged_icon = true, -- If true show a cable icon alongside the battery icon when plugged in
     show_unplugged_icon = true, -- When true show a diconnected cable icon when not plugged in
-    show_percent = false, -- Whether or not to show the percent charge remaining in digits
+    show_percent = true, -- Whether or not to show the percent charge remaining in digits
     vertical_icons = true, -- When true icons are vertical, otherwise shows horizontal battery icon
   })
 
diff --git a/programs/neovim/settings/salargalaxyline.lua b/programs/neovim/settings/salargalaxyline.lua
index 25bb01b..729f50b 100644
--- a/programs/neovim/settings/salargalaxyline.lua
+++ b/programs/neovim/settings/salargalaxyline.lua
@@ -181,7 +181,9 @@ gls.right[4] = {
 gls.right[5] = {
   BatteryNvim = {
     provider = function()
-        return require 'battery'.get_status_line()
+        local status = require 'battery'.get_status_line()
+        local formatted = string.format(status)
+        return formatted
     end,
     separator = '',
     separator_highlight = { colors.bg, colors.purple },