* use delta instead of diff
* add .gitconfig instead of modifying it by commands
This commit is contained in:
parent
39a8305f21
commit
7778a89a53
3 changed files with 20 additions and 5 deletions
6
arch.sh
6
arch.sh
|
@ -130,6 +130,7 @@ main() {
|
||||||
fish -c "abbr opamupdate 'opam update && opam upgrade -y'"
|
fish -c "abbr opamupdate 'opam update && opam upgrade -y'"
|
||||||
fish -c "abbr yay-rebuild 'checkrebuild | awk \'{print \$2}\' | xargs -r yay -S --rebuildtree --noconfirm'"
|
fish -c "abbr yay-rebuild 'checkrebuild | awk \'{print \$2}\' | xargs -r yay -S --rebuildtree --noconfirm'"
|
||||||
fish -c "abbr pacman-clean 'sudo pacman -Rsn \$(pacman -Qqtd) --noconfirm'"
|
fish -c "abbr pacman-clean 'sudo pacman -Rsn \$(pacman -Qqtd) --noconfirm'"
|
||||||
|
fish -c "abbr diff 'delta'"
|
||||||
# Fish by default in terminal app
|
# Fish by default in terminal app
|
||||||
local profil
|
local profil
|
||||||
profil=$(gsettings get org.gnome.Terminal.ProfilesList list)
|
profil=$(gsettings get org.gnome.Terminal.ProfilesList list)
|
||||||
|
@ -395,10 +396,7 @@ main() {
|
||||||
wget -q https://git.kennel.ml/Anri/confOS/raw/branch/main/.config/VSCodium/product.json -P "$HOME"/.config/VSCodium/
|
wget -q https://git.kennel.ml/Anri/confOS/raw/branch/main/.config/VSCodium/product.json -P "$HOME"/.config/VSCodium/
|
||||||
|
|
||||||
# === Git ==
|
# === Git ==
|
||||||
git config --global user.email "kennel.anri@tutanota.com"
|
wget -q https://git.kennel.ml/Anri/confOS/raw/branch/main/dotfiles/.gitconfig -O "$HOME"/.gitconfig
|
||||||
git config --global user.name "Mylloon"
|
|
||||||
git config --global pull.rebase true
|
|
||||||
git config --global init.defaultBranch main
|
|
||||||
|
|
||||||
# === Python ==
|
# === Python ==
|
||||||
# Add PIP packages from Python to the path
|
# Add PIP packages from Python to the path
|
||||||
|
|
|
@ -111,7 +111,8 @@
|
||||||
"pacman-contrib",
|
"pacman-contrib",
|
||||||
"cpanminus",
|
"cpanminus",
|
||||||
"gnome-text-editor",
|
"gnome-text-editor",
|
||||||
"rebuild-detector"
|
"rebuild-detector",
|
||||||
|
"git-delta"
|
||||||
],
|
],
|
||||||
"plugin": null,
|
"plugin": null,
|
||||||
"profile": {
|
"profile": {
|
||||||
|
|
16
dotfiles/.gitconfig
Normal file
16
dotfiles/.gitconfig
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
[commit]
|
||||||
|
gpgsign = true
|
||||||
|
|
||||||
|
[user]
|
||||||
|
email = kennel.anri@tutanota.com
|
||||||
|
name = Mylloon
|
||||||
|
|
||||||
|
[core]
|
||||||
|
editor = micro
|
||||||
|
pager = delta
|
||||||
|
|
||||||
|
[pull]
|
||||||
|
rebase = true
|
||||||
|
|
||||||
|
[init]
|
||||||
|
defaultBranch = main
|
Loading…
Reference in a new issue