zsh changes

master
Jonathan Hodgson 5 years ago
parent 3c6b8fd06c
commit 4b625841e0
  1. 2
      shells/shared/aliases
  2. 21
      shells/zsh/STOW/.zshrc
  3. 9
      shells/zsh/oh-my-zsh-custom/promptconfig.zsh

@ -14,7 +14,7 @@ alias tree='tree -F -C'
# Make qmv open on 1 column mode # Make qmv open on 1 column mode
alias qmv='qmv -f do' alias qmv='qmv -f do'
alias msfconsole="msfconsole --quiet -x \"db_connect msf@msf\"" alias msfconsole="( systemctl status --no-pager postgresql.service > /dev/null || (echo \"Statring postgres\"; sudo systemctl start postgresql.service) ); ( pass show system/metasploit/database.yaml > database.yaml; msfconsole -y database.yaml; rm database.yaml )"
#Start cups #Start cups
alias cups='sudo systemctl start org.cups.cupsd.service' alias cups='sudo systemctl start org.cups.cupsd.service'

@ -53,7 +53,8 @@ ZSH_CUSTOM=$HOME/.dotfiles/shells/zsh/oh-my-zsh-custom
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup. # Add wisely, as too many plugins slow down shell startup.
plugins=(git zsh-better-npm-completion zsh-autosuggestions) plugins=(navi git zsh-better-npm-completion zsh-autosuggestions)
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh
@ -108,16 +109,14 @@ TRAPWINCH(){
#fi #fi
# #
#local current="$(project current --path)" local current="$(project current --path)"
#if [ -n "$current" ]; then if [ -n "$current" ]; then
# echo "yay" local script="/usr/bin/script"
# local script="/usr/bin/script" if [[ ! "$(ps -ocommand -p $PPID | grep -v 'COMMAND' | cut -d' ' -f1 )" == "$script" ]]; then
# echo "'$(ps -ocommand -p $PPID | grep -v 'COMMAND' | cut -d' ' -f1)'" mkdir "$current/shell-logs"
# if [[ ! "$(ps -ocommand -p $PPID | grep -v 'COMMAND' | cut -d' ' -f1 )" == "$script" ]]; then /usr/bin/script -f "$current/shell-logs/$(date +"%d-%b-%y_%H-%M-%S")_shell.log"
# mkdir "$current/shell-logs" fi
# /usr/bin/script -f "$current/shell-logs/$(date +"%d-%b-%y_%H-%M-%S")_shell.log" fi
# fi
#fi
#clear #clear
#tldr --linux -r #tldr --linux -r

@ -24,9 +24,8 @@ function my_dir(){
# Replace wp-content/plugins with plugin icon if in plugin # Replace wp-content/plugins with plugin icon if in plugin
# current_path=$(echo $current_path | sed -r -e "s/wp\-content\/plugins/$wpPluginsIcon/") # current_path=$(echo $current_path | sed -r -e "s/wp\-content\/plugins/$wpPluginsIcon/")
local current_project_full="$(project current --path)" current_project_full="$(project current --path)"
local current_project_name="$(project current)" if [ -n "$current_project_full" ]; then
if [ -n "$current_project_name" ]; then
if echo "$PWD" | grep -q "$current_project_full"; then if echo "$PWD" | grep -q "$current_project_full"; then
current_path=$(echo $PWD | sed -r -e "s#$current_project_full##" | sed -r -e 's/^\///') current_path=$(echo $PWD | sed -r -e "s#$current_project_full##" | sed -r -e 's/^\///')
current_path="$current_path" current_path="$current_path"
@ -102,9 +101,9 @@ POWERLEVEL9K_CUSTOM_CAPS_FOREGROUND="white"
function prompt_project() { function prompt_project() {
local segment_content state icon local segment_content state icon
local current_project_name="$(project current)"
local current_project_full="$(project current --path)"
local parent_process="$(ps -ocommand -p $PPID | grep -v 'COMMAND' | cut -d' ' -f1)" local parent_process="$(ps -ocommand -p $PPID | grep -v 'COMMAND' | cut -d' ' -f1)"
local current_project_full="$(project current --path)"
local current_project_name="$(project current)"
# If there is a current project # If there is a current project
if [ -n "$current_project_name" ]; then if [ -n "$current_project_name" ]; then
segment_content="$current_project_name" segment_content="$current_project_name"

Loading…
Cancel
Save