fix 🐞: Git Config (Pager and Diff)
This commit is contained in:
parent
6d3f5b4aa3
commit
f68f2e5717
7 changed files with 63 additions and 56 deletions
11
git/config
11
git/config
|
@ -26,15 +26,14 @@
|
|||
context = 3
|
||||
renames = copies
|
||||
interHunkContext = 10
|
||||
[pager]
|
||||
diff = diff-so-fancy | less --tabs=4 -RFX
|
||||
|
||||
# [pager]
|
||||
# diff = diff-so-fancy | $PAGER
|
||||
|
||||
# [diff-so-fancy]
|
||||
# markEmptyLines = true
|
||||
[diff-so-fancy]
|
||||
markEmptyLines = true
|
||||
|
||||
[color "diff"]
|
||||
meta = black bold
|
||||
meta = yellow bold
|
||||
fraq = magenta
|
||||
context = white
|
||||
whitespace = yellow reverse
|
||||
|
|
|
@ -26,7 +26,7 @@ exec-once = wl-paste --type image --watch cliphist store
|
|||
exec-once = hyprpaper & waybar
|
||||
exec-once = hypridle
|
||||
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
|
||||
rounding = 6
|
||||
|
||||
active_opacity = 0.95
|
||||
active_opacity = 1
|
||||
inactive_opacity = 0.75
|
||||
|
||||
shadow {
|
||||
|
|
|
@ -92,7 +92,7 @@
|
|||
|
||||
background {
|
||||
monitor =
|
||||
path = /home/arcadian/Pictures/Wallpaper/wallpaper60.png
|
||||
path = /home/arcadian/Pictures/Wallpaper/wall2.jpg
|
||||
# only png supported for now
|
||||
}
|
||||
|
||||
|
|
4
setup.sh
4
setup.sh
|
@ -3,7 +3,7 @@
|
|||
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
|
||||
_________ __ ____ ___
|
||||
|
@ -78,6 +78,6 @@ else
|
|||
echo "JetBrains Nerd Fonts already installed, skipping download."
|
||||
fi
|
||||
|
||||
fc-cache -fv
|
||||
fc-cache -f -v
|
||||
|
||||
echo "Setup completed successfully!"
|
||||
|
|
|
@ -151,6 +151,7 @@
|
|||
// "▆▅▄▃▂▁" // 84–100%
|
||||
// ]
|
||||
"default": [
|
||||
"░░░░░░░░░░",
|
||||
"▓░░░░░░░░░",
|
||||
"▓▓░░░░░░░░",
|
||||
"▓▓▓░░░░░░░",
|
||||
|
|
|
@ -153,6 +153,11 @@ menu,
|
|||
margin: 0 1px;
|
||||
}
|
||||
|
||||
#custom-volume {
|
||||
padding: 0 8px;
|
||||
/* color: @beige; */
|
||||
}
|
||||
|
||||
#network.speed {
|
||||
background: @raisin-black;
|
||||
padding: 0px 6px;
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
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 STARSHIP_CONFIG=~/.config/starship/starship.toml
|
||||
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="$HOME/.cargo/bin:$PATH"
|
||||
|
||||
fortune | cowsay
|
||||
#fortune | cowsay
|
||||
|
||||
# Todo Manager Alias
|
||||
alias todo='~/.todo/todo_tui.sh'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue