From 1c48307f53d9c5bb0b461b8b0eb0b7a768424d78 Mon Sep 17 00:00:00 2001 From: Tine Jozelj Date: Sat, 20 Mar 2021 23:36:25 +0100 Subject: [PATCH] just dotfiles are enough --- .cobra.yaml | 2 - .gitconfig | 1 + .github/workflows/packages.yaml | 280 ----------------------- .github/workflows/workspace-node.yaml | 77 ------- Dockerfile.golang | 76 ------- Dockerfile.node | 76 ------- Makefile | 26 --- README.md | 52 +---- {dotfiles/bin => bin}/colorband | 0 {dotfiles/bin => bin}/colortest | 0 cmd/root.go | 51 ----- cmd/template.go | 38 ---- docker-compose.yml | 9 - dotfiles/nvim/Makefile | 27 --- dotfiles/nvim/config/vimrc | 58 ----- dotfiles/nvim/init.vim | 1 - dotfiles/nvim/vimrc | 5 - dotfiles/ssh/authorized_keys | 3 - dotfiles/zsh/zshrc | 12 - {dotfiles/git => git}/gitconfig | 2 +- go.mod | 9 - go.sum | 313 -------------------------- install.sh | 46 ++++ main.go | 7 - packages/Dockerfile.kubectl | 20 -- packages/Dockerfile.mosh | 28 --- packages/Dockerfile.rust | 35 --- packages/Dockerfile.starship | 24 -- packages/README.md | 9 - packages/mosh/APKBUILD | 81 ------- ssh/authorized_keys | 3 + starship/starship.toml | 2 + templates/actions/packages.yaml.tmpl | 64 ------ templates/actions/workspace.yaml.tmpl | 77 ------- {dotfiles/tmux => tmux}/tmux.conf | 0 vim/coc-settings.json | 18 ++ vim/vimrc | 88 ++++++++ workspace.toml | 47 ---- zsh/zshrc | 34 +++ 39 files changed, 195 insertions(+), 1506 deletions(-) delete mode 100644 .cobra.yaml create mode 120000 .gitconfig delete mode 100644 .github/workflows/packages.yaml delete mode 100644 .github/workflows/workspace-node.yaml delete mode 100644 Dockerfile.golang delete mode 100644 Dockerfile.node delete mode 100644 Makefile rename {dotfiles/bin => bin}/colorband (100%) rename {dotfiles/bin => bin}/colortest (100%) delete mode 100644 cmd/root.go delete mode 100644 cmd/template.go delete mode 100644 docker-compose.yml delete mode 100644 dotfiles/nvim/Makefile delete mode 100644 dotfiles/nvim/config/vimrc delete mode 100644 dotfiles/nvim/init.vim delete mode 100644 dotfiles/nvim/vimrc delete mode 100644 dotfiles/ssh/authorized_keys delete mode 100644 dotfiles/zsh/zshrc rename {dotfiles/git => git}/gitconfig (71%) delete mode 100644 go.mod delete mode 100644 go.sum create mode 100755 install.sh delete mode 100644 main.go delete mode 100644 packages/Dockerfile.kubectl delete mode 100644 packages/Dockerfile.mosh delete mode 100644 packages/Dockerfile.rust delete mode 100644 packages/Dockerfile.starship delete mode 100644 packages/README.md delete mode 100644 packages/mosh/APKBUILD create mode 100644 ssh/authorized_keys create mode 100644 starship/starship.toml delete mode 100644 templates/actions/packages.yaml.tmpl delete mode 100644 templates/actions/workspace.yaml.tmpl rename {dotfiles/tmux => tmux}/tmux.conf (100%) create mode 100644 vim/coc-settings.json create mode 100644 vim/vimrc delete mode 100644 workspace.toml create mode 100644 zsh/zshrc diff --git a/.cobra.yaml b/.cobra.yaml deleted file mode 100644 index cedebd3..0000000 --- a/.cobra.yaml +++ /dev/null @@ -1,2 +0,0 @@ -author: Tine Jozelj -license: apache diff --git a/.gitconfig b/.gitconfig new file mode 120000 index 0000000..92d89b6 --- /dev/null +++ b/.gitconfig @@ -0,0 +1 @@ +/home/tine/git/gitconfig \ No newline at end of file diff --git a/.github/workflows/packages.yaml b/.github/workflows/packages.yaml deleted file mode 100644 index a803624..0000000 --- a/.github/workflows/packages.yaml +++ /dev/null @@ -1,280 +0,0 @@ -name: packages - -on: - pull_request: - branches: main - push: - branches: main - -jobs: - - kubectl: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Prepare - id: prepare - run: | - DOCKER_IMAGE=ghcr.io/mentos1386/kubectl - DOCKER_PLATFORMS=linux/amd64,linux/arm64 - VERSION=1.20.0 - - TAGS="--tag ${DOCKER_IMAGE}:${VERSION} --tag ${DOCKER_IMAGE}:latest" - - echo ::set-output name=docker_image::${DOCKER_IMAGE} - echo ::set-output name=version::${VERSION} - echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \ - --build-arg REPOSITORY=ghcr.io/mentos1386 \ - --build-arg VERSION=${VERSION} \ - --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \ - --build-arg VCS_REF=${GITHUB_SHA::8} \ - --cache-from "type=local,src=/tmp/.buildx-cache" \ - --cache-to "type=local,dest=/tmp/.buildx-cache" \ - ${TAGS} --file ./packages/Dockerfile.kubectl . - - name: Cache Docker layers - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-kubectl-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-kubectl- - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Docker Buildx (build) - run: | - docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }} - - name: Login to Github Registry - if: success() && github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.CR_PAT }} - - name: Docker Buildx (push) - if: success() && github.event_name != 'pull_request' - run: | - docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} - - name: Inspect image - if: always() && github.event_name != 'pull_request' - run: | - docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }} - - starship: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Prepare - id: prepare - run: | - DOCKER_IMAGE=ghcr.io/mentos1386/starship - DOCKER_PLATFORMS=linux/amd64,linux/arm64 - VERSION=0.47.0 - - TAGS="--tag ${DOCKER_IMAGE}:${VERSION} --tag ${DOCKER_IMAGE}:latest" - - echo ::set-output name=docker_image::${DOCKER_IMAGE} - echo ::set-output name=version::${VERSION} - echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \ - --build-arg REPOSITORY=ghcr.io/mentos1386 \ - --build-arg VERSION=${VERSION} \ - --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \ - --build-arg VCS_REF=${GITHUB_SHA::8} \ - --cache-from "type=local,src=/tmp/.buildx-cache" \ - --cache-to "type=local,dest=/tmp/.buildx-cache" \ - ${TAGS} --file ./packages/Dockerfile.starship . - - name: Cache Docker layers - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-starship-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-starship- - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Docker Buildx (build) - run: | - docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }} - - name: Login to Github Registry - if: success() && github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.CR_PAT }} - - name: Docker Buildx (push) - if: success() && github.event_name != 'pull_request' - run: | - docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} - - name: Inspect image - if: always() && github.event_name != 'pull_request' - run: | - docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }} - - glow: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Prepare - id: prepare - run: | - DOCKER_IMAGE=ghcr.io/mentos1386/glow - DOCKER_PLATFORMS=linux/amd64,linux/arm64 - VERSION=1.3.0 - - TAGS="--tag ${DOCKER_IMAGE}:${VERSION} --tag ${DOCKER_IMAGE}:latest" - - echo ::set-output name=docker_image::${DOCKER_IMAGE} - echo ::set-output name=version::${VERSION} - echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \ - --build-arg REPOSITORY=ghcr.io/mentos1386 \ - --build-arg VERSION=${VERSION} \ - --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \ - --build-arg VCS_REF=${GITHUB_SHA::8} \ - --cache-from "type=local,src=/tmp/.buildx-cache" \ - --cache-to "type=local,dest=/tmp/.buildx-cache" \ - ${TAGS} --file ./packages/Dockerfile.glow . - - name: Cache Docker layers - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-glow-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-glow- - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Docker Buildx (build) - run: | - docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }} - - name: Login to Github Registry - if: success() && github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.CR_PAT }} - - name: Docker Buildx (push) - if: success() && github.event_name != 'pull_request' - run: | - docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} - - name: Inspect image - if: always() && github.event_name != 'pull_request' - run: | - docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }} - - mosh: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Prepare - id: prepare - run: | - DOCKER_IMAGE=ghcr.io/mentos1386/mosh - DOCKER_PLATFORMS=linux/amd64,linux/arm64 - VERSION=master - - TAGS="--tag ${DOCKER_IMAGE}:${VERSION} --tag ${DOCKER_IMAGE}:latest" - - echo ::set-output name=docker_image::${DOCKER_IMAGE} - echo ::set-output name=version::${VERSION} - echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \ - --build-arg REPOSITORY=ghcr.io/mentos1386 \ - --build-arg VERSION=${VERSION} \ - --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \ - --build-arg VCS_REF=${GITHUB_SHA::8} \ - --cache-from "type=local,src=/tmp/.buildx-cache" \ - --cache-to "type=local,dest=/tmp/.buildx-cache" \ - ${TAGS} --file ./packages/Dockerfile.mosh . - - name: Cache Docker layers - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-mosh-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-mosh- - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Docker Buildx (build) - run: | - docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }} - - name: Login to Github Registry - if: success() && github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.CR_PAT }} - - name: Docker Buildx (push) - if: success() && github.event_name != 'pull_request' - run: | - docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} - - name: Inspect image - if: always() && github.event_name != 'pull_request' - run: | - docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }} - - rust: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Prepare - id: prepare - run: | - DOCKER_IMAGE=ghcr.io/mentos1386/rust - DOCKER_PLATFORMS=linux/amd64,linux/arm64 - VERSION=1.48.0 - - TAGS="--tag ${DOCKER_IMAGE}:${VERSION} --tag ${DOCKER_IMAGE}:latest" - - echo ::set-output name=docker_image::${DOCKER_IMAGE} - echo ::set-output name=version::${VERSION} - echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \ - --build-arg REPOSITORY=ghcr.io/mentos1386 \ - --build-arg VERSION=${VERSION} \ - --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \ - --build-arg VCS_REF=${GITHUB_SHA::8} \ - --cache-from "type=local,src=/tmp/.buildx-cache" \ - --cache-to "type=local,dest=/tmp/.buildx-cache" \ - ${TAGS} --file ./packages/Dockerfile.rust . - - name: Cache Docker layers - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-rust-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-rust- - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Docker Buildx (build) - run: | - docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }} - - name: Login to Github Registry - if: success() && github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.CR_PAT }} - - name: Docker Buildx (push) - if: success() && github.event_name != 'pull_request' - run: | - docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} - - name: Inspect image - if: always() && github.event_name != 'pull_request' - run: | - docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }} - diff --git a/.github/workflows/workspace-node.yaml b/.github/workflows/workspace-node.yaml deleted file mode 100644 index fb7b123..0000000 --- a/.github/workflows/workspace-node.yaml +++ /dev/null @@ -1,77 +0,0 @@ -name: workspace-node - -on: - schedule: - - cron: '0 6 * * *' - pull_request: - branches: main - push: - branches: main - tags: - - v* - -jobs: - workspace-node: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Prepare - id: prepare - run: | - DOCKER_IMAGE=ghcr.io/mentos1386/workspace-node - DOCKER_PLATFORMS=linux/amd64,linux/arm64 - VERSION=edge - - if [[ $GITHUB_REF == refs/tags/* ]]; then - VERSION=${GITHUB_REF#refs/tags/v} - fi - if [ "${{ github.event_name }}" = "schedule" ]; then - VERSION=nightly - fi - - TAGS="--tag ${DOCKER_IMAGE}:${VERSION}" - if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - TAGS="$TAGS --tag ${DOCKER_IMAGE}:latest" - fi - - echo ::set-output name=docker_image::${DOCKER_IMAGE} - echo ::set-output name=version::${VERSION} - echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \ - --build-arg REPOSITORY=ghcr.io/mentos1386 \ - --build-arg VERSION=${VERSION} \ - --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \ - --build-arg VCS_REF=${GITHUB_SHA::8} \ - --cache-from "type=local,src=/tmp/.buildx-cache" \ - --cache-to "type=local,dest=/tmp/.buildx-cache" \ - ${TAGS} --file ./Dockerfile.node . - - name: Cache Docker layers - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-workspace-node-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-workspace-node- - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Docker Buildx (build) - run: | - docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }} - - name: Login to Github Registry - if: success() && github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.CR_PAT }} - - name: Docker Buildx (push) - if: success() && github.event_name != 'pull_request' - run: | - docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} - - name: Inspect image - if: always() && github.event_name != 'pull_request' - run: | - docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }} - diff --git a/Dockerfile.golang b/Dockerfile.golang deleted file mode 100644 index e941320..0000000 --- a/Dockerfile.golang +++ /dev/null @@ -1,76 +0,0 @@ -# vim: set fenc=utf-8 ts=2 sw=2 sts=2 et ft=Dockerfile : -FROM golang:1.16-alpine - -LABEL maintainer="Tine Jozelj " -LABEL org.opencontainers.image.source https://github.com/mentos1386/workspace - -ARG SSH_USER="tine" -ARG SSH_PASSWORD="tine" - -RUN apk --update --no-cache add bash - -SHELL ["bash", "-c"] - -RUN apk --update --no-cache add \ - git \ - mosh \ - neovim \ - openssh-server \ - tmux \ - zsh \ - gcc \ - libc-dev \i -&& adduser -D "${SSH_USER}" -s /bin/zsh \ -&& echo -e "${SSH_PASSWORD}\n${SSH_PASSWORD}" | passwd "${SSH_USER}" \ -&& ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa \ -&& ssh-keygen -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa \ -&& ssh-keygen -f /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa \ -&& ssh-keygen -f /etc/ssh/ssh_host_ed25519_key -N '' -t ed25519 \ -&& chown root:root /etc/ssh \ -&& chmod 0600 /etc/ssh/* \ -&& mkdir -p /root/.ssh \ -&& chmod 0700 /root/.ssh \ -&& rm -rf /var/cache/apk/* \ - /tmp/* \ - /var/tmp/* - -# Configure SSH -RUN echo "PubkeyAuthentication yes" >> /etc/ssh/sshd_config \ -&& echo "PasswordAuthentication no" >> /etc/ssh/sshd_config \ -&& echo "X11Forwarding no" >> /etc/ssh/sshd_config - -# install tools -COPY --from=ghcr.io/mentos1386/starship:0.47.0 /usr/local/bin/starship /usr/local/bin/starship -COPY --from=ghcr.io/mentos1386/kubectl:1.20.0 /usr/local/bin/kubectl /usr/local/bin/kubectl -COPY --from=ghcr.io/mentos1386/mosh:master /usr/bin/mosh /usr/bin/mosh -COPY --from=ghcr.io/mentos1386/mosh:master /usr/bin/mosh-server /usr/bin/mosh-server -COPY --from=ghcr.io/mentos1386/mosh:master /usr/bin/mosh-client /usr/bin/mosh-client - -# Create .dotfiles -COPY --chown=${SSH_USER}:${SSH_USER} dotfiles /home/${SSH_USER}/.dotfiles - -# User Configuration -USER "${SSH_USER}" - -# GIT -RUN ln -s /home/${SSH_USER}/.dotfiles/git/gitconfig /home/${SSH_USER}/.gitconfig -# ZSH -RUN ln -s /home/${SSH_USER}/.dotfiles/zsh/zshrc /home/${SSH_USER}/.zshrc -# TMUX -RUN ln -s /home/${SSH_USER}/.dotfiles/tmux/tmux.conf /home/${SSH_USER}/.tmux.conf -# VIM -RUN mkdir -p "/home/${SSH_USER}/.config" \ -&& ln -s "/home/${SSH_USER}/.dotfiles/nvim" "/home/${SSH_USER}/.config/nvim" \ -&& ln -s "/home/${SSH_USER}/.dotfiles/nvim/vimrc" "/home/${SSH_USER}/.vimrc" \ -&& git clone --depth 1 https://github.com/Shougo/dein.vim "/home/${SSH_USER}/.cache/vim/dein/repos/github.com/Shougo/dein.vim" \ -&& nvim -V1 -es -i NONE -N --noplugin -u "/home/${SSH_USER}/.config/nvim/config/vimrc" \ - -c "try | call dein#clear_state() | call dein#update() | finally | messages | qall! | endtry" -# SSH -RUN mkdir -p /home/${SSH_USER}/.ssh \ -&& ln -s /home/${SSH_USER}/.dotfiles/ssh/authorized_keys /home/${SSH_USER}/.ssh/authorized_keys - -USER root -EXPOSE 22/tcp -EXPOSE 22022/udp -CMD ["/usr/sbin/sshd", "-D", "-e", "-f", "/etc/ssh/sshd_config"] - diff --git a/Dockerfile.node b/Dockerfile.node deleted file mode 100644 index fd435be..0000000 --- a/Dockerfile.node +++ /dev/null @@ -1,76 +0,0 @@ -# vim: set fenc=utf-8 ts=2 sw=2 sts=2 et ft=Dockerfile : -FROM node:15-alpine - -LABEL maintainer="Tine Jozelj " -LABEL org.opencontainers.image.source https://github.com/mentos1386/workspace - -ARG SSH_USER="tine" -ARG SSH_PASSWORD="tine" - -RUN apk --update --no-cache add bash - -SHELL ["bash", "-c"] - -RUN apk --update --no-cache add \ - git \ - mosh \ - neovim \ - openssh-server \ - tmux \ - zsh \ - gcc \ - libc-dev \ -&& adduser -D "${SSH_USER}" -s /bin/zsh \ -&& echo -e "${SSH_PASSWORD}\n${SSH_PASSWORD}" | passwd "${SSH_USER}" \ -&& ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa \ -&& ssh-keygen -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa \ -&& ssh-keygen -f /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa \ -&& ssh-keygen -f /etc/ssh/ssh_host_ed25519_key -N '' -t ed25519 \ -&& chown root:root /etc/ssh \ -&& chmod 0600 /etc/ssh/* \ -&& mkdir -p /root/.ssh \ -&& chmod 0700 /root/.ssh \ -&& rm -rf /var/cache/apk/* \ - /tmp/* \ - /var/tmp/* - -# Configure SSH -RUN echo "PubkeyAuthentication yes" >> /etc/ssh/sshd_config \ -&& echo "PasswordAuthentication no" >> /etc/ssh/sshd_config \ -&& echo "X11Forwarding no" >> /etc/ssh/sshd_config - -# install tools -COPY --from=ghcr.io/mentos1386/starship:0.47.0 /usr/local/bin/starship /usr/local/bin/starship -COPY --from=ghcr.io/mentos1386/kubectl:1.20.0 /usr/local/bin/kubectl /usr/local/bin/kubectl -COPY --from=ghcr.io/mentos1386/mosh:master /usr/bin/mosh /usr/bin/mosh -COPY --from=ghcr.io/mentos1386/mosh:master /usr/bin/mosh-server /usr/bin/mosh-server -COPY --from=ghcr.io/mentos1386/mosh:master /usr/bin/mosh-client /usr/bin/mosh-client - -# Create .dotfiles -COPY --chown=${SSH_USER}:${SSH_USER} dotfiles /home/${SSH_USER}/.dotfiles - -# User Configuration -USER "${SSH_USER}" - -# GIT -RUN ln -s /home/${SSH_USER}/.dotfiles/git/gitconfig /home/${SSH_USER}/.gitconfig -# ZSH -RUN ln -s /home/${SSH_USER}/.dotfiles/zsh/zshrc /home/${SSH_USER}/.zshrc -# TMUX -RUN ln -s /home/${SSH_USER}/.dotfiles/tmux/tmux.conf /home/${SSH_USER}/.tmux.conf -# VIM -RUN mkdir -p "/home/${SSH_USER}/.config" \ -&& ln -s "/home/${SSH_USER}/.dotfiles/nvim" "/home/${SSH_USER}/.config/nvim" \ -&& ln -s "/home/${SSH_USER}/.dotfiles/nvim/vimrc" "/home/${SSH_USER}/.vimrc" \ -&& git clone --depth 1 https://github.com/Shougo/dein.vim "/home/${SSH_USER}/.cache/vim/dein/repos/github.com/Shougo/dein.vim" \ -&& nvim -V1 -es -i NONE -N --noplugin -u "/home/${SSH_USER}/.config/nvim/config/vimrc" \ - -c "try | call dein#clear_state() | call dein#update() | finally | messages | qall! | endtry" -# SSH -RUN mkdir -p /home/${SSH_USER}/.ssh \ -&& ln -s /home/${SSH_USER}/.dotfiles/ssh/authorized_keys /home/${SSH_USER}/.ssh/authorized_keys - -USER root -EXPOSE 22/tcp -EXPOSE 22022/udp -CMD ["/usr/sbin/sshd", "-D", "-e", "-f", "/etc/ssh/sshd_config"] - diff --git a/Makefile b/Makefile deleted file mode 100644 index 044d190..0000000 --- a/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -REGISTRY=ghcr.io/mentos1386 -PROGRESS=plain - -build: - @docker buildx build --load -t ${REGISTRY}/workspace:edge -f Dockerfile . - -build-package-starship: - @docker buildx build --load -t ${REGISTRY}/starship:0.47.0 -f packages/Dockerfile.starship . - -build-package-kubectl: - @docker buildx build --load -t ${REGISTRY}/kubectl:1.20.0 -f packages/Dockerfile.kubectl . - -build-package-mosh: - @docker buildx build --progress ${PROGRESS} --load -t ${REGISTRY}/mosh:master -f packages/Dockerfile.mosh . - -build-packages: build-package-kubectl build-package-starship build-package-mosh - -template: - @go run ./main.go template package-action > .github/workflows/packages.yaml - @go run ./main.go template workspace-node-action > .github/workflows/workspace-node.yaml - -pull-node: - @docker pull ghcr.io/mentos1386/workspace-node:edge - -run-node: - @docker run -it --rm --workdir /home/tine --user tine ${REGISTRY}/workspace-node:edge zsh diff --git a/README.md b/README.md index 72cf805..1fd1645 100644 --- a/README.md +++ b/README.md @@ -1,51 +1,3 @@ -![Workspace](https://github.com/mentos1386/workspace/workflows/workspace/badge.svg) -![Packages](https://github.com/mentos1386/workspace/workflows/packages/badge.svg) +# My workspace configuration (aka. dotfiles) -# my workspace as a docker container - -- [Introduction](#introduction) -- [Clipboard](#clipboard) -- [References](#references) - -# TODO: - -- [x] Multiarch build -- [x] Github actions -- [ ] Add the tools i use - - zsh, spaceship-prompt, git -- [ ] Add the configurations i have - - zsh, git, nextcloud - -# Introduction - -[blink shell](https://blink.sh) is an excellent minimalistic SSH and mosh client -for apple mobile devices. - -For some folks, like me that's a tool #1, I spent most of the time in terminal -(also I work mostly from the iPad pro). - -In this repo, i'm trying to create a full development/living workspace inside docker containers. - -One of the requirements is that docker image produced should work on arm-based devices as well as on amd64. To allow for same experiance if you are on RaspberryPi or on your VPS. - -## Why so complex - -First i planed to just create a Dockerfile and build it using buildx multiarch capabilities. -But i soon run in to issue that tools i use aren't available for ARM. -As a solution, i started compiling them myself which resulted in a bunch of Dockerfiles and -duplicated github actions. To solve this, i created "workspace" cli tool to manage this. - -Yeah i know, oeverengineering. But i want to have a simple way of bumping and adding new packages. - -# Clipboard - -Paste from iPad to blink works out of the box, but in opposite it depends. If we -copy wrapped lines, usually they breaks. I don't mind apps with menus and -interfaces (i.e. `mc`, `tmux` with window splits, editors, etc.) - -As for now, the perfect solution is to use OSC52 escape codes, these works well -with ssh and recent `mosh`. - -# References - -[vim-oscyank plugin](https://github.com/ojroques/vim-oscyank) +Hi! diff --git a/dotfiles/bin/colorband b/bin/colorband similarity index 100% rename from dotfiles/bin/colorband rename to bin/colorband diff --git a/dotfiles/bin/colortest b/bin/colortest similarity index 100% rename from dotfiles/bin/colortest rename to bin/colortest diff --git a/cmd/root.go b/cmd/root.go deleted file mode 100644 index 073d0a6..0000000 --- a/cmd/root.go +++ /dev/null @@ -1,51 +0,0 @@ -package cmd - -import ( - "fmt" - "github.com/spf13/cobra" - "os" - - "github.com/spf13/viper" -) - -var cfgFile string - -// rootCmd represents the base command when called without any subcommands -var rootCmd = &cobra.Command{ - Use: "workspace", - Short: "Tool to manage mentos1386/workspace repository", -} - -// Execute adds all child commands to the root command and sets flags appropriately. -// This is called by main.main(). It only needs to happen once to the rootCmd. -func Execute() { - if err := rootCmd.Execute(); err != nil { - fmt.Println(err) - os.Exit(1) - } -} - -func init() { - cobra.OnInitialize(initConfig) - rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default workspace.toml)") -} - -// initConfig reads in config file and ENV variables if set. -func initConfig() { - if cfgFile != "" { - // Use config file from the flag. - viper.SetConfigFile(cfgFile) - } else { - viper.SetConfigType("toml") - viper.AddConfigPath(".") - viper.SetConfigName("workspace") - } - - viper.AutomaticEnv() // read in environment variables that match - - err := viper.ReadInConfig() - if err != nil { - panic(fmt.Errorf("Fatal error reading config file: %s \n", err)) - } -} - diff --git a/cmd/template.go b/cmd/template.go deleted file mode 100644 index d6e7034..0000000 --- a/cmd/template.go +++ /dev/null @@ -1,38 +0,0 @@ -package cmd - -import ( - "fmt" - "os" - "path" - "text/template" - - "github.com/spf13/cobra" - "github.com/spf13/viper" -) - -// templateCmd represents the template command -var templateCmd = &cobra.Command{ - Use: "template", - Short: "Template a specific file as described in config", - Args: cobra.ExactArgs(1), - Run: func(cmd *cobra.Command, args []string) { - templateName := args[0] - templateFile := viper.GetString(fmt.Sprintf("templates.%s.template", templateName)) - templateVars := viper.Get(fmt.Sprintf("templates.%s.vars", templateName)) - - workspaceTemplate := template.New(path.Base(templateFile)) - workspaceTemplate = workspaceTemplate.Delims("[[[", "]]]") - - tmpl:= template.Must(workspaceTemplate.ParseFiles(templateFile)) - - err := tmpl.Execute(os.Stdout, templateVars) - if err != nil { - panic(fmt.Errorf("Failed %s", err)) - } - }, -} - -func init() { - rootCmd.AddCommand(templateCmd) -} - diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 9f42dfc..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: "3" - -services: - workspace: - image: ghcr.io/mentos1386/workspace:edge - ports: - - 0.0.0.0:22022:22/tcp - - 0.0.0.0:22022:22022/udp - diff --git a/dotfiles/nvim/Makefile b/dotfiles/nvim/Makefile deleted file mode 100644 index 49a18ad..0000000 --- a/dotfiles/nvim/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -SHELL = /bin/bash -vim := $(if $(shell which nvim),nvim,$(shell which vim)) -vim_version := '${shell $(vim) --version}' -XDG_CACHE_HOME ?= $(HOME)/.cache - -default: install - -install: create-dirs install-dein update-plugins - -update: update-plugins - -upgrade: update - -create-dirs: - @mkdir -vp "$(XDG_CACHE_HOME)/vim/"{backup,session,swap,tags,undo} - -install-dein: - @git clone https://github.com/Shougo/dein.vim ~/.cache/vim/dein/repos/github.com/Shougo/dein.vim - -update-plugins: - $(vim) -V1 -es -i NONE -N --noplugin -u config/vimrc \ - -c "try | call dein#clear_state() | call dein#update() | finally | messages | qall! | endtry" - -uninstall: - rm -rf "$(XDG_CACHE_HOME)/vim" - -.PHONY: install create-dirs update-plugins uninstall diff --git a/dotfiles/nvim/config/vimrc b/dotfiles/nvim/config/vimrc deleted file mode 100644 index ece4678..0000000 --- a/dotfiles/nvim/config/vimrc +++ /dev/null @@ -1,58 +0,0 @@ -set nocompatible - -let s:dein_plugin_dir = '~/.cache/vim/dein' -let s:dein_install_dir = s:dein_plugin_dir . '/repos/github.com/Shougo/dein.vim' -execute 'set runtimepath+=' . expand(s:dein_install_dir) - -if has('vim_starting') - if dein#load_state(s:dein_plugin_dir) - let g:dein#auto_recache = 1 - let g:dein#install_max_processes = 12 - call dein#begin(s:dein_plugin_dir) - call dein#add(s:dein_install_dir) - if ! has('nvim') - call dein#add('roxma/nvim-yarp', { 'depends': 'vim-hug-neovim-rpc' }) - call dein#add('roxma/vim-hug-neovim-rpc') - endif - call dein#add('Shougo/deoplete.nvim') - - """ With nvim we should use ojroques's repo, details: https://github.com/fcpg/vim-osc52/issues/6 - call dein#add('ojroques/vim-oscyank') - " call dein#add('fcpg/vim-osc52') - - call dein#end() - call dein#save_state() - endif -endif - -filetype plugin indent on -syntax enable - -if ! has('nvim') - set t_Co=256 - " Set Vim-specific sequences for RGB colors - " Fixes 'termguicolors' usage in vim+tmux - " :h xterm-true-color - let &t_8f = "\[38;2;%lu;%lu;%lum" - let &t_8b = "\[48;2;%lu;%lu;%lum" -endif - -" Enables 24-bit RGB color in the terminal -if has('termguicolors') - if empty($COLORTERM) || $COLORTERM =~# 'truecolor\|24bit' - set termguicolors - endif -endif - -" Use system clipboard to get buffers synced between TMUX and VIM -if has('clipboard') && has('vim_starting') - " set clipboard& clipboard+=unnamedplus - set clipboard& clipboard^=unnamed,unnamedplus -endif - -if exists('##TextYankPost') - augroup BlinkClipboardIntegration - autocmd! - autocmd TextYankPost * silent! if v:event.operator ==# 'y' | call YankOSC52(join(v:event["regcontents"],"\n")) | endif - augroup END -endif diff --git a/dotfiles/nvim/init.vim b/dotfiles/nvim/init.vim deleted file mode 100644 index 7e2286c..0000000 --- a/dotfiles/nvim/init.vim +++ /dev/null @@ -1 +0,0 @@ -execute 'source' fnamemodify(expand(''), ':h').'/config/vimrc' diff --git a/dotfiles/nvim/vimrc b/dotfiles/nvim/vimrc deleted file mode 100644 index e102e27..0000000 --- a/dotfiles/nvim/vimrc +++ /dev/null @@ -1,5 +0,0 @@ -" Note: Skip initialization for vim-tiny or vim-small. -if 1 - " execute 'source' fnamemodify(expand(''), ':h').'/config/vimrc' - source ~/.config/nvim/config/vimrc -endif diff --git a/dotfiles/ssh/authorized_keys b/dotfiles/ssh/authorized_keys deleted file mode 100644 index 6bf20f3..0000000 --- a/dotfiles/ssh/authorized_keys +++ /dev/null @@ -1,3 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKNvpIu5jb/o+JEivC+/FoNYM4HQ1JOcXV2MnkyosI05 tine+iphone@tjo.cloud -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHrX2u82zWpVhjWng1cR4Kj76SajLJQ/Nmwd2GPaJpt1 tine+ipad@tjo.cloud - diff --git a/dotfiles/zsh/zshrc b/dotfiles/zsh/zshrc deleted file mode 100644 index d16450f..0000000 --- a/dotfiles/zsh/zshrc +++ /dev/null @@ -1,12 +0,0 @@ -# Always start tmux if it isn't yet. -#if [ -z "$TMUX" ] -#then -# tmux attach -t default || tmux new -s default -#fi - -# NVM -source /usr/share/nvm/init-nvm.sh - -# Starship -eval "$(starship init zsh)" - diff --git a/dotfiles/git/gitconfig b/git/gitconfig similarity index 71% rename from dotfiles/git/gitconfig rename to git/gitconfig index f27d4fb..0dc3dfe 100644 --- a/dotfiles/git/gitconfig +++ b/git/gitconfig @@ -1,7 +1,7 @@ [user] name = Tine Jozelj email = tine@tjo.space - signingkey = 3818B74E3830D7CF + #signingkey = 3818B74E3830D7CF [commit] gpgsign = true diff --git a/go.mod b/go.mod deleted file mode 100644 index 62de4c0..0000000 --- a/go.mod +++ /dev/null @@ -1,9 +0,0 @@ -module github.com/mentos1386/workspace - -go 1.15 - -require ( - github.com/mitchellh/go-homedir v1.1.0 - github.com/spf13/cobra v1.1.1 - github.com/spf13/viper v1.7.1 -) diff --git a/go.sum b/go.sum deleted file mode 100644 index e26946c..0000000 --- a/go.sum +++ /dev/null @@ -1,313 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= -github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 h1:HyfiK1WMnHj5FXFXatD+Qs1A/xC2Run6RzeW1SyHxpc= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/install.sh b/install.sh new file mode 100755 index 0000000..baac1e6 --- /dev/null +++ b/install.sh @@ -0,0 +1,46 @@ +#/bin/bash + +REPO_DIR=$(dirname $(readlink -f $0)) +HOME_DIR=${HOME} + +echo "REPO_DIR=${REPO_DIR}" +echo "HOME_DIR=${HOME_DIR}" + +workspace_backup() { + mv $HOME_DIR/$1 $HOME_DIR/$1-old 2>/dev/null || true +} + +workspace_link() { + ln -s $REPO_DIR/$1 $HOME_DIR/$2 || true +} + +echo "== Copying configuration files..." +# GIT +workspace_backup .gitconfig +workspace_link git/gitconfig .gitconfig + +# SSH +workspace_backup .ssh/authorized_keys +workspace_link ssh/authorized_keys .ssh/authorized_keys + +# TMUX +workspace_backup .tmux.conf +workspace_link tmux/tmux.conf .tmux.conf + +# STARSHIP +workspace_backup .starship.toml +workspace_link starship/starship.toml .starship.toml + +# ZSH +workspace_backup .zshrc +workspace_link zsh/zshrc .zshrc + +# BIN +workspace_backup .bin +workspace_link bin .bin + +# VIM +workspace_backup .vimrc +workspace_link vim/vimrc .vimrc +workspace_backup .vim/coc-settings.json +workspace_link vim/coc-settings.json .vim/coc-settings.json diff --git a/main.go b/main.go deleted file mode 100644 index 1e0747a..0000000 --- a/main.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import "github.com/mentos1386/workspace/cmd" - -func main() { - cmd.Execute() -} diff --git a/packages/Dockerfile.kubectl b/packages/Dockerfile.kubectl deleted file mode 100644 index 88b4c10..0000000 --- a/packages/Dockerfile.kubectl +++ /dev/null @@ -1,20 +0,0 @@ -FROM alpine:3 as build - -WORKDIR /root - -RUN apk --no-cache add curl - -ARG VERSION=1.20.0 -ARG TARGETPLATFORM - -RUN curl -LO "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/bin/${TARGETPLATFORM}/kubectl" -RUN chmod +x kubectl - -FROM alpine:3 -LABEL maintainer="Tine Jozelj " -LABEL org.opencontainers.image.source https://github.com/mentos1386/workspace - -COPY --from=build /root/kubectl /usr/local/bin/kubectl - -ENTRYPOINT /usr/local/bin/kubectl - diff --git a/packages/Dockerfile.mosh b/packages/Dockerfile.mosh deleted file mode 100644 index 46c39fd..0000000 --- a/packages/Dockerfile.mosh +++ /dev/null @@ -1,28 +0,0 @@ -FROM sgerrand/alpine-abuild:3.12 as build - -LABEL maintainer="Tine Jozelj " -LABEL org.opencontainers.image.source https://github.com/mentos1386/workspace - -COPY --chown=builder packages/mosh /home/builder/package -RUN sudo chown builder -R /home/builder/package - -ARG VERSION=master - -RUN sed -i 's/pkgver=master/pkgver=${VERSION}/g' /home/builder/package/APKBUILD - -RUN abuild -r deps -RUN abuild fetch -RUN abuild unpack -RUN abuild prepare -RUN abuild build -RUN abuild package - -FROM alpine:3 - -# Install mosh, so we get the dependencies -RUN apk --update --no-cache add mosh - -COPY --from=build /home/builder/package/pkg/mosh/usr/bin/mosh-server /usr/bin/mosh-server -COPY --from=build /home/builder/package/pkg/mosh/usr/bin/mosh-client /usr/bin/mosh-client -COPY --from=build /home/builder/package/pkg/mosh/usr/bin/mosh /usr/bin/mosh - diff --git a/packages/Dockerfile.rust b/packages/Dockerfile.rust deleted file mode 100644 index 67b5c55..0000000 --- a/packages/Dockerfile.rust +++ /dev/null @@ -1,35 +0,0 @@ -FROM alpine:3.12 - -LABEL maintainer="Tine Jozelj " -LABEL org.opencontainers.image.source https://github.com/mentos1386/workspace - -RUN apk add --no-cache \ - ca-certificates \ - gcc \ - libc-dev - -ARG VERSION=1.48.0 - -ENV RUSTUP_HOME=/usr/local/rustup \ - CARGO_HOME=/usr/local/cargo \ - PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=${VERSION} - -RUN set -eux; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='8ab4f7759e22c308b49d737b5dc055c0d334f730632fdc6a169eda033983b846' ;; \ - aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='b3f15d01db21e4e9f192a81bfcbbb72e9055f6b01b4d0893b24f9f6c9f9d2b92' ;; \ - *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \ - esac; \ - url="https://static.rust-lang.org/rustup/archive/1.23.0/${rustArch}/rustup-init"; \ - wget "$url"; \ - echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ - chmod +x rustup-init; \ - ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ - rm rustup-init; \ - chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ - rustup --version; \ - cargo --version; \ - rustc --version; - diff --git a/packages/Dockerfile.starship b/packages/Dockerfile.starship deleted file mode 100644 index 337cc27..0000000 --- a/packages/Dockerfile.starship +++ /dev/null @@ -1,24 +0,0 @@ -ARG REPOSITORY=ghcr.io/mentos1386 -FROM ${REPOSITORY}/rust:1.48.0 as build - -WORKDIR /usr/src/starship - -RUN apk --no-cache add \ - git \ - libressl-dev - -ARG VERSION=0.47.0 - -RUN git clone https://github.com/starship/starship.git \ - --branch v$VERSION \ - --depth 1 . -RUN cargo build --release - -FROM alpine:3 -LABEL maintainer="Tine Jozelj " -LABEL org.opencontainers.image.source https://github.com/mentos1386/workspace - -COPY --from=build /usr/src/starship/target/release/starship /usr/local/bin/starship - -ENTRYPOINT /usr/local/bin/starship - diff --git a/packages/README.md b/packages/README.md deleted file mode 100644 index 40e5cd8..0000000 --- a/packages/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Packages - - -### [Starship](https://github.com/starship/starship) - -Why: https://github.com/starship/starship/issues/1736 - -Build failing as of: https://github.com/docker/buildx/issues/395 - diff --git a/packages/mosh/APKBUILD b/packages/mosh/APKBUILD deleted file mode 100644 index c878cde..0000000 --- a/packages/mosh/APKBUILD +++ /dev/null @@ -1,81 +0,0 @@ -# Contributor: Francesco Colista -# Maintainer: Francesco Colista -pkgname=mosh -pkgver=master -pkgrel=17 -pkgdesc="Mobile shell surviving disconnects with local echo and line editing" -options="!check" # emulation-cursor-motion.test fails -url="https://mosh.org" -arch="all !mips64" -license="GPL-3.0-or-later" -depends="$pkgname-client $pkgname-server" -checkdepends="tmux perl" -makedepends="ncurses-dev zlib-dev openssl-dev perl-dev perl-doc perl-io-tty - protobuf-dev automake autoconf libtool gzip" -subpackages="$pkgname-doc $pkgname-client $pkgname-server - $pkgname-bash-completion:bashcomp:noarch" -source="https://github.com/mobile-shell/mosh/archive/$pkgver.zip" - -builddir="$srcdir"/$pkgname-$pkgver - -prepare() { - default_prepare - # Test unicode-later-combining is failing. Ideally we want to fix it. - sed -i '/unicode-later-combining.test/d' "$builddir"/src/tests/Makefile.am - cd "$builddir" - ./autogen.sh -} - -build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --enable-compile-warnings=error \ - --enable-examples - make -} - -check() { - cd "$builddir" - make distcheck VERBOSE=1 V=1 -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -bashcomp() { - depends="" - pkgdesc="Bash completions for $pkgname" - install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - - install -Dm644 "$builddir"/conf/bash-completion/completions/mosh \ - "$subpkgdir"/usr/share/bash-completion/completions/$pkgname -} - -server() { - replaces="mosh" - pkgdesc="Mosh server" - depends="" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/mosh-server \ - "$subpkgdir"/usr/bin/ -} - -client() { - replaces="mosh" - pkgdesc="Mosh client" - depends="openssh-client perl-io-tty" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/mosh-client \ - "$subpkgdir"/usr/bin/ -} - -sha512sums="1aca55646667ce937da329d3dcc31c124f7a60b975c732cba4290fa7782ac75f17341d9690c811417420269393c415908177c0450dc7d3b6fbfbb9f6ac4cd744 master.zip" - diff --git a/ssh/authorized_keys b/ssh/authorized_keys new file mode 100644 index 0000000..6d858de --- /dev/null +++ b/ssh/authorized_keys @@ -0,0 +1,3 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHrX2u82zWpVhjWng1cR4Kj76SajLJQ/Nmwd2GPaJpt1 tine@ipad.sys.tjo.cloud +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICXAlzwziqfUUb2qmFwNF/nrBYc5MNT1MMOx81ohBmB+ tine@little.sys.tjo.space + diff --git a/starship/starship.toml b/starship/starship.toml new file mode 100644 index 0000000..e852b3b --- /dev/null +++ b/starship/starship.toml @@ -0,0 +1,2 @@ +[kubernetes] +disabled = false diff --git a/templates/actions/packages.yaml.tmpl b/templates/actions/packages.yaml.tmpl deleted file mode 100644 index 1c1aa94..0000000 --- a/templates/actions/packages.yaml.tmpl +++ /dev/null @@ -1,64 +0,0 @@ -name: packages - -on: - pull_request: - branches: main - push: - branches: main - -jobs: -[[[range .jobs]]] - [[[.name]]]: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Prepare - id: prepare - run: | - DOCKER_IMAGE=[[[$.repository]]]/[[[.name]]] - DOCKER_PLATFORMS=[[[$.platforms]]] - VERSION=[[[.version]]] - - TAGS="--tag ${DOCKER_IMAGE}:${VERSION} --tag ${DOCKER_IMAGE}:latest" - - echo ::set-output name=docker_image::${DOCKER_IMAGE} - echo ::set-output name=version::${VERSION} - echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \ - --build-arg REPOSITORY=[[[$.repository]]] \ - --build-arg VERSION=${VERSION} \ - --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \ - --build-arg VCS_REF=${GITHUB_SHA::8} \ - --cache-from "type=local,src=/tmp/.buildx-cache" \ - --cache-to "type=local,dest=/tmp/.buildx-cache" \ - ${TAGS} --file ./packages/Dockerfile.[[[.name]]] . - - name: Cache Docker layers - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-[[[.name]]]-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-[[[.name]]]- - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Docker Buildx (build) - run: | - docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }} - - name: Login to Github Registry - if: success() && github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.CR_PAT }} - - name: Docker Buildx (push) - if: success() && github.event_name != 'pull_request' - run: | - docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} - - name: Inspect image - if: always() && github.event_name != 'pull_request' - run: | - docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }} -[[[end]]] diff --git a/templates/actions/workspace.yaml.tmpl b/templates/actions/workspace.yaml.tmpl deleted file mode 100644 index a59a70e..0000000 --- a/templates/actions/workspace.yaml.tmpl +++ /dev/null @@ -1,77 +0,0 @@ -name: [[[.name]]] - -on: - schedule: - - cron: '0 6 * * *' - pull_request: - branches: main - push: - branches: main - tags: - - v* - -jobs: - [[[.name]]]: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Prepare - id: prepare - run: | - DOCKER_IMAGE=[[[.repository]]]/[[[.name]]] - DOCKER_PLATFORMS=[[[.platforms]]] - VERSION=edge - - if [[ $GITHUB_REF == refs/tags/* ]]; then - VERSION=${GITHUB_REF#refs/tags/v} - fi - if [ "${{ github.event_name }}" = "schedule" ]; then - VERSION=nightly - fi - - TAGS="--tag ${DOCKER_IMAGE}:${VERSION}" - if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - TAGS="$TAGS --tag ${DOCKER_IMAGE}:latest" - fi - - echo ::set-output name=docker_image::${DOCKER_IMAGE} - echo ::set-output name=version::${VERSION} - echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \ - --build-arg REPOSITORY=[[[.repository]]] \ - --build-arg VERSION=${VERSION} \ - --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \ - --build-arg VCS_REF=${GITHUB_SHA::8} \ - --cache-from "type=local,src=/tmp/.buildx-cache" \ - --cache-to "type=local,dest=/tmp/.buildx-cache" \ - ${TAGS} --file ./[[[.dockerfile]]] . - - name: Cache Docker layers - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-[[[.name]]]-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-[[[.name]]]- - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Docker Buildx (build) - run: | - docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }} - - name: Login to Github Registry - if: success() && github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.CR_PAT }} - - name: Docker Buildx (push) - if: success() && github.event_name != 'pull_request' - run: | - docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} - - name: Inspect image - if: always() && github.event_name != 'pull_request' - run: | - docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }} - diff --git a/dotfiles/tmux/tmux.conf b/tmux/tmux.conf similarity index 100% rename from dotfiles/tmux/tmux.conf rename to tmux/tmux.conf diff --git a/vim/coc-settings.json b/vim/coc-settings.json new file mode 100644 index 0000000..f4b9033 --- /dev/null +++ b/vim/coc-settings.json @@ -0,0 +1,18 @@ +{ + "eslint.autoFixOnSave": true, + "eslint.filetypes": [ + "javascript", + "javascriptreact", + "typescript", + "typescriptreact" + ], + "prettier.disableSuccessMessage": true, + "coc.preferences.formatOnSaveFiletypes": [ + "javascript", + "javascriptreact", + "typescript", + "typescriptreact" + ], + "tsserver.formatOnType": true, + "coc.preferences.formatOnType": true +} diff --git a/vim/vimrc b/vim/vimrc new file mode 100644 index 0000000..a87ec58 --- /dev/null +++ b/vim/vimrc @@ -0,0 +1,88 @@ +" Install vim-plug if not found +if empty(glob('~/.vim/autoload/plug.vim')) + silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs + \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim +endif + +" Run PlugInstall if there are missing plugins +autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)')) + \| PlugInstall --sync | source $MYVIMRC +\| endif + +call plug#begin('~/.vim/plugged') +"--- Plugins + +Plug 'tpope/vim-fugitive' +Plug 'airblade/vim-gitgutter' +Plug 'vim-airline/vim-airline' +Plug 'junegunn/fzf.vim' +Plug 'preservim/nerdtree' + +Plug 'editorconfig/editorconfig-vim' + +Plug 'fatih/vim-go' +Plug 'pangloss/vim-javascript' +Plug 'leafgarland/typescript-vim' +Plug 'peitalin/vim-jsx-typescript' +Plug 'styled-components/vim-styled-components', { 'branch': 'main' } +Plug 'jparise/vim-graphql' +Plug 'kevinoid/vim-jsonc' + +Plug 'neoclide/coc.nvim', {'branch': 'release'} +let g:coc_global_extensions = [ + \ 'coc-tsserver', + \ 'coc-prettier' + \ ] + +if isdirectory('./node_modules') && isdirectory('./node_modules/prettier') + let g:coc_global_extensions += ['coc-prettier'] +endif + +if isdirectory('./node_modules') && isdirectory('./node_modules/eslint') + let g:coc_global_extensions += ['coc-eslint'] +endif +"--- TMUX/Clipboard fixes +Plug 'ojroques/vim-oscyank' + +set t_Co=256 +" Set Vim-specific sequences for RGB colors +" Fixes 'termguicolors' usage in vim+tmux +" :h xterm-true-color +let &t_8f = "\[38;2;%lu;%lu;%lum" +let &t_8b = "\[48;2;%lu;%lu;%lum" + +" Enables 24-bit RGB color in the terminal +if has('termguicolors') + if empty($COLORTERM) || $COLORTERM =~# 'truecolor\|24bit' + set termguicolors + endif +endif + +" Use system clipboard to get buffers synced between TMUX and VIM +if has('clipboard') && has('vim_starting') + " set clipboard& clipboard+=unnamedplus + set clipboard& clipboard^=unnamed,unnamedplus +endif + +if exists('##TextYankPost') + augroup BlinkClipboardIntegration + autocmd! + autocmd TextYankPost * silent! if v:event.operator ==# 'y' | call YankOSC52(join(v:event["regcontents"],"\n")) | endif + augroup END +endif +"--- Themes +set t_ut= +Plug 'arcticicestudio/nord-vim' + +"--- +call plug#end() + +:set number + +let g:nord_cursor_line_number_background = 1 +let g:nord_underline = 1 +let g:nord_italic = 1 +let g:nord_italic_comments = 1 +colorscheme nord +let g:airline_theme = 'nord' + diff --git a/workspace.toml b/workspace.toml deleted file mode 100644 index 7e3012e..0000000 --- a/workspace.toml +++ /dev/null @@ -1,47 +0,0 @@ -## -# Workspace Node -[templates."workspace-node-action"] -template = "templates/actions/workspace.yaml.tmpl" - -[templates."workspace-node-action".vars] -name = "workspace-node" -dockerfile = "Dockerfile.node" -repository = "ghcr.io/mentos1386" -platforms = "linux/amd64,linux/arm64" - -## -# Workspace Golang -[templates."workspace-golang-action"] -template = "templates/actions/workspace.yaml.tmpl" - -[templates."workspace-golang-action".vars] -name = "workspace-golang" -dockerfile = "Dockerfile.golang" -repository = "ghcr.io/mentos1386" -platforms = "linux/amd64,linux/arm64" - -## -# Packages -[templates."package-action"] -template = "templates/actions/packages.yaml.tmpl" - -[templates."package-action".vars] -repository = "ghcr.io/mentos1386" -platforms = "linux/amd64,linux/arm64" - -[[templates."package-action".vars.jobs]] -name = "kubectl" -version = "1.20.0" - -[[templates."package-action".vars.jobs]] -name = "starship" -version = "0.47.0" - -[[templates."package-action".vars.jobs]] -name = "mosh" -version = "master" - -[[templates."package-action".vars.jobs]] -name = "rust" -version = "1.48.0" - diff --git a/zsh/zshrc b/zsh/zshrc new file mode 100644 index 0000000..11f5e08 --- /dev/null +++ b/zsh/zshrc @@ -0,0 +1,34 @@ +# Always start tmux if it isn't yet. +if [ -z "$TMUX" ] +then + tmux +fi + +# History improvements +export HISTFILE=~/.zsh_history +export HISTFILESIZE=1000000000 +export HISTSIZE=1000000000 +export SAVEHIST=100000 +setopt INC_APPEND_HISTORY +setopt HIST_IGNORE_ALL_DUPS + +# PATH +export PATH=$PATH:$HOME/.bin + +# ALIASES +alias k=kubectl + +# TOOLS +kubectl () { + command kubectl $* + if [[ -z $KUBECTL_COMPLETE ]] + then + source <(command kubectl completion zsh) + KUBECTL_COMPLETE=1 + fi +} +source /usr/share/nvm/init-nvm.sh + +# Starship +export STARSHIP_CONFIG=~/.starship.toml +eval "$(starship init zsh)"