Skip to content

Commit

Permalink
ubuntu setup
Browse files Browse the repository at this point in the history
  • Loading branch information
cdaddr committed Jul 9, 2019
1 parent 28f3515 commit 5b447fd
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
6 changes: 6 additions & 0 deletions setup-ubuntu.zsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/zsh
sudo apt install git zsh ripgrep fd-find neovim docker docker-compose fzf python3 python-dev python-pip python3-dev python3-pip
sudo add-apt-repository -y ppa:lazygit-team/release
apt install lazygit
sudo add-apt-repository -y ppa:neovim-ppa/stable
apt install neovim
2 changes: 1 addition & 1 deletion setup.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ fi
log "Fetching Vim plugins..."
vim +PlugInstall +qall
# for deoplete
pip3 install --user --upgrade pynvim
python3 -m pip install --user --upgrade pynvim

EMACS="$HOME/.emacs.d"
if [[ -e $EMACS ]]; then
Expand Down
19 changes: 10 additions & 9 deletions zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,8 @@ setopt prompt_subst
# white 7 15
autoload -Uz vcs_info

zstyle ':vcs_info:*' check-for-changes true
zstyle ':vcs_info:*' check-for-staged-changes true
zstyle ':vcs_info:*' stagedstr "%F{10}+%f"
zstyle ':vcs_info:*' unstagedstr "%F{11}+%f"
zstyle ':vcs_info:*' formats '%F{8}:%F{7}%b%c%u%f'
zstyle ':vcs_info:*' actionformats '%F{8}:%F{7}%b|%a%c%u%f'
zstyle ':vcs_info:*' formats '%F{8}:%F{7}%b%f'
zstyle ':vcs_info:*' actionformats '%F{8}:%F{7}%b|%a%f'
function prompt() {

local PROMPT=''
Expand All @@ -68,8 +64,8 @@ function prompt() {
PROMPT+=" %F{12}%~%f"
# git
PROMPT+="${vcs_info_msg_0_}"
if [[ ! -z "$(git ls-files --other --directory --exclude-standard 2>/dev/null | sed q)" ]]; then
PROMPT+="%F{1}+%f"
if [[ -n "$(git status --porcelain 2>/dev/null)" ]]; then
PROMPT+="%F{1}*%f"
fi
# end
PROMPT+=" %F{13}❯%f "
Expand Down Expand Up @@ -110,7 +106,12 @@ fi


if [[ `ls --color=auto 2>/dev/null` ]]; then
alias ls="LC_COLLATE=POSIX ls --group-directories-first --color=auto"
if [[ ! -z "${WSL_DISTRO_NAME}" ]]; then
alias ls="LC_COLLATE=POSIX ls --group-directories-first --color=auto 2>/dev/null"
else
alias ls="LC_COLLATE=POSIX ls --group-directories-first --color=auto"
fi

alias ll="ls -lh"
alias la="la -a"
fi
Expand Down

0 comments on commit 5b447fd

Please sign in to comment.