diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 608fde7..0038bca 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -129,6 +129,16 @@ RUN apt install neovim -y RUN git clone --dept 1 https://github.com/ecosse3/nvim.git $HOME/.config/nvim RUN nvim --headless -c 'Lazy sync' -c 'qa' +# ------------------------------ +# LazyDocker & LazyGit +# ------------------------------ +RUN curl https://raw.githubusercontent.com/jesseduffield/lazydocker/master/scripts/install_update_linux.sh | bash +RUN LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | \grep -Po '"tag_name": *"v\K[^"]*') &&\ + curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/download/v${LAZYGIT_VERSION}/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz" &&\ + tar xf lazygit.tar.gz lazygit &&\ + install lazygit -D -t /usr/local/bin/ &&\ + rm -rf lazygit.tar.gz lazygit + # ------------------------------ # Clean # ------------------------------ diff --git a/.devcontainer/home/.zshrc b/.devcontainer/home/.zshrc index 929ac7c..2b7ded9 100644 --- a/.devcontainer/home/.zshrc +++ b/.devcontainer/home/.zshrc @@ -1,10 +1,3 @@ -export LC_ALL=$LOCAL -export LANG=$LOCAL - -export HISTSIZE=10000 -export SAVEHIST=10000 - -export HISTFILE=~/.zsh_history export EDITOR=vim # PATH @@ -17,7 +10,9 @@ if [ -d "$HOME/.local/bin" ] ; then fi # Oh-My-ZSH +export ZSH="$HOME/.oh-my-zsh" plugins=(sudo aliases git docker docker-compose node nvm npm) +source $ZSH/oh-my-zsh.sh # Python echo 'eval "$(uv generate-shell-completion zsh)"' >> ~/.zshrc @@ -38,6 +33,10 @@ alias ls='lsd -A' alias ll='lsd -lA' alias lt='lsd --tree' +# LazyDocker & LazyGit +alias ldocker='lazydocker' +alias lgit='lazygit' + # TheFuck eval $(thefuck --alias) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6efa0bd..709fa13 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -68,7 +68,7 @@ jobs: cache-to: type=gha,mode=max - name: Docker Hub Description - if: success() && github.ref == format('refs/heads/{0}', 'master') + if: success() && github.ref_type == 'tag' uses: peter-evans/dockerhub-description@v4 with: username: ${{ secrets.DOCKER_USERNAME }} diff --git a/README.md b/README.md index b9c2bc0..300c083 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ - [Vim](https://www.vim.org/) Vim is a highly configurable text editor built to make creating and changing any kind of text very efficient. - [NeoVim](https://github.com/neovim/neovim) Vim-fork focused on extensibility and usability - [ecosse3/nvim](https://github.com/ecosse3/nvim) A non-minimal Neovim config built to work most efficiently with Frontend Development + - [LazyDocker](https://github.com/jesseduffield/lazydocker) & [LazyGit](https://github.com/jesseduffield/lazygit) The lazier way to manage everything in docker or git - But also `git`, `gpg`, `curl`, `wget`, etc. ### 🧑‍💻 Languages & Runtimes