Add yubikey GPG stuff, fix some stuff

This commit is contained in:
askiiart 2023-10-10 13:27:57 -05:00
parent 320b1f80f7
commit 5461f1799c
Signed by untrusted user who does not match committer: askiiart
GPG key ID: BC3800E55FB54D67
7 changed files with 28 additions and 23 deletions

3
.gitmodules vendored
View file

@ -1,3 +1,6 @@
[submodule "zsh/zsh-files/.oh-my-zsh"]
path = install-stuff/zsh/zsh-files/.oh-my-zsh
url = https://github.com/askiiart/.oh-my-zsh
[submodule "dotfiles"]
path = dotfiles
url = https://git.askiiart.net/askiiart/dotfiles

View file

@ -1,6 +0,0 @@
%echo Generating an example PGP key
Key-Type: RSA
Key-Length: 4096
Name-Real: askiiart
Name-Email: dev@askiiart.net
Expire-Date: 0

View file

@ -5,6 +5,7 @@ set -e
GITEA_URL="https://git.askiiart.net"
GIT_NAME="askiiart"
GIT_EMAIL="dev@askiiart.net"
KEY_ID="02EFA1CE3C3E4AAD7A863AB8ED24985CA884CD61"
# Note: This waits until enter is pressed
# read -p "Press Enter to continue" < /dev/tty
@ -53,23 +54,17 @@ fi
############################################
# Do GPG key stuff for commit verification #
############################################
if [ -d "${HOME}/.gnupg/" ]; then
echo "GPG key(s) already exist, skipping..."
gpg --list-keys
read -p "Enter the long ID of the key to be used for git:" KEY_ID
else
# Create GPG key
gpg --batch --gen-key gpg-config.batch
read -p "Copy the long ID above, then paste it here: " KEY_ID
echo $KEY_ID
fi
echo Doing git config stuff...
git config --global user.name "${GIT_NAME}"
git config --global user.email "${GIT_EMAIL}"
git config --global user.signingkey ${KEY_ID}
git config --global commit.gpgsign true
git-credential-manager configure
git config --global commit.gpgsign true
git config --global credential.credentialStore gpg
echo "GPG key ID: ${KEY_ID}"
echo "Go to https://github.com/drduh/YubiKey-Guide to set up git with GPG"
read -p "Mirrored at https://git.askiiart.net/mirrors/YubiKey-Guide"
git config --global user.signingkey ${KEY_ID}
pass init ${KEY_ID}
#############

View file

@ -12,6 +12,7 @@ if command_exists "apt-get"; then
sudo apt install curl -y
elif command_exists "yum"; then
sudo dnf config-manager --add-repo https://askiiart.net/repos/fedora/x86_64/askiiart.repo
sudo dnf install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
elif command_exists "pacman"; then
WD=$(pwd)
pacman -S --needed git base-devel

View file

@ -1,4 +1,9 @@
#!/usr/bin/env sh
cd ./dotfiles
chmod 700 restore.sh
./restore.sh
cd ..
chmod 700 ./distro-specific.bash
./distro-specific.bash
@ -9,5 +14,11 @@ cd ..
cd install-stuff/
chmod 700 ./*.bash
./*.bash
cd ..
./install-armcord.bash
./install-fish.bash
./install-librewolf.bash
./install-qemu-libvirt.bash
./install-steam.bash
./install-vs-code.bash
./install-yt-music.bash
cd ..

1
dotfiles Submodule

@ -0,0 +1 @@
Subproject commit 5e49d472464f0d4a1e241969727e229c5308b797

View file

@ -14,7 +14,7 @@ elif command_exists "yum"; then
sudo dnf install steam -y
elif command_exists "pacman"; then
echo "[multilib]\nInclude = /etc/pacman.d/mirrorlist"
read -p "Enable the multilib repo in /etc/pacman.conf - look above`
read -p "Enable the multilib repo in /etc/pacman.conf - look above"
$EDITOR /etc/pacman.conf
else
echo "IDK"