diff --git a/.config/wireplumber/wireplumber.conf.d/80-bluez-properties.conf b/.config/wireplumber/wireplumber.conf.d/80-bluez-properties.conf new file mode 100644 index 0000000..541fe68 --- /dev/null +++ b/.config/wireplumber/wireplumber.conf.d/80-bluez-properties.conf @@ -0,0 +1,7 @@ +monitor.bluez.properties = { + # Keep the software volume (set using a combination of keys) separate from + # the hardware volume (set using the buttons on a Bluetooth device). This + # affords fine-grained volume control; without that, it is painfully loud at + # all levels. + bluez5.enable-hw-volume = false +} diff --git a/.gitconfig b/.gitconfig index 86c27a9..7e6fa31 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,7 @@ [alias] - d = diff -b - s = show -b + d = diff -w + l = log + s = show -w [blame] coloring = repeatedLines date = iso @@ -31,7 +32,15 @@ compression = 9 fscache = true hideDotFiles = true + pager = delta preloadindex = true +[delta] + blame-timestamp-output-format = "%F %T" + color-only = false + diff-so-fancy = true + line-numbers = true + navigate = true + syntax-theme = none [diff] algorithm = minimal tool = vimdiff @@ -49,13 +58,15 @@ fontui = -family Signika -size 11 [init] defaultBranch = main +[interactive] + diffFilter = delta [log] date = iso +[merge] + conflictstyle = zdiff3 [pager] branch = false - diff = less -iRF log = less -iRFX - show = less -iRFX [pull] rebase = false [user] diff --git a/custom-prompt/custom-prompt.cc b/custom-prompt/custom-prompt.cc index 1634666..3f190d6 100644 --- a/custom-prompt/custom-prompt.cc +++ b/custom-prompt/custom-prompt.cc @@ -77,6 +77,7 @@ namespace C #define B_BLUE BEGIN_INVISIBLE ESCAPE LEFT_SQUARE_BRACKET "94m" END_INVISIBLE #define B_GREEN BEGIN_INVISIBLE ESCAPE LEFT_SQUARE_BRACKET "92m" END_INVISIBLE #define B_GREEN_RAW ESCAPE LEFT_SQUARE_BRACKET "92m" +#define B_GREY BEGIN_INVISIBLE ESCAPE LEFT_SQUARE_BRACKET "90m" END_INVISIBLE #define B_GREY_RAW ESCAPE LEFT_SQUARE_BRACKET "90m" #define B_RED BEGIN_INVISIBLE ESCAPE LEFT_SQUARE_BRACKET "91m" END_INVISIBLE #define B_RED_RAW ESCAPE LEFT_SQUARE_BRACKET "91m" @@ -710,7 +711,7 @@ int main_internal(int const argc, char const* argv[]) display_primary_prompt(shlvl, git_repository_information_future.wait_for(std::chrono::milliseconds(150)) == std::future_status::ready ? git_repository_information_future.get() - : "unavailable"); + : B_GREY "unavailable" RESET); return EXIT_SUCCESS; }