From 37f8bbaf3f54bd1cc24936c002572f2f95224138 Mon Sep 17 00:00:00 2001 From: Tracey Clark Date: Tue, 3 Oct 2017 09:09:26 -0500 Subject: [PATCH 1/4] Added bash config files from selenium --- selenium_bash/.bashrc | 120 ++++++++++++++++++++++++++++++++++++++ selenium_bash/.profile | 22 +++++++ selenium_bash/.rootbashrc | 99 +++++++++++++++++++++++++++++++ 3 files changed, 241 insertions(+) create mode 100644 selenium_bash/.bashrc create mode 100644 selenium_bash/.profile create mode 100644 selenium_bash/.rootbashrc diff --git a/selenium_bash/.bashrc b/selenium_bash/.bashrc new file mode 100644 index 0000000..77cbad4 --- /dev/null +++ b/selenium_bash/.bashrc @@ -0,0 +1,120 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + +# don't put duplicate lines or lines starting with space in the history. +# See bash(1) for more options +HISTCONTROL=ignoreboth + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=1000 +HISTFILESIZE=2000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in + xterm-color|*-256color) color_prompt=yes;; +esac + +# uncomment for a colored prompt, if the terminal has the capability; turned +# off by default to not distract the user: the focus in a terminal window +# should be on the output of commands, not on the prompt +#force_color_prompt=yes + +if [ -n "$force_color_prompt" ]; then + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi +fi + +if [ "$color_prompt" = yes ]; then + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +else + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' +fi +unset color_prompt force_color_prompt + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) + ;; +esac + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# colored GCC warnings and errors +#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' + +# some more ls aliases +alias ll='ls -alF' +alias la='ls -A' +alias l='ls -CF' + +# Add an "alert" alias for long running commands. Use like so: +# sleep 10; alert +alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi + +#List upgradeable packages +apt list --upgradeable diff --git a/selenium_bash/.profile b/selenium_bash/.profile new file mode 100644 index 0000000..c9db459 --- /dev/null +++ b/selenium_bash/.profile @@ -0,0 +1,22 @@ +# ~/.profile: executed by the command interpreter for login shells. +# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login +# exists. +# see /usr/share/doc/bash/examples/startup-files for examples. +# the files are located in the bash-doc package. + +# the default umask is set in /etc/profile; for setting the umask +# for ssh logins, install and configure the libpam-umask package. +#umask 022 + +# if running bash +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi + +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/bin" ] ; then + PATH="$HOME/bin:$PATH" +fi diff --git a/selenium_bash/.rootbashrc b/selenium_bash/.rootbashrc new file mode 100644 index 0000000..f6939ee --- /dev/null +++ b/selenium_bash/.rootbashrc @@ -0,0 +1,99 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# If not running interactively, don't do anything +[ -z "$PS1" ] && return + +# don't put duplicate lines in the history. See bash(1) for more options +# ... or force ignoredups and ignorespace +HISTCONTROL=ignoredups:ignorespace + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=1000 +HISTFILESIZE=2000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in + xterm-color) color_prompt=yes;; +esac + +# uncomment for a colored prompt, if the terminal has the capability; turned +# off by default to not distract the user: the focus in a terminal window +# should be on the output of commands, not on the prompt +#force_color_prompt=yes + +if [ -n "$force_color_prompt" ]; then + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi +fi + +if [ "$color_prompt" = yes ]; then + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +else + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' +fi +unset color_prompt force_color_prompt + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) + ;; +esac + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# some more ls aliases +alias ll='ls -alF' +alias la='ls -A' +alias l='ls -CF' + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +#if [ -f /etc/bash_completion ] && ! shopt -oq posix; then +# . /etc/bash_completion +#fi From c66a2b5bf65bffec70d81e4d734b2867a83325b6 Mon Sep 17 00:00:00 2001 From: Tracey Clark Date: Wed, 11 Oct 2017 08:45:43 -0500 Subject: [PATCH 2/4] Added .vimrc that has proper tab settings --- home_config/.vimrc | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 home_config/.vimrc diff --git a/home_config/.vimrc b/home_config/.vimrc new file mode 100644 index 0000000..de90268 --- /dev/null +++ b/home_config/.vimrc @@ -0,0 +1,7 @@ +filetype plugin indent on +" show existing tab with 4 spaces width +set tabstop=4 +" when indenting with '>', use 4 spaces width +set shiftwidth=4 +" On pressing tab, insert 4 spaces +set expandtab From 697ecfc086f42fdb8aa46c7bdcc878bdbe1c52da Mon Sep 17 00:00:00 2001 From: Tracey Clark Date: Wed, 11 Oct 2017 10:10:45 -0500 Subject: [PATCH 3/4] Added zsh improvements from work laptop and a doc --- home_zsh/.zsh/functions/chpwd_update_git_vars | 4 ++ .../.zsh/functions/precmd_update_git_vars | 5 ++ .../.zsh/functions/preexec_update_git_vars | 6 +++ home_zsh/.zsh/functions/prompt_git_info | 32 ++++++++++++ .../.zsh/functions/update_current_git_vars | 37 +++++++++++++ home_zsh/.zsh/zshalias | 2 + home_zsh/.zshrc | 52 ++++++++++++++++++- home_zsh/zsh_notes.txt | 11 ++++ 8 files changed, 148 insertions(+), 1 deletion(-) create mode 100755 home_zsh/.zsh/functions/chpwd_update_git_vars create mode 100755 home_zsh/.zsh/functions/precmd_update_git_vars create mode 100755 home_zsh/.zsh/functions/preexec_update_git_vars create mode 100755 home_zsh/.zsh/functions/prompt_git_info create mode 100755 home_zsh/.zsh/functions/update_current_git_vars create mode 100644 home_zsh/zsh_notes.txt diff --git a/home_zsh/.zsh/functions/chpwd_update_git_vars b/home_zsh/.zsh/functions/chpwd_update_git_vars new file mode 100755 index 0000000..2d24c83 --- /dev/null +++ b/home_zsh/.zsh/functions/chpwd_update_git_vars @@ -0,0 +1,4 @@ +# update the prompt after changing to a new directory. +# http://sebastiancelis.com/2009/11/16/zsh-prompt-git-users/ + +update_current_git_vars diff --git a/home_zsh/.zsh/functions/precmd_update_git_vars b/home_zsh/.zsh/functions/precmd_update_git_vars new file mode 100755 index 0000000..4db6cd4 --- /dev/null +++ b/home_zsh/.zsh/functions/precmd_update_git_vars @@ -0,0 +1,5 @@ +if [ -n "$__EXECUTED_GIT_COMMAND" ]; then + update_current_git_vars + unset __EXECUTED_GIT_COMMAND +fi + diff --git a/home_zsh/.zsh/functions/preexec_update_git_vars b/home_zsh/.zsh/functions/preexec_update_git_vars new file mode 100755 index 0000000..83b0e88 --- /dev/null +++ b/home_zsh/.zsh/functions/preexec_update_git_vars @@ -0,0 +1,6 @@ +case "$1" in + git*) + __EXECUTED_GIT_COMMAND=1 + ;; +esac + diff --git a/home_zsh/.zsh/functions/prompt_git_info b/home_zsh/.zsh/functions/prompt_git_info new file mode 100755 index 0000000..e5846f6 --- /dev/null +++ b/home_zsh/.zsh/functions/prompt_git_info @@ -0,0 +1,32 @@ +# Git prompt stuff +# http://sebastiancelis.com/2009/11/16/zsh-prompt-git-users/ + +if [ -n "$__CURRENT_GIT_BRANCH" ]; then + local s="(" + s+="$__CURRENT_GIT_BRANCH" + case "$__CURRENT_GIT_BRANCH_STATUS" in + ahead) + git_color="%{${fg[yellow]}%}" + s+="↑" + ;; + diverged) + git_color="%{${fg[yellow]}%}" + s+="↕" + ;; + behind) + git_color="%{${fg[yellow]}%}" + s+="↓" + ;; + esac + if [ -n "$__CURRENT_GIT_BRANCH_IS_CLEAN" ]; then + git_color="%{${fg[green]}%}" + fi + if [ -n "$__CURRENT_GIT_BRANCH_IS_DIRTY" ]; then + git_color="%{${fg[red]}%}" + s+="⚡" + fi + s+=")" + + printf " %s%s" "$git_color" $s +fi + diff --git a/home_zsh/.zsh/functions/update_current_git_vars b/home_zsh/.zsh/functions/update_current_git_vars new file mode 100755 index 0000000..10faf0f --- /dev/null +++ b/home_zsh/.zsh/functions/update_current_git_vars @@ -0,0 +1,37 @@ +# This file is used to set a few environment variables which will make it easy to build up our prompt +# http://sebastiancelis.com/2009/11/16/zsh-prompt-git-users/ + +unset __CURRENT_GIT_BRANCH +unset __CURRENT_GIT_BRANCH_STATUS +unset __CURRENT_GIT_BRANCH_IS_DIRTY + +local st="$(git status 2>/dev/null)" + +if [[ -n "$st" ]]; then + local -a arr + arr=(${(f)st}) + if [[ $arr[1] =~ 'Not currently on any branch.' ]]; then + __CURRENT_GIT_BRANCH='no-branch' + else + __CURRENT_GIT_BRANCH="${arr[1][(w)4]}"; + fi + + if [[ $st =~ 'nothing to commit, working directory clean' ]]; then + __CURRENT_GIT_BRANCH_IS_CLEAN='1' + fi + + if [[ $arr[2] =~ 'Your branch is' ]]; then + if [[ $arr[2] =~ 'ahead' ]]; then + __CURRENT_GIT_BRANCH_STATUS='ahead' + elif [[ $arr[2] =~ 'diverged' ]]; then + __CURRENT_GIT_BRANCH_STATUS='diverged' + else + __CURRENT_GIT_BRANCH_STATUS='behind' + fi + fi + + if [[ ! $st =~ 'nothing to commit' ]]; then + __CURRENT_GIT_BRANCH_IS_DIRTY='1' + fi + +fi diff --git a/home_zsh/.zsh/zshalias b/home_zsh/.zsh/zshalias index eef4cb9..7469b24 100644 --- a/home_zsh/.zsh/zshalias +++ b/home_zsh/.zsh/zshalias @@ -6,6 +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' diff --git a/home_zsh/.zshrc b/home_zsh/.zshrc index 345952e..6ba5565 100644 --- a/home_zsh/.zshrc +++ b/home_zsh/.zshrc @@ -6,6 +6,13 @@ 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 @@ -15,8 +22,10 @@ SAVEHIST=1000 HISTFILE=~/.zsh_history # Use modern completion system -autoload -Uz compinit +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 @@ -45,3 +54,44 @@ fi eval `ssh-agent -s` && ssh-agent ssh-add .ssh/tlc_gitlab + +#------------------------------------------------------------- +# 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/* \ No newline at end of file diff --git a/home_zsh/zsh_notes.txt b/home_zsh/zsh_notes.txt new file mode 100644 index 0000000..c91a864 --- /dev/null +++ b/home_zsh/zsh_notes.txt @@ -0,0 +1,11 @@ +#zsh notes +https://wiki.archlinux.org/index.php/Zsh + +This is an example of a two-sided prompt: + +PROMPT='%F{red}%n%f@%F{blue}%m%f %F{yellow}%1~%f %# ' +RPROMPT='[%F{yellow}%?%f]' + +And here's how it will be displayed: + +username@host ~ % [0] \ No newline at end of file From 8982abddd4dcb6de1708550a0e871cfecaa7197d Mon Sep 17 00:00:00 2001 From: Tracey Clark Date: Thu, 26 Oct 2017 08:38:01 -0500 Subject: [PATCH 4/4] Added to .vimrc and .zshalias --- README.md | 6 +++++- home_config/.vimrc | 2 ++ home_zsh/.zsh/zshalias | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ca08dfb..2342f37 100644 --- a/README.md +++ b/README.md @@ -1 +1,5 @@ -ZSH and Bash config files for personal use \ No newline at end of file +# ZSH and Bash config files for personal use +## TODO +- Add .vimrc +- Add to .vimrc command to map such that it can switch between paste and nopaste modes: +`set pastetoggle=` \ No newline at end of file diff --git a/home_config/.vimrc b/home_config/.vimrc index de90268..eb8cc89 100644 --- a/home_config/.vimrc +++ b/home_config/.vimrc @@ -1,3 +1,4 @@ + filetype plugin indent on " show existing tab with 4 spaces width set tabstop=4 @@ -5,3 +6,4 @@ set tabstop=4 set shiftwidth=4 " On pressing tab, insert 4 spaces set expandtab +set pastetoggle= \ No newline at end of file diff --git a/home_zsh/.zsh/zshalias b/home_zsh/.zsh/zshalias index 7469b24..bfaed22 100644 --- a/home_zsh/.zsh/zshalias +++ b/home_zsh/.zsh/zshalias @@ -12,3 +12,4 @@ 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