fix 🐞: Git Config (Pager and Diff)
This commit is contained in:
parent
6d3f5b4aa3
commit
f68f2e5717
7 changed files with 63 additions and 56 deletions
99
git/config
99
git/config
|
@ -23,64 +23,63 @@
|
||||||
defaultBranch = dev
|
defaultBranch = dev
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
context = 3
|
context = 3
|
||||||
renames = copies
|
renames = copies
|
||||||
interHunkContext = 10
|
interHunkContext = 10
|
||||||
|
[pager]
|
||||||
|
diff = diff-so-fancy | less --tabs=4 -RFX
|
||||||
|
|
||||||
# [pager]
|
[diff-so-fancy]
|
||||||
# diff = diff-so-fancy | $PAGER
|
markEmptyLines = true
|
||||||
|
|
||||||
# [diff-so-fancy]
|
|
||||||
# markEmptyLines = true
|
|
||||||
|
|
||||||
[color "diff"]
|
[color "diff"]
|
||||||
meta = black bold
|
meta = yellow bold
|
||||||
fraq = magenta
|
fraq = magenta
|
||||||
context = white
|
context = white
|
||||||
whitespace = yellow reverse
|
whitespace = yellow reverse
|
||||||
old = red
|
old = red
|
||||||
|
|
||||||
[interactive]
|
[interactive]
|
||||||
diffFilter = diff-so-fancy --patch
|
diffFilter = diff-so-fancy --patch
|
||||||
singleKey = true
|
singleKey = true
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
gpgSign = false
|
gpgSign = false
|
||||||
template = ~/.config/git/template
|
template = ~/.config/git/template
|
||||||
|
|
||||||
[push]
|
[push]
|
||||||
autoSetupRemote = true
|
autoSetupRemote = true
|
||||||
default = current
|
default = current
|
||||||
followTags = true
|
followTags = true
|
||||||
gpgSign = false
|
gpgSign = false
|
||||||
|
|
||||||
[pull]
|
[pull]
|
||||||
default = current
|
default = current
|
||||||
rebase = true
|
rebase = true
|
||||||
|
|
||||||
[rebase]
|
[rebase]
|
||||||
autoStash = true
|
autoStash = true
|
||||||
missingCommitsCheck = warn
|
missingCommitsCheck = warn
|
||||||
|
|
||||||
[submodule]
|
[submodule]
|
||||||
fetchJobs = 16
|
fetchJobs = 16
|
||||||
|
|
||||||
[color "blame"]
|
[color "blame"]
|
||||||
highlightRecent = black bold,1 year ago,white,1 month ago,default,7 days ago,blue
|
highlightRecent = black bold,1 year ago,white,1 month ago,default,7 days ago,blue
|
||||||
|
|
||||||
[log]
|
[log]
|
||||||
abbrevCommit = true
|
abbrevCommit = true
|
||||||
graphColors = blue,yellow,cyan,magenta,green,red
|
graphColors = blue,yellow,cyan,magenta,green,red
|
||||||
|
|
||||||
[blame]
|
[blame]
|
||||||
coloring = highlightRecent
|
coloring = highlightRecent
|
||||||
date = relative
|
date = relative
|
||||||
|
|
||||||
[status]
|
[status]
|
||||||
branch = true
|
branch = true
|
||||||
short = true
|
short = true
|
||||||
showStash = true
|
showStash = true
|
||||||
showUntrackedFiles = all
|
showUntrackedFiles = all
|
||||||
|
|
||||||
[color "branch"]
|
[color "branch"]
|
||||||
current = magenta
|
current = magenta
|
||||||
|
@ -90,27 +89,27 @@
|
||||||
plain = blue
|
plain = blue
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
st = status
|
st = status
|
||||||
ss = status -s
|
ss = status -s
|
||||||
ci = commit
|
ci = commit
|
||||||
co = checkout
|
co = checkout
|
||||||
br = branch -a
|
br = branch -a
|
||||||
aa = add -A
|
aa = add -A
|
||||||
ap = add --patch
|
ap = add --patch
|
||||||
cdf = clean -df
|
cdf = clean -df
|
||||||
|
|
||||||
lo = log --oneline
|
lo = log --oneline
|
||||||
l = log --all --graph --decorate --oneline --abbrev-commit --date=short
|
l = log --all --graph --decorate --oneline --abbrev-commit --date=short
|
||||||
r = remote
|
r = remote
|
||||||
conf = config --global --edit
|
conf = config --global --edit
|
||||||
df = diff
|
df = diff
|
||||||
structure = log --oneline --simplify-by-decoration --graph --all
|
structure = log --oneline --simplify-by-decoration --graph --all
|
||||||
slog = log --pretty=format:'%C(auto)%h %C(red)%as %C(blue)%aN%C(auto)%d%C(green) %s'
|
slog = log --pretty=format:'%C(auto)%h %C(red)%as %C(blue)%aN%C(auto)%d%C(green) %s'
|
||||||
s5 = slog -5 --graph
|
s5 = slog -5 --graph
|
||||||
s10 = slog -10
|
s10 = slog -10
|
||||||
|
|
||||||
# [gpg]
|
# [gpg]
|
||||||
# format = opengpg
|
# format = opengpg
|
||||||
|
|
||||||
[gpg "ssh"]
|
[gpg "ssh"]
|
||||||
program = ssh-keygen
|
program = ssh-keygen
|
||||||
|
|
|
@ -26,7 +26,7 @@ exec-once = wl-paste --type image --watch cliphist store
|
||||||
exec-once = hyprpaper & waybar
|
exec-once = hyprpaper & waybar
|
||||||
exec-once = hypridle
|
exec-once = hypridle
|
||||||
exec-once = [workspace 1] zen-browser
|
exec-once = [workspace 1] zen-browser
|
||||||
exec-once = [workspace 2] [float; size 1000 500] $terminal
|
exec-once = [workspace 2] kitty
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ decoration {
|
||||||
dim_special = 0.2
|
dim_special = 0.2
|
||||||
rounding = 6
|
rounding = 6
|
||||||
|
|
||||||
active_opacity = 0.95
|
active_opacity = 1
|
||||||
inactive_opacity = 0.75
|
inactive_opacity = 0.75
|
||||||
|
|
||||||
shadow {
|
shadow {
|
||||||
|
|
|
@ -92,7 +92,7 @@
|
||||||
|
|
||||||
background {
|
background {
|
||||||
monitor =
|
monitor =
|
||||||
path = /home/arcadian/Pictures/Wallpaper/wallpaper60.png
|
path = /home/arcadian/Pictures/Wallpaper/wall2.jpg
|
||||||
# only png supported for now
|
# only png supported for now
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
4
setup.sh
4
setup.sh
|
@ -3,7 +3,7 @@
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
|
||||||
sudo pacman -S hyprland waybar dunst kitty neovim git wl-clipboard xdg-desktop-portal-hyprland xdg-desktop-portal wofi network-manager-applet brightnessctl pavucontrol tmux rofi yazi firefox pamixer hyprlock grim slurp
|
#sudo pacman -S hyprland waybar dunst kitty neovim git wl-clipboard xdg-desktop-portal-hyprland xdg-desktop-portal wofi network-manager-applet brightnessctl pavucontrol tmux rofi yazi firefox pamixer hyprlock grim slurp
|
||||||
|
|
||||||
cat << EOF | lolcat
|
cat << EOF | lolcat
|
||||||
_________ __ ____ ___
|
_________ __ ____ ___
|
||||||
|
@ -78,6 +78,6 @@ else
|
||||||
echo "JetBrains Nerd Fonts already installed, skipping download."
|
echo "JetBrains Nerd Fonts already installed, skipping download."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fc-cache -fv
|
fc-cache -f -v
|
||||||
|
|
||||||
echo "Setup completed successfully!"
|
echo "Setup completed successfully!"
|
||||||
|
|
|
@ -151,6 +151,7 @@
|
||||||
// "▆▅▄▃▂▁" // 84–100%
|
// "▆▅▄▃▂▁" // 84–100%
|
||||||
// ]
|
// ]
|
||||||
"default": [
|
"default": [
|
||||||
|
"░░░░░░░░░░",
|
||||||
"▓░░░░░░░░░",
|
"▓░░░░░░░░░",
|
||||||
"▓▓░░░░░░░░",
|
"▓▓░░░░░░░░",
|
||||||
"▓▓▓░░░░░░░",
|
"▓▓▓░░░░░░░",
|
||||||
|
|
|
@ -153,6 +153,11 @@ menu,
|
||||||
margin: 0 1px;
|
margin: 0 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#custom-volume {
|
||||||
|
padding: 0 8px;
|
||||||
|
/* color: @beige; */
|
||||||
|
}
|
||||||
|
|
||||||
#network.speed {
|
#network.speed {
|
||||||
background: @raisin-black;
|
background: @raisin-black;
|
||||||
padding: 0px 6px;
|
padding: 0px 6px;
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
export ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit/zinit.git"
|
export ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit/zinit.git"
|
||||||
|
#export PATH="$HOME/.local/bin:$PATH"
|
||||||
|
export PATH=$PATH:/opt/kafka/bin
|
||||||
export PATH=$HOME/.config/rofi/scripts:$PATH
|
export PATH=$HOME/.config/rofi/scripts:$PATH
|
||||||
export STARSHIP_CONFIG=~/.config/starship/starship.toml
|
export STARSHIP_CONFIG=~/.config/starship/starship.toml
|
||||||
export EDITOR=/bin/nvim
|
export EDITOR=/bin/nvim
|
||||||
|
@ -182,7 +184,7 @@ complete -C '/usr/bin/aws_completer' aws
|
||||||
export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
|
export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
|
||||||
export PATH="$HOME/.cargo/bin:$PATH"
|
export PATH="$HOME/.cargo/bin:$PATH"
|
||||||
|
|
||||||
fortune | cowsay
|
#fortune | cowsay
|
||||||
|
|
||||||
# Todo Manager Alias
|
# Todo Manager Alias
|
||||||
alias todo='~/.todo/todo_tui.sh'
|
alias todo='~/.todo/todo_tui.sh'
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue