From a6162c2c84221a035e0f1ae84f76a474384e5993 Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Halili Date: Sat, 5 Oct 2024 03:57:27 +0000 Subject: [PATCH] chore(global): update shell scripts and configs Going to migrate my Git author email address soon :) Signed-off-by: Andrei Jiroh Halili --- .bash_login | 1 + .bashrc | 31 +++++-------------- ...omated-deploy.bashrc => autoloader.bashrc} | 7 ++++- .config/bash/bashrc | 5 ++- .docker/config.json | 1 + .ssh/authorized_keys | 17 +++++----- .tool-versions | 2 +- 7 files changed, 27 insertions(+), 37 deletions(-) rename .config/bash/{tools/automated-deploy.bashrc => autoloader.bashrc} (56%) diff --git a/.bash_login b/.bash_login index d8f48cb..5dad7f2 100644 --- a/.bash_login +++ b/.bash_login @@ -28,5 +28,6 @@ export GOPATH="$HOME/.local/share/go" # and https://drewdevault.com/2021/08/06/goproxy-breaks-go.html export GOPROXY=direct GOSUMDB=off export PATH="${DOTFILES_BIN}:${GOPATH}/bin:${HOME}/.local/bin:${PATH}" +source .bashrc _byobu_sourced=1 . /usr/bin/byobu-launch 2>/dev/null || true diff --git a/.bashrc b/.bashrc index db95831..a52e964 100644 --- a/.bashrc +++ b/.bashrc @@ -6,16 +6,6 @@ # in-code docs and for future me to not dig through 'git log' hell. # SPDX-License-Identifier: MIT AND MPL-2.0 -## Stage 0: Init keychain + GPG_TTY for pinentry hellscapes in TUI. ## -## This stage also initalizes oh-my-posh or custom -## PSI here. ## -if [[ $TERMUX ]]; then - export SSH_AGENT_=todo -elif command -v keychain >> /dev/null; then - # shellcheck disable=SC2155 - export KEYCHAIN_PATH=$(command -v keychain) - eval $(keychain --agents gpg,ssh --eval) -fi # shellcheck disable=SC2155 export GPG_TTY=$(tty) @@ -24,32 +14,27 @@ if [ -f "$HOME/.config/localconfig.env" ]; then . "$HOME/.config/localconfig.env" fi -## Stage 1: Init custom vars and shortcuts before anything else ## -## Note that ~/.env and ~/.env.local should be loaded eariler on ## -# Dotfiles stuff, maybe should be on ~/.env? -#export DOTFILES_HOME="$HOME/.dotfiles" export DOTFILES_BIN="$HOME/bin" -# gopath should be on ~/.local/share/go to not fuck up with local install -# at ~/go if exists + +# Golang export GOPATH="$HOME/.local/share/go" export PATH="${GOPATH}/bin:${PATH}" -# Shut up, VS Code (not the OSS distributions off github:microsoft/vscode). -# Don't let me pay for JetBrains IDEs or go nuts with nvim (or emacs, since -# I'm both a bit neutral and off the rails at Vim vs Emacs debate). Also RIP -# to my first editor after Notepad that started my web dev + Linux journey, -# Atom (https://github.com/atom). -export EDITOR=nano # Context: https://git.sr.ht/~sircmpwn/dotfiles/tree/master/item/.profile#L13-15 # and https://drewdevault.com/2021/08/06/goproxy-breaks-go.html export GOPROXY=direct GOSUMDB=off + +# Use nano by default +export EDITOR=nano VISUAL=nano + # nix profile install nixpkgs#glibcLocale export LOCALE_ARCHIVE="$HOME/.nix-profile/lib/locale/locale-archive" export PATH="${DOTFILES_BIN}:${GOPATH}/bin:${HOME}/.local/bin:${PATH}" -## Stage 2: Source literally everything else ## +# bashbox if [[ -d "$HOME/.bashbox" ]]; then # shellcheck disable=SC1091 source "$HOME/.bashbox/env" fi +# load the meta bashrc and the rest source "$HOME/.config/bash/bashrc" \ No newline at end of file diff --git a/.config/bash/tools/automated-deploy.bashrc b/.config/bash/autoloader.bashrc similarity index 56% rename from .config/bash/tools/automated-deploy.bashrc rename to .config/bash/autoloader.bashrc index f47a02c..7a44253 100644 --- a/.config/bash/tools/automated-deploy.bashrc +++ b/.config/bash/autoloader.bashrc @@ -4,7 +4,12 @@ for file in "${HOME}"/.config/bash/tools/*.bashrc; do if [ "$file" == "${HOME}/.config/bash/tools/automated-deploy.bashrc" ]; then [[ $DEBUG != "" ]] && echo "avoiding source loop, skipping $file" else - [[ $DEBUG != "" ]] && echo "sourcing $file" + [[ $DEBUG != "" ]] && echo "[tools] sourcing $file" source "$file" fi done + +for file in "${HOME}"/.config/bash/completions/*.bash; do + [[ $DEBUG != "" ]] && echo "[shell-completions] sourcing $file" + source "$file" +fi \ No newline at end of file diff --git a/.config/bash/bashrc b/.config/bash/bashrc index a9c61a4..99c2a86 100644 --- a/.config/bash/bashrc +++ b/.config/bash/bashrc @@ -51,7 +51,7 @@ if [ -n "$force_color_prompt" ]; then fi fi -# If this is an xterm set the title to user@host:dir +# shell prompts if command -v oh-my-posh >>/dev/null && [[ $FF_USE_OHMYPOSH != "false" ]]; then eval "$(oh-my-posh init bash)" else @@ -72,10 +72,9 @@ export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quo # You may want to put all your additions into a separate file like # ~/.bash_aliases, instead of adding them here directly. # See /usr/share/doc/bash-doc/examples in the bash-doc package. - source "${HOME}/.config/bash/aliases" -source "${HOME}/.config/bash/tools/automated-deploy.bashrc" source "${HOME}/.config/bash/functions" +source "${HOME}/.config/bash/autoloader.bashrc" # enable programmable completion features (you don't need to enable # this, if it's already enabled in /etc/bash.bashrc and /etc/profile diff --git a/.docker/config.json b/.docker/config.json index 09a96d5..342e8f6 100644 --- a/.docker/config.json +++ b/.docker/config.json @@ -1,6 +1,7 @@ { "auths": { "dock.mau.dev": {}, + "ghcr.io": {}, "https://index.docker.io/v1/": {}, "https://index.docker.io/v1/access-token": {}, "https://index.docker.io/v1/refresh-token": {}, diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys index 13b8a3e..b26ef5d 100644 --- a/.ssh/authorized_keys +++ b/.ssh/authorized_keys @@ -1,11 +1,10 @@ +# Andrei Jiroh's main keys +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEXuD3hJwInlcHs3wkXWAWNo8es3bPAd2e8ipjyqgGp2 ajhalili2006@andreijiroh.xyz ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzMlrUe7qMA1P0lP56lq2dKTrwFU6CrVltQ9um+PhOMLkoi31kAlujHtWF6mqGRLXcK0Ao/0Wqug++r82Zu0u7dpAv8LCExtaRRMzagwPkEe4OOqUBOpS6mggfsik8mNA+1UtpkXJ+ZiB4cXtNKEZC0jtxWOTXSV67qgkSxuO+YBWB+7pnESkB0KorqwOoWGGUVfYQtbKUAt6VqM4s6dn7saXqwmN0tCPO6a+4L4mazkYjFD11HhktYsjP9dvnxYSOtMrSFb9JOXRST2LdiIJgwg+HTqBSWGO7aBRHMJaTF3ajlbMtKDQI/EcNQLyGgX6yFdjjzz9DRY+2oU0vPTytdqM2BKsfLlR0GVg7BVL7TZPaLJ1lgpCl4Z1oClW9FOzhnYJVT0W+IKPsnYsFPfv/BVgjWF7YtLdc5zqFJ31PULtikCyd0I6Kt95YD0HdrlR2faWcBHI8KKEAwCCanodGnK/xTOxisTX2dXOxx3mvR/L3Wil2ca5hnD+vt500/o8= gildedguy@andreijiroh -ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFTNV8nJ6ClJ2XmEDl4wJYUANt46SsZgSl7MYBza6VxbpozLhBsc+CSzXnCJpBMZH+5WaPRCVLgIAHyxZJh/v0s= ajhalili2006.srht - Gitpod use -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOKHIPrafF5WcCuTQDTmoR6O5z9yB6c67uWyFbcr0fYV sr.ht/~ajhalili2006 - ajhalili2006@gmail.com -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCeAJ4l2WxXrO7SShNsl5BP+EHmhamkT9UFunKeBV16bMeultud9jJILoaeCTZO86Q6LNy+EjtgABehiozi6iQTh0EnJLzOsdOi4IDvrE/ijVk+7mG4d83Mn6MGKDdrWwf6EJxQqQSnHFwKOrlqF9n32jYvwDnyW3uqiYXAl2cro42GPVtWDSApRRkKWZhYpIyVp5/txg40Z/L9U6PbdTegTSxzxCe9dKruw/rdreGm9AbJ9BmYBEVlD3Tjju7JXN/G9/Odm/n2adymFSY9rf4kg3warB+J8d0UGe1cTZv4ruYoGMJEpM9z4KDgSuiRn7Ful5vd19w4gMQcr4l1xPuFT1SPmwN3ydBNkq65hjhmBWYe/ZegMiVOKPuuuFSgi5p3Tlh3kUwAPBRaFNpMuWM9t1fi9PMRlNo8ylC4olkdl7qumFEua4pXYDQ4ECV7VHJRWCBGXo1jO5EbCPNojpYv3JxwQ3LlOJfWQiDqMH78G6VqMWKa59lNX6kcAudof7LWANQAcF3753dYSBUQGlCfQNNk9ipZnLY9FYTv9SdblcM/nOgyN2i6eR+USRb/Cw3uUDuHNzdAmUcbnyB/sgbzOuojCUYTT6rG+n86S9j40bbeU+0emKt+0VGfMnNuUhWU6bg5vpIbNwm8oDW5RFTZIxfxHRl5ubnp+9HUTMiUQ== ajhalili2006-main-gpg +# passwordless auth ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDUnTexcVQTGT+UhX8MRPkMvM6FPuskbY2Dn0ScZ3+ot ~ajhalili2006 [passwordless key for sshfs] -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFrrYRVtV3OvgLzXMedNVITzoHnHd5wMVe53h16xxVWs ajhalili2006+passwordless@github.tailnet -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEXuD3hJwInlcHs3wkXWAWNo8es3bPAd2e8ipjyqgGp2 ajhalili2006@andreijiroh.eu.org -# Added by Google -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC9p6XYWUumCEk8ExaoProbI6BQHu52SErSlrOzUzzCUTjRPq2vfENTL7GwG6cgsrDLBxW+u+t6qoTXRVeRc7YCXzmPofls7dy2wXwBSM1Z/AzXCFDEVxtn3Y3F6gLi7nUbMZywBmBSlNjiN1w3FbBKMMP4SYgz0O1SGIjIFBQFheZgRTJxUq9DyPQRbY4U3jcJV8968JPQELKBCvmeI2iKNLOeSY1kVmwwM90yKgcvJsM/uTNXzUjTRK3Y4J0GWA2Up53pQxjmskqOusI+rwDVpnLsJEsjszvpOj5UAQrW4PuhJKjY0RYbigCrqqmCDbFuX9w6N9Sjo6Vp5MVxsMq7OwdNxNhBKDPJ8le4km8hdO8Z162+pSqUftk0hA4OjHIX2/i4avEl6Hh7MD1nbTnTbbaZV+1g6edWCnH0UASnrhulYkUNoWvpAi/bHJsfVuw5tZ8FprI5t6rCKiOXnXqU+jsn+fabDeuIt1mlN7BueebLUzAQ44npsFdSMEDCdJs= gildedguy@stellapent-cier -# Added by Google -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC9p6XYWUumCEk8ExaoProbI6BQHu52SErSlrOzUzzCUTjRPq2vfENTL7GwG6cgsrDLBxW+u+t6qoTXRVeRc7YCXzmPofls7dy2wXwBSM1Z/AzXCFDEVxtn3Y3F6gLi7nUbMZywBmBSlNjiN1w3FbBKMMP4SYgz0O1SGIjIFBQFheZgRTJxUq9DyPQRbY4U3jcJV8968JPQELKBCvmeI2iKNLOeSY1kVmwwM90yKgcvJsM/uTNXzUjTRK3Y4J0GWA2Up53pQxjmskqOusI+rwDVpnLsJEsjszvpOj5UAQrW4PuhJKjY0RYbigCrqqmCDbFuX9w6N9Sjo6Vp5MVxsMq7OwdNxNhBKDPJ8le4km8hdO8Z162+pSqUftk0hA4OjHIX2/i4avEl6Hh7MD1nbTnTbbaZV+1g6edWCnH0UASnrhulYkUNoWvpAi/bHJsfVuw5tZ8FprI5t6rCKiOXnXqU+jsn+fabDeuIt1mlN7BueebLUzAQ44npsFdSMEDCdJs= gildedguy@stellapent-cier + +# Added by Google +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC9p6XYWUumCEk8ExaoProbI6BQHu52SErSlrOzUzzCUTjRPq2vfENTL7GwG6cgsrDLBxW+u+t6qoTXRVeRc7YCXzmPofls7dy2wXwBSM1Z/AzXCFDEVxtn3Y3F6gLi7nUbMZywBmBSlNjiN1w3FbBKMMP4SYgz0O1SGIjIFBQFheZgRTJxUq9DyPQRbY4U3jcJV8968JPQELKBCvmeI2iKNLOeSY1kVmwwM90yKgcvJsM/uTNXzUjTRK3Y4J0GWA2Up53pQxjmskqOusI+rwDVpnLsJEsjszvpOj5UAQrW4PuhJKjY0RYbigCrqqmCDbFuX9w6N9Sjo6Vp5MVxsMq7OwdNxNhBKDPJ8le4km8hdO8Z162+pSqUftk0hA4OjHIX2/i4avEl6Hh7MD1nbTnTbbaZV+1g6edWCnH0UASnrhulYkUNoWvpAi/bHJsfVuw5tZ8FprI5t6rCKiOXnXqU+jsn+fabDeuIt1mlN7BueebLUzAQ44npsFdSMEDCdJs= gildedguy@stellapent-cier +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC9p6XYWUumCEk8ExaoProbI6BQHu52SErSlrOzUzzCUTjRPq2vfENTL7GwG6cgsrDLBxW+u+t6qoTXRVeRc7YCXzmPofls7dy2wXwBSM1Z/AzXCFDEVxtn3Y3F6gLi7nUbMZywBmBSlNjiN1w3FbBKMMP4SYgz0O1SGIjIFBQFheZgRTJxUq9DyPQRbY4U3jcJV8968JPQELKBCvmeI2iKNLOeSY1kVmwwM90yKgcvJsM/uTNXzUjTRK3Y4J0GWA2Up53pQxjmskqOusI+rwDVpnLsJEsjszvpOj5UAQrW4PuhJKjY0RYbigCrqqmCDbFuX9w6N9Sjo6Vp5MVxsMq7OwdNxNhBKDPJ8le4km8hdO8Z162+pSqUftk0hA4OjHIX2/i4avEl6Hh7MD1nbTnTbbaZV+1g6edWCnH0UASnrhulYkUNoWvpAi/bHJsfVuw5tZ8FprI5t6rCKiOXnXqU+jsn+fabDeuIt1mlN7BueebLUzAQ44npsFdSMEDCdJs= gildedguy@stellapent-cier +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEXuD3hJwInlcHs3wkXWAWNo8es3bPAd2e8ipjyqgGp2 ajhalili2006@andreijiroh.xyz diff --git a/.tool-versions b/.tool-versions index d65e944..8732176 100644 --- a/.tool-versions +++ b/.tool-versions @@ -2,6 +2,6 @@ nodejs 22.8.0 deno 1.46.3 direnv 2.34.0 python 3.12.3 -glab 1.46.0 +glab 1.46.1 golang 1.23.0 shellcheck 0.10.0 -- knotmirror 0.0.1