From 811ec27a7724967aaf71599539ba5173573fe251 Mon Sep 17 00:00:00 2001 From: Tracey Clark Date: Sat, 15 Sep 2018 14:57:57 -0500 Subject: [PATCH] Updated zsh config files' --- home_zsh/.zsh/zshalias | 4 +- home_zsh/.zshrc | 108 +++---------------- home_zsh/zpreztorc | 231 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 246 insertions(+), 97 deletions(-) create mode 100644 home_zsh/zpreztorc diff --git a/home_zsh/.zsh/zshalias b/home_zsh/.zsh/zshalias index bfaed22..b615bbc 100644 --- a/home_zsh/.zsh/zshalias +++ b/home_zsh/.zsh/zshalias @@ -6,10 +6,8 @@ alias ted='java -jar /home/tracey/bin/ted.jar' alias ll='ls -alFh --group-directories-first' alias la='ls -A' alias l='ls -CF' -alias lad='ls -ldh' # ls directory -alias tree='tree -Csu' # nice alternative to 'recursive ls' alias colo='ssh cp' alias colosync='ssh syncthing@cp' alias mountpi='sshfs -o idmap=user pi@pi3:/home/pi /home/tracey/pi3' alias unpi='fusermount -u /home/tracey/pi3' -alias less='less -r' \ No newline at end of file +alias aptup='sudo zsh -c 'apt update&&apt upgrade&&apt autoremove'' diff --git a/home_zsh/.zshrc b/home_zsh/.zshrc index 6b09cc3..2742d3d 100644 --- a/home_zsh/.zshrc +++ b/home_zsh/.zshrc @@ -1,51 +1,14 @@ -# Set up the prompt -# Note: Check the zsh underlying engine on the system -# Manjaro uses Prezto +# +# Executes commands at the start of an interactive session. +# +# Authors: +# Sorin Ionescu +# -autoload -Uz promptinit -promptinit -prompt adam1 - -setopt histignorealldups sharehistory - -#------------------------------------------------------------- -# Keybindings -#------------------------------------------------------------- - -bindkey '^H' backward-kill-word -bindkey '^F' forward-word -bindkey '^B' backward-word -# Use emacs keybindings even if our EDITOR is set to vi -# bindkey -e - -# Keep 1000 lines of history within the shell and save it to ~/.zsh_history: -HISTSIZE=1000 -SAVEHIST=1000 -HISTFILE=~/.zsh_history - -# Use modern completion system -autoload -U compinit promptinit zcalc zsh-mime-setup -compinit -promptinit -zsh-mime-setup - -zstyle ':completion:*' auto-description 'specify: %d' -zstyle ':completion:*' completer _expand _complete _correct _approximate -zstyle ':completion:*' format 'Completing %d' -zstyle ':completion:*' group-name '' -zstyle ':completion:*' menu select=2 -eval "$(dircolors -b)" -zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} -zstyle ':completion:*' list-colors '' -zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s -zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=* l:|=*' -zstyle ':completion:*' menu select=long -zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s -zstyle ':completion:*' use-compctl false -zstyle ':completion:*' verbose true - -zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31' -zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd' +# Source Prezto. +if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then + source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" +fi # Load aliases if [ -f ~/.zsh/zshalias ]; then @@ -54,50 +17,7 @@ else print "404: ~/.zsh/zshalias not found." fi -# Note: Only use this if keyagent is not installed / available -eval `ssh-agent -s` && ssh-agent -ssh-add .ssh/tlc_gitlab - -# Export key file to agent keychain -#keychain --agents ssh --quick --quiet --noask /home/tracey/.ssh/*.pub - -#------------------------------------------------------------- -# Prompt bits -#------------------------------------------------------------- -# Initialize colors. -autoload -U colors -colors - -# Allow for functions in the prompt. -setopt PROMPT_SUBST - -# Autoload zsh functions. -fpath=(~/.zsh/functions $fpath) -autoload -U ~/.zsh/functions/*(:t) - -# Enable auto-execution of functions. -typeset -ga preexec_functions -typeset -ga precmd_functions -typeset -ga chpwd_functions - -# Append git functions needed for prompt. -preexec_functions+='preexec_update_git_vars' -precmd_functions+='precmd_update_git_vars' -chpwd_functions+='chpwd_update_git_vars' - -# For terminix / tilix -if [[ $TERMINIX_ID ]]; then - source /etc/profile.d/vte.sh -fi - -# Set the prompt. -#PROMPT=$'%{${fg[cyan]}%}%B%~%b$(prompt_git_info)%{${fg[default]}%} ' -PROMPT=$'%{${fg[magenta]}%}%n%{$reset_color%}\@%{$fg[blue]%}%m%{$reset_color%} %{${fg[cyan]}%}%B%~%b$(prompt_git_info)%{${fg[default]}%} %{$fg[blue]%}%%%{$reset_color%} ' - -# Export stuff for sshfs over VPN -echo "SSH_AGENT_PID=$SSH_AGENT_PID; export SSH_AGENT_PID;" >~/.thestuff -echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK; export SSH_AUTH_SOCK;" >>~/.thestuff - -#ssh-agent -# Export key file to agent keychain -keychain --agents ssh --quick --quiet --noask /home/tracey/.ssh/*.pub +# Necessary for loading custom prezto theme + autoload -Uz promptinit + promptinit + prompt paradox diff --git a/home_zsh/zpreztorc b/home_zsh/zpreztorc new file mode 100644 index 0000000..fcc6f81 --- /dev/null +++ b/home_zsh/zpreztorc @@ -0,0 +1,231 @@ +# +# Sets Prezto options. +# +# Authors: +# Sorin Ionescu +# + +# +# General +# + +# Set case-sensitivity for completion, history lookup, etc. +# zstyle ':prezto:*:*' case-sensitive 'yes' + +# Color output (auto set to 'no' on dumb terminals). +zstyle ':prezto:*:*' color 'yes' + +# Add additional directories to load prezto modules from +#zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto-contrib + +# Set the Zsh modules to load (man zshmodules). +zstyle ':prezto:load' zmodule 'attr' 'stat' + +# Set the Zsh functions to load (man zshcontrib). +# zstyle ':prezto:load' zfunction 'zargs' 'zmv' + +# Set the Prezto modules to load (browse modules). +# The order matters. +zstyle ':prezto:load' pmodule \ + 'environment' \ + 'terminal' \ + 'editor' \ + 'history' \ + 'directory' \ + 'spectrum' \ + 'utility' \ + 'ssh' \ + 'completion' \ + 'git' \ + 'syntax-highlighting' \ + 'history-substring-search' \ + 'prompt' + +# +# Autosuggestions +# + +# Set the query found color. +# zstyle ':prezto:module:autosuggestions:color' found '' + +# +# Completions +# + +# Set the entries to ignore in static */etc/hosts* for host completion. +# zstyle ':prezto:module:completion:*:hosts' etc-host-ignores \ +# '0.0.0.0' '127.0.0.1' + +# +# Editor +# + +# Set the key mapping style to 'emacs' or 'vi'. +zstyle ':prezto:module:editor' key-bindings 'emacs' + +# Auto convert .... to ../.. +# zstyle ':prezto:module:editor' dot-expansion 'yes' + +# Allow the zsh prompt context to be shown. +#zstyle ':prezto:module:editor' ps-context 'yes' + +# +# Git +# + +# Ignore submodules when they are 'dirty', 'untracked', 'all', or 'none'. +# zstyle ':prezto:module:git:status:ignore' submodules 'all' + +# +# GNU Utility +# + +# Set the command prefix on non-GNU systems. +# zstyle ':prezto:module:gnu-utility' prefix 'g' + +# +# History Substring Search +# + +# Set the query found color. +# zstyle ':prezto:module:history-substring-search:color' found '' + +# Set the query not found color. +# zstyle ':prezto:module:history-substring-search:color' not-found '' + +# Set the search globbing flags. +# zstyle ':prezto:module:history-substring-search' globbing-flags '' + +# +# macOS +# + +# Set the keyword used by `mand` to open man pages in Dash.app +# zstyle ':prezto:module:osx:man' dash-keyword 'manpages' + +# +# Pacman +# + +# Set the Pacman frontend. +# zstyle ':prezto:module:pacman' frontend 'yaourt' + +# +# Prompt +# + +# Set the prompt theme to load. +# Setting it to 'random' loads a random theme. +# Auto set to 'off' on dumb terminals. +zstyle ':prezto:module:prompt' theme 'sorin' + +# Set the working directory prompt display length. +# By default, it is set to 'short'. Set it to 'long' (without '~' expansion) +# for longer or 'full' (with '~' expansion) for even longer prompt display. +# zstyle ':prezto:module:prompt' pwd-length 'short' + +# Set the prompt to display the return code along with an indicator for non-zero +# return codes. This is not supported by all prompts. +# zstyle ':prezto:module:prompt' show-return-val 'yes' + +# +# Python +# + +# Auto switch the Python virtualenv on directory change. +# zstyle ':prezto:module:python:virtualenv' auto-switch 'yes' + +# Automatically initialize virtualenvwrapper if pre-requisites are met. +# zstyle ':prezto:module:python:virtualenv' initialize 'yes' + +# +# Ruby +# + +# Auto switch the Ruby version on directory change. +# zstyle ':prezto:module:ruby:chruby' auto-switch 'yes' + +# +# Screen +# + +# Auto start a session when Zsh is launched in a local terminal. +# zstyle ':prezto:module:screen:auto-start' local 'yes' + +# Auto start a session when Zsh is launched in a SSH connection. +# zstyle ':prezto:module:screen:auto-start' remote 'yes' + +# +# SSH +# + +# Set the SSH identities to load into the agent. +# zstyle ':prezto:module:ssh:load' identities 'id_rsa' 'id_rsa2' 'id_github' +zstyle ':prezto:module:ssh:load' identities 'tlc_gitlab' 'tlc_server' +echo 'Loaded the identities' +echo `ssh-add -l` + +# +# Syntax Highlighting +# + +# Set syntax highlighters. +# By default, only the main highlighter is enabled. +# zstyle ':prezto:module:syntax-highlighting' highlighters \ +# 'main' \ +# 'brackets' \ +# 'pattern' \ +# 'line' \ +# 'cursor' \ +# 'root' +# +# Set syntax highlighting styles. +# zstyle ':prezto:module:syntax-highlighting' styles \ +# 'builtin' 'bg=blue' \ +# 'command' 'bg=blue' \ +# 'function' 'bg=blue' +# +# Set syntax pattern styles. +# zstyle ':prezto:module:syntax-highlighting' pattern \ +# 'rm*-rf*' 'fg=white,bold,bg=red' + +# +# Terminal +# + +# Auto set the tab and window titles. +# zstyle ':prezto:module:terminal' auto-title 'yes' + +# Set the window title format. +# zstyle ':prezto:module:terminal:window-title' format '%n@%m: %s' + +# Set the tab title format. +# zstyle ':prezto:module:terminal:tab-title' format '%m: %s' + +# Set the terminal multiplexer title format. +# zstyle ':prezto:module:terminal:multiplexer-title' format '%s' + +# +# Tmux +# + +# Auto start a session when Zsh is launched in a local terminal. +# zstyle ':prezto:module:tmux:auto-start' local 'yes' + +# Auto start a session when Zsh is launched in a SSH connection. +# zstyle ':prezto:module:tmux:auto-start' remote 'yes' + +# Integrate with iTerm2. +# zstyle ':prezto:module:tmux:iterm' integrate 'yes' + +# Set the default session name: +# zstyle ':prezto:module:tmux:session' name 'YOUR DEFAULT SESSION NAME' + +# +# Utility +# + +# Enabled safe options. This aliases cp, ln, mv and rm so that they prompt +# before deleting or overwriting files. Set to 'no' to disable this safer +# behavior. +# zstyle ':prezto:module:utility' safe-ops 'yes'