diff --git a/README.md b/README.md index 0579c3b..2b628bb 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,8 @@ mv ./bin/chezmoi "$HOME/.local/bin/" chezmoi init --apply ssh://git@git.penguincoder.org:2222/penguincoder/dotfiles.git ``` -# Chezmoi without bitwarden +# Gitea token ```bash -sh -c "$(curl -fsLS chezmoi.io/get)" -mv ./bin/chezmoi "$HOME/.local/bin/" -mkdir -p ~/.config/chezmoi -echo -e "[data]\ninclude_ssh_keys=\"false\"" | tee ~/.config/chezmoi/chezmoi.toml -chezmoi init --apply ssh://git@git.penguincoder.org:2222/penguincoder/dotfiles.git +echo -e "export GITEA_TOKEN=$(bw get item gitea | jq -r '.fields[] | select(.name == "token").value')\nexport GITEA_HOST=https://git.penguincoder.org" | tee "$HOME/.config/bash/gitea.sh" ``` diff --git a/dot_config/bash/gitea.sh.tmpl b/dot_config/bash/gitea.sh.tmpl deleted file mode 100644 index f55ffa1..0000000 --- a/dot_config/bash/gitea.sh.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -export GITEA_ACCESS_TOKEN={{- (bitwardenFields "item" "Gitea").token.value }} -export GITEA_HOST=https://git.penguincoder.org diff --git a/private_dot_ssh/private_authorized_keys.tmpl b/private_dot_ssh/private_authorized_keys.tmpl deleted file mode 100644 index fadb7b7..0000000 --- a/private_dot_ssh/private_authorized_keys.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -{{- if ne .include_ssh_keys "true" }} -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID3M8FYKBjXXUQpk5+bQXe1zwkONtfbifRnTr+dkNwHt selfhosted@penguincoder.org -{{- end }} diff --git a/private_dot_ssh/private_config.tmpl b/private_dot_ssh/private_config.tmpl deleted file mode 100644 index 2ad4915..0000000 --- a/private_dot_ssh/private_config.tmpl +++ /dev/null @@ -1,40 +0,0 @@ -Host * - ForwardAgent yes - AddKeysToAgent yes - -Host penguincoder.org - Port 2223 - IdentityFile ~/.ssh/selfhosted - -Host git.penguincoder.org - Port 2222 - User git - IdentityFile ~/.ssh/gitea - ProxyCommand none - -Host helium helium.penguincoder.org - HostName 192.168.1.50 - -Host potassium potassium.penguincoder.org - HostName 192.168.1.60 - ProxyCommand none - -Host mailhog mailhog.penguincoder.org - HostName 192.168.1.59 - -Host gitea gitea.penguincoder.org - HostName 192.168.1.61 - -Host nextcloud nextcloud.penguincoder.org - HostName 192.168.1.62 - -Host bitwarden bitwarden.penguincoder.org - HostName 192.168.1.63 - -Host *.penguincoder.org !git.penguincoder.org - IdentityFile ~/.ssh/selfhosted - ProxyCommand ssh -W %h:%p penguincoder.org -p 2223 - -Host github.com - User git - IdentityFile ~/.ssh/github diff --git a/private_dot_ssh/private_gitea.pub.tmpl b/private_dot_ssh/private_gitea.pub.tmpl deleted file mode 100644 index 4905faa..0000000 --- a/private_dot_ssh/private_gitea.pub.tmpl +++ /dev/null @@ -1 +0,0 @@ -{{- (bitwardenAttachment "gitea.pub" "selfhosted-ssh-keys") -}} diff --git a/private_dot_ssh/private_gitea.tmpl b/private_dot_ssh/private_gitea.tmpl deleted file mode 100644 index d787c86..0000000 --- a/private_dot_ssh/private_gitea.tmpl +++ /dev/null @@ -1 +0,0 @@ -{{- (bitwardenAttachment "gitea" "selfhosted-ssh-keys") -}} diff --git a/private_dot_ssh/private_github.pub.tmpl b/private_dot_ssh/private_github.pub.tmpl deleted file mode 100644 index cad3f66..0000000 --- a/private_dot_ssh/private_github.pub.tmpl +++ /dev/null @@ -1 +0,0 @@ -{{- (bitwardenAttachment "github.pub" "selfhosted-ssh-keys") -}} diff --git a/private_dot_ssh/private_github.tmpl b/private_dot_ssh/private_github.tmpl deleted file mode 100644 index a9b8f8b..0000000 --- a/private_dot_ssh/private_github.tmpl +++ /dev/null @@ -1 +0,0 @@ -{{- (bitwardenAttachment "github" "selfhosted-ssh-keys") -}} diff --git a/private_dot_ssh/private_selfhosted.pub.tmpl b/private_dot_ssh/private_selfhosted.pub.tmpl deleted file mode 100644 index bfc83cd..0000000 --- a/private_dot_ssh/private_selfhosted.pub.tmpl +++ /dev/null @@ -1 +0,0 @@ -{{- (bitwardenAttachment "selfhosted.pub" "selfhosted-ssh-keys") -}} diff --git a/private_dot_ssh/private_selfhosted.tmpl b/private_dot_ssh/private_selfhosted.tmpl deleted file mode 100644 index ae65de9..0000000 --- a/private_dot_ssh/private_selfhosted.tmpl +++ /dev/null @@ -1 +0,0 @@ -{{- (bitwardenAttachment "selfhosted" "selfhosted-ssh-keys") -}}