diff --git a/.bash_login b/.bash_login index 5dad7f2..c10ac90 100644 --- a/.bash_login +++ b/.bash_login @@ -11,8 +11,11 @@ fi if [[ $TERMUX ]]; then export SSH_AGENT_=todo elif command -v keychain >> /dev/null; then - export KEYCHAIN_PATH=$(command -v keychain) - eval $(keychain --agents gpg,ssh --eval) + if [[ $KEYCHAIN_LOADED != "true" ]]; then + KEYCHAIN_PATH=$(command -v keychain) + eval $(keychain --agents gpg,ssh --eval) + export KEYCHAIN_LOADED=true + fi fi # how about detecting local configs diff --git a/.config/caddyfiles/hackclub.app.Caddyfile b/.config/caddyfiles/hackclub.app.Caddyfile index d46f02b..76d00d6 100644 --- a/.config/caddyfiles/hackclub.app.Caddyfile +++ b/.config/caddyfiles/hackclub.app.Caddyfile @@ -2,14 +2,19 @@ http://ajhalili2006.hackclub.app { bind unix/.webserver.sock|777 handle * { - redir https://andreijiroh.xyz{uri} + redir https://andreijiroh.dev{uri} } handle /things/* { - redir https://cdn.andreijiroh.xyz/{uri} + redir https://cdn.andreijiroh.dev/{uri} encode gzip } } +http://leeksbot.ajhalili2006.hackclub.app { + bind unix/.leeksbot.ajhalili2006.hackclub.app.webserver.sock|777 + reverse_proxy localhost:34977 +} + # Custom domains http://hackclub.beta.lorebooks.wiki { bind unix/.hackclub.beta.lorebooks.wiki.webserver.sock|777 diff --git a/.docker/config.json b/.docker/config.json index 342e8f6..791cf16 100644 --- a/.docker/config.json +++ b/.docker/config.json @@ -10,5 +10,6 @@ "credsStore": "pass", "credHelpers": { "us-docker.pkg.dev": "gcloud" - } + }, + "currentContext": "rootless" } \ No newline at end of file diff --git a/.profile b/.profile index 42c0615..529dc78 100644 --- a/.profile +++ b/.profile @@ -21,8 +21,8 @@ export PATH="/usr/local/bin::$HOME/bin:$HOME/.local/bin:$HOME/bin${PATH:+:}$PATH mesg n 2> /dev/null || true # then import the rest -source "$HOME/.env" -source "$HOME/.config/aliases" +. "$HOME/.env" +. "$HOME/.config/aliases" export POSIX_PROFILE_SOURCED=true # how about detecting local configs @@ -30,6 +30,14 @@ if [ -f "$HOME/.config/localconfig.env" ]; then . "$HOME/.config/localconfig.env" fi +if command -v keychain >/dev/null +then + KEYCHAIN_PATH=$(command -v keychain) + eval $(keychain --agents gpg,ssh --eval) + export KEYCHAIN_LOADED=true KEYCHAIN_PATH +fi + + ########################################################################################## # Code snippets from https://git.sr.ht/~sircmpwn/dotfiles/tree/db5945a4/item/.env ########################################################################################## diff --git a/.ssh/known_hosts b/.ssh/known_hosts index 669761b..1f8507a 100644 --- a/.ssh/known_hosts +++ b/.ssh/known_hosts @@ -67,3 +67,12 @@ iapetus.uberspace.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKg+eW11Us1uWXJZ9tmU2RN |1|qIwu/vrfx2H1EwLyK2rFcPjNQ7U=|7OpfXZjmAOVKccT6zhjGYGrcASY= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk= |1|GvvqeJvK3Ux5RqbzZnyONEn3JqE=|3syL9dBAV0mGMnYEDb4ZJIgAIqM= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg= |1|nikj6/wqpOiwPBsv9y+/Alq5GfY=|qqlDJNeGr52n4OepAWjznzhzYEg= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVKciRb0jLeHXVKJxxX93cuQuXS/87YgaPoDUTn2yqg +|1|3SrKuWA9e6yor+A/OlFAQO7Ad2s=|icRLBvPNpIKZRwacNvZ47jo5zXQ= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl +|1|FahTsEcLjZP/DoPDdvK8DD37PU8=|4bF50oavdU8Lyso26FCAnrpoges= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk= +|1|3wbafOhjfjZNz3jB0pb8eoZxiE4=|YR1v2y4IclzgK75f5mYmLjivg8E= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg= +|1|SRC6RVXCFtRtvXYvIa/In8FwWxA=|Yi3f/WO3CQcxqyzlkRmsomsi9TA= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE1xHKxsllQxZ2eGDiuTX7RutKU+VQ0WJzNiZGHbZZvr +|1|l2UgJffCqwSc++BQEpaILOA3XGQ=|2UFzIJ9Y/XAJKFZsipgGM0pvyUw= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCwHpcG8fV82tgJ5USFJNJLGfFsPLhoKlOoMkCCLWgdw7c5dE0Cpuse0ohMNB3VPRpKI2Mtf/ai14d9ckiUYg4T6Vzh1XaboKbWN6uFYFvt4rhp2yDFDDaBuyvV9z2GSwU/Kftm8MbEnj08v1ODy+vrzs6+wHhNSfGKlcd2Rdhw1KLc/LSQxlx7lriszvVumu/GeRIZaI0Aa21lMhw4rnVNYpLJWyjzZUZP8f+e1+7hFydEN0witxTypK9jW4QAvOCRE+p6WF92KFEq3Cw1IQWSR2ptZxT+mjkuWcvCwXb4Xt77EHTajk6Csak+pmyXneuabea5gSnuism7Rt9Sl8w7ptcMtm6MtBAqBv1P+zMQh+SBTPaR0tWNjcnu1KEUnHaapstrv0JMSOMO4EIyFe7Ud1dIKtSK7br6Va7/OgajjW+3by8NtrPL4xqvVSybnHmXASFt0skHy3ICufg+Skp8GAzcISEgI5dL8rSmOrrVXUPz/ITb3cC6TTRjnWdB14M= +|1|z70r6VyUld7c8V8Is6SGeAPLvEg=|ziQCMrIRoIR2kbfxJOGH5erDaVI= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGxHphNAApLxeE9Tajy3PnbAQQbhW9SFjyBYyHmQGkmpzKLXtwI2PxHIt4X16othgtjXxLH7vFYF0+AnZegU0rg= +|1|zKx9nekGnCyWXtqTIDS2mLzUrsY=|FvmfKXF1sexGgG7z8S3CS4h5L2A= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBfPH3MkuJZcj0uNZrf/DChhRNLsYIsX63eHpAFbKpqw +|1|7ABgmlmFurHB3EsOyxUSG82Z70I=|35qxfDzuQ7RH5hRmJnzwdL5u8iw= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCgAnCA+mQgSCI6lRte6H/zJR6tRkj+39ScIVVwwW1lD5lVxVn6ivQtkLtVv1GHe5VPui4ua+86HQnrHPbkRxE9UruivYQdCr62Cv/he81T8rHrjyo6i0xjGKCKCBswZ/vfJCeF5MGebj6Bm5DMFrxUquhM2Dm2paXz5M73YlAAySfT6Kfge4oXZZfOFH3o3EMv6sCvVFAN4wYXiw8NbrQUF8TGoT5BrNaLcUUZEtDVTW+R2v3xFe5++ZTIXAVgPA/ABjZhJ1QKpnZABKXigWLx7OphsS/G5TUN5iSFWjj2g4Di3fTiZgcrbCEqJeFMZZlqdNkInvpoNWrbSI238d6HzgtZWIGGIUVEP2rSnD4vxjSvYrtfum+NsKe+44LlL1hzd4uuGzaxoR+9Taojow44EYmpYonIhRfDdFoKyhiiEbKEDCeJN0FMLl8xvjnNYXcjDu5v3KO039zjOOgfGyANsm69NWqbGWGw+2zYQShNDZbRk5OVeXz3sM9Iifq8rFU= +|1|5yWc/1nBIQSSMGUSGh5yTiuC/Bg=|lkp1hmjiU5JNeUIP+0P1iZhhY5U= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGKXeiYC0UsFZEKvkStas9fRjy58kPMhsdhDwECl8D75Wjcl85ig+ZKLBLUwROaJ9FcyBkcS/fFLZ1pXnj7fSy8=