From 5461f1799c6a37619c0aeec9f677d9f7bbb56844 Mon Sep 17 00:00:00 2001 From: askiiart Date: Tue, 10 Oct 2023 13:27:57 -0500 Subject: [PATCH] Add yubikey GPG stuff, fix some stuff --- .gitmodules | 3 +++ daily-use-pcs/gpg-config.batch | 6 ------ daily-use-pcs/setup-git.bash | 23 +++++++++-------------- distro-specific.bash | 1 + do-everything.bash | 15 +++++++++++++-- dotfiles | 1 + install-stuff/install-steam.bash | 2 +- 7 files changed, 28 insertions(+), 23 deletions(-) delete mode 100644 daily-use-pcs/gpg-config.batch create mode 160000 dotfiles diff --git a/.gitmodules b/.gitmodules index 730dfb6..fd4163c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/daily-use-pcs/gpg-config.batch b/daily-use-pcs/gpg-config.batch deleted file mode 100644 index a5504ea..0000000 --- a/daily-use-pcs/gpg-config.batch +++ /dev/null @@ -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 \ No newline at end of file diff --git a/daily-use-pcs/setup-git.bash b/daily-use-pcs/setup-git.bash index 56cb513..5214047 100755 --- a/daily-use-pcs/setup-git.bash +++ b/daily-use-pcs/setup-git.bash @@ -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} ############# diff --git a/distro-specific.bash b/distro-specific.bash index c1adf03..a4d190f 100755 --- a/distro-specific.bash +++ b/distro-specific.bash @@ -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 diff --git a/do-everything.bash b/do-everything.bash index 954b7ed..6bf43d8 100755 --- a/do-everything.bash +++ b/do-everything.bash @@ -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 .. \ No newline at end of file +./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 .. diff --git a/dotfiles b/dotfiles new file mode 160000 index 0000000..5e49d47 --- /dev/null +++ b/dotfiles @@ -0,0 +1 @@ +Subproject commit 5e49d472464f0d4a1e241969727e229c5308b797 diff --git a/install-stuff/install-steam.bash b/install-stuff/install-steam.bash index d85217a..90b4231 100755 --- a/install-stuff/install-steam.bash +++ b/install-stuff/install-steam.bash @@ -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"