softinio/nix-config
softinio/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'Update to use nvim for mergetool & battery config update' (#10) from move-diff-tool-to-nvim into main

Browse source 
Reviewed-on: https://git.softinio.com/softinio/nix-config/pulls/10
This commit is contained in:
Salar Rahmanian 2022-09-22 03:15:04 +00:00
commit 44d9115424
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
programs/git/default.nix
View file

@ -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 = {

2
programs/neovim/init.lua
View file

@ -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
})

4
programs/neovim/settings/salargalaxyline.lua
View file

@ -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 },