Skip to content

Commit

Permalink
Merge pull request #1 from aifrak/v1.0.1
Browse files Browse the repository at this point in the history
using "cd <tab>" does nothing
  • Loading branch information
aifrak authored Jul 4, 2020
2 parents 01f09d5 + fca732d commit 0380ce8
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 17 deletions.
27 changes: 17 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM debian:buster-slim

ARG LSD_DELUXE_VERSION=0.17.0
ARG LSDELUXE_VERSION=0.17.0
ARG NERDS_FONT_VERSION=2.1.0
ARG FZF_VERSION=0.21.1

ENV ZSH_DIR=/zsh
ENV ZSH_DOCKER=/zsh/docker
Expand All @@ -14,12 +15,12 @@ WORKDIR $ZSH_DIR

RUN set -ex \
&& apt-get update \
&& LSD_DELUXE_DEPS="ca-certificates" \
&& LSDELUXE_DEPS="ca-certificates" \
&& NERD_FONTS_DEPS="wget" \
&& OH_MY_ZSH_DEPS="wget git" \
&& apt-get install --yes --no-install-recommends \
# install dependencies
$LSD_DELUXE_DEPS \
$LSDELUXE_DEPS \
$NERD_FONTS_DEPS \
$OH_MY_ZSH_DEPS \
zsh \
Expand All @@ -31,12 +32,18 @@ RUN set -ex \
&& git clone --branch '0.7.1' --depth 1 https://github.com/zsh-users/zsh-syntax-highlighting.git $ZSH_CUSTOM/plugins/zsh-syntax-highlighting \
&& git clone --branch 'v0.6.4' --depth 1 https://github.com/zsh-users/zsh-autosuggestions.git $ZSH_CUSTOM/plugins/zsh-autosuggestions \
&& git clone --branch 'v0.6.7' --depth 1 https://github.com/Powerlevel9k/powerlevel9k.git $ZSH_CUSTOM/themes/powerlevel9k \
# LSD Deluxe
&& LSD_DELUXE_DOWNLOAD_SHA256="ac85771d6195ef817c9d14f8a8a0d027461bfc290d46cb57e434af342a327bb2" \
&& wget -O lsd_deluxe.deb https://github.com/Peltoche/lsd/releases/download/${LSD_DELUXE_VERSION}/lsd_${LSD_DELUXE_VERSION}_amd64.deb \
&& echo "$LSD_DELUXE_DOWNLOAD_SHA256 lsd_deluxe.deb" | sha256sum -c - \
&& dpkg -i lsd_deluxe.deb \
&& rm lsd_deluxe.deb \
# FZF - executable only (required for zsh-interactive-cd)
&& FZF_DOWNLOAD_SHA256="7d4e796bd46bcdea69e79a8f571be1da65ae9d9cc984b50bc4af5c0b5754fbd5" \
&& wget -O fzf.tgz https://github.com/junegunn/fzf-bin/releases/download/${FZF_VERSION}/fzf-${FZF_VERSION}-linux_amd64.tgz \
&& echo "$FZF_DOWNLOAD_SHA256 fzf.tgz" | sha256sum -c - \
&& tar zxvf fzf.tgz --directory /usr/local/bin \
&& rm fzf.tgz \
# LSDeluxe
&& LSDELUXE_DOWNLOAD_SHA256="ac85771d6195ef817c9d14f8a8a0d027461bfc290d46cb57e434af342a327bb2" \
&& wget -O lsdeluxe.deb https://github.com/Peltoche/lsd/releases/download/${LSDELUXE_VERSION}/lsd_${LSDELUXE_VERSION}_amd64.deb \
&& echo "$LSDELUXE_DOWNLOAD_SHA256 lsdeluxe.deb" | sha256sum -c - \
&& dpkg -i lsdeluxe.deb \
&& rm lsdeluxe.deb \
# Fira Code from Nerd fonts
&& FONT_DIR=$ZSH_DIR/fonts \
&& FIRA_CODE_URL=https://github.com/ryanoasis/nerd-fonts/raw/${NERDS_FONT_VERSION}/patched-fonts/FiraCode \
Expand All @@ -60,7 +67,7 @@ RUN set -ex \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* *.deb \
&& apt-get remove --yes \
$LSD_DELUXE_DEPS \
$LSDELUXE_DEPS \
$NERD_FONTS_DEPS \
$OH_MY_ZSH_DEPS

Expand Down
27 changes: 27 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,30 @@ docker pull aifrak/oh-my-zsh

### Docker hub
https://hub.docker.com/r/aifrak/oh-my-zsh

### Theme
- [powerlevel9k](https://github.com/Powerlevel9k/powerlevel9k)

### Fonts
- [Fira Code from Nerd fonts](https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/FiraCode)

### Debian packages:
- [LSDeluxe](https://github.com/Peltoche/lsd)

### oh-my-zsh plugins:
- colored-man-pages
- colorize
- command-not-found
- copyfile
- dirhistory
- extract
- git
- git-extras
- globalias
- mix
- mix-fast
- [z](https://github.com/agkozak/zsh-z)
- [zsh-autosuggestions](https://github.com/zsh-users/zsh-autosuggestions)
- [zsh-interactive-cd](https://github.com/changyuheng/zsh-interactive-cd) + [fzf](https://github.com/junegunn/fzf)
- [zsh-navigation-tools](https://github.com/psprint/zsh-navigation-tools)
- [zsh-syntax-highlighting](https://github.com/zsh-users/zsh-syntax-highlighting)
7 changes: 0 additions & 7 deletions config/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ export ZSH=$HOME/.oh-my-zsh

export TERM="xterm-256color"

# LSDeluxe
# alias ls='lsd'
# alias l='ls -l'
# alias la='ls -a'
# alias lla='ls -la'
# alias lt='ls --tree'

# Set name of the theme to load --- if set to "random", it will
# load a random theme each time oh-my-zsh is loaded, in which case,
# to know which specific one was loaded, run: echo $RANDOM_THEME
Expand Down

0 comments on commit 0380ce8

Please sign in to comment.