From 50e47c998ea37a2e55e03ee04694eea8b316fcbd Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Sun, 3 Feb 2019 22:25:14 +0100 Subject: [PATCH] Last oh-my-zsh config, switching to antigen --- .aliases | 4 ++++ .zshrc | 35 ++++++++++++++++++++++++++--------- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/.aliases b/.aliases index 520cf89..cfe6857 100644 --- a/.aliases +++ b/.aliases @@ -1,2 +1,6 @@ alias ls='ls --color=auto' alias dotfiles='/usr/bin/git --git-dir=/home/marty/.dotfiles/ --work-tree=/home/marty' +alias n='nnn' +alias m='micro' + +alias zshconf='m ~/.zshrc' diff --git a/.zshrc b/.zshrc index 62b8fc1..f7ad945 100644 --- a/.zshrc +++ b/.zshrc @@ -2,7 +2,7 @@ # export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. - export ZSH="/home/marty/.oh-my-zsh/" + export ZSH="/home/marty/.oh-my-zsh" # 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, @@ -36,10 +36,10 @@ ZSH_THEME="powerlevel9k/powerlevel9k" # DISABLE_AUTO_TITLE="true" # Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" +ENABLE_CORRECTION="true" # Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" +COMPLETION_WAITING_DOTS="true" # Uncomment the following line if you want to disable marking untracked files # under VCS as dirty. This makes repository status check for large repositories @@ -63,11 +63,12 @@ ZSH_THEME="powerlevel9k/powerlevel9k" # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. plugins=( - git, - colored-man-pages, - zsh-syntax-highlighting, - zsh-autosuggestions, + git + colored-man-pages zsh-completions + zsh-autosuggestions + zsh-syntax-highlighting + fzf ) source $ZSH/oh-my-zsh.sh @@ -77,7 +78,7 @@ source $ZSH/oh-my-zsh.sh # export MANPATH="/usr/local/man:$MANPATH" # You may need to manually set your language environment -# export LANG=en_US.UTF-8 +export LANG=en_US.UTF-8 # Preferred editor for local and remote sessions # if [[ -n $SSH_CONNECTION ]]; then @@ -100,7 +101,23 @@ source $ZSH/oh-my-zsh.sh # Example aliases # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" +source $HOME/.aliases +PS1='[\u@\h \W]\$ ' +# >>> Added by cnchi installer +BROWSER=/usr/bin/chromium +EDITOR=/usr/bin/micro + +. ~/.ssh/.ssh-find-agent.sh +ssh-find-agent -a +if [ -z "$SSH_AUTH_SOCK" ] +then + eval $(ssh-agent) > /dev/null + ssh-add -l >/dev/null || alias ssh='ssh-add -l >/dev/null || ssh-add && unalias ssh; ssh' +fi + +export GOPATH="$HOME/Code/go" +export PATH="$PATH:$GOPATH/bin" POWERLEVEL9K_MODE='nerdfont-complete' #POWERLEVEL9K_SHORTEN_DIR_LENGTH=1 @@ -141,4 +158,4 @@ POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND='magenta' POWERLEVEL9K_BACKGROUND_JOBS_BACKGROUND='clear' POWERLEVEL9K_BACKGROUND_JOBS_FOREGROUND='green' -alias dotfiles='/usr/bin/git --git-dir=/home/marty/.dotfiles/ --work-tree=/home/marty' \ No newline at end of file +ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=250"