From 5330e37f3b7244bea3c7219336b41d9c26baf726 Mon Sep 17 00:00:00 2001 From: Robin Candau Date: Sat, 28 Dec 2024 18:30:22 +0100 Subject: [PATCH] Update gitconfig --- Arch-Linux/Sway.md | 2 +- Arch-Linux/i3.md | 2 +- Dotfiles/General/gitconfig | 8 ++++++++ Dotfiles/General/gitconfig-arch | 4 ++++ Gentoo/i3.md | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 Dotfiles/General/gitconfig-arch diff --git a/Arch-Linux/Sway.md b/Arch-Linux/Sway.md index dd077fd..02ef735 100644 --- a/Arch-Linux/Sway.md +++ b/Arch-Linux/Sway.md @@ -220,7 +220,7 @@ mkdir -p ~/.config/mpv/ && curl https://raw.githubusercontent.com/Antiz96/Linux- mkdir -p ~/.config/zathura/ && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/zathurarc -o ~/.config/zathura/zathurarc && xdg-mime default org.pwmt.zathura.desktop application/pdf mkdir -p ~/.gnupg/ && chmod 700 ~/.gnupg && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/scdaemon.conf -o ~/.gnupg/scdaemon.conf curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/vimrc -o ~/.vimrc && mkdir -p ~/.vim/colors && curl https://raw.githubusercontent.com/vv9k/vim-github-dark/master/colors/ghdark.vim -o ~/.vim/colors/ghdark.vim -curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/gitconfig -o ~/.gitconfig +curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/gitconfig -o ~/.gitconfig && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/gitconfig-arch -o ~/.gitconfig-arch mkdir -p ~/.config/xfce4/xfconf/xfce-perchannel-xml && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/xfce4-terminal.xml -o ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-terminal.xml mkdir -p ~/.config/rofi/ && curl https://raw.githubusercontent.com/newmanls/rofi-themes-collection/master/themes/spotlight-dark.rasi -o ~/.config/rofi/spotlight-dark.rasi && sed -i s/border-radius:\ \ 8/border-radius:\ \ 0/ ~/.config/rofi/spotlight-dark.rasi && sed -i "/\bplaceholder\b/d" ~/.config/rofi/spotlight-dark.rasi && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/rofi-config -o ~/.config/rofi/config.rasi sudo curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/pacman-mirrorlist -o /etc/pacman.d/mirrorlist diff --git a/Arch-Linux/i3.md b/Arch-Linux/i3.md index 6131d34..1266399 100644 --- a/Arch-Linux/i3.md +++ b/Arch-Linux/i3.md @@ -213,7 +213,7 @@ mkdir -p ~/.config/mpv/ && curl https://raw.githubusercontent.com/Antiz96/Linux- mkdir -p ~/.config/zathura/ && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/zathurarc -o ~/.config/zathura/zathurarc && xdg-mime default org.pwmt.zathura.desktop application/pdf mkdir -p ~/.gnupg/ && chmod 700 ~/.gnupg && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/scdaemon.conf -o ~/.gnupg/scdaemon.conf curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/vimrc -o ~/.vimrc && mkdir -p ~/.vim/colors && curl https://raw.githubusercontent.com/vv9k/vim-github-dark/master/colors/ghdark.vim -o ~/.vim/colors/ghdark.vim -curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/gitconfig -o ~/.gitconfig +curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/gitconfig -o ~/.gitconfig && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/gitconfig-arch -o ~/.gitconfig-arch sudo curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/i3/picom.conf -o /etc/xdg/picom.conf mkdir -p ~/.config/xfce4/xfconf/xfce-perchannel-xml && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/xfce4-terminal.xml -o ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-terminal.xml mkdir -p ~/.config/gsimplecal/ && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/gsimplecal-config -o ~/.config/gsimplecal/config diff --git a/Dotfiles/General/gitconfig b/Dotfiles/General/gitconfig index 7a73f59..c7d17ea 100644 --- a/Dotfiles/General/gitconfig +++ b/Dotfiles/General/gitconfig @@ -1,6 +1,7 @@ [user] name = Robin Candau email = robincandau@protonmail.com + signingkey = A67CCEEBF9613C17FDE96E4ED33FAA16B937F3B2 [push] autoSetupRemote = true [color "diff"] @@ -8,5 +9,12 @@ new = blue [color "status"] added = blue +[commit] + gpgsign = true +[tag] + gpgsign = true [alias] upgrade = "!f(){ current_branch=$(git rev-parse --abbrev-ref HEAD) ; if [ -n \"$1\" ]; then main_branch=\"$1\"; else main_branch="main"; fi ; git switch \"$main_branch\" && git pull && git branch -d \"$current_branch\"; };f" + +[includeIf "gitdir:~/Documents/Arch-Linux/"] + path = ~/.gitconfig-arch diff --git a/Dotfiles/General/gitconfig-arch b/Dotfiles/General/gitconfig-arch new file mode 100644 index 0000000..2a75361 --- /dev/null +++ b/Dotfiles/General/gitconfig-arch @@ -0,0 +1,4 @@ +[user] + name = Robin Candau + email = antiz@archlinux.org + signingkey = 262A58EC6C51F7EA395B2E2DFDC3040B92ACA748 diff --git a/Gentoo/i3.md b/Gentoo/i3.md index 7fa6100..3b27ff7 100644 --- a/Gentoo/i3.md +++ b/Gentoo/i3.md @@ -144,7 +144,7 @@ mkdir -p ~/.config/mpv/ && curl https://raw.githubusercontent.com/Antiz96/Linux- mkdir -p ~/.config/zathura/ && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/zathurarc -o ~/.config/zathura/zathurarc && xdg-mime default org.pwmt.zathura.desktop application/pdf mkdir -p ~/.gnupg/ && chmod 700 ~/.gnupg && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/scdaemon.conf -o ~/.gnupg/scdaemon.conf curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/vimrc -o ~/.vimrc && mkdir -p ~/.vim/colors && curl https://raw.githubusercontent.com/vv9k/vim-github-dark/master/colors/ghdark.vim -o ~/.vim/colors/ghdark.vim -curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/gitconfig -o ~/.gitconfig +curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/gitconfig -o ~/.gitconfig && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/gitconfig-arch -o ~/.gitconfig-arch sudo curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/i3/picom.conf -o /etc/xdg/picom.conf mkdir -p ~/.config/xfce4/xfconf/xfce-perchannel-xml && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/xfce4-terminal.xml -o ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-terminal.xml mkdir -p ~/.config/gsimplecal/ && curl https://raw.githubusercontent.com/Antiz96/Linux-Desktop/main/Dotfiles/General/gsimplecal-config -o ~/.config/gsimplecal/config