diff options
| -rw-r--r-- | configs/shared/.zsh_profile | 34 | ||||
| -rwxr-xr-x | emacs/index.sh | 16 |
2 files changed, 17 insertions, 33 deletions
diff --git a/configs/shared/.zsh_profile b/configs/shared/.zsh_profile index f533036acf9f..2d7de0ec2ce8 100644 --- a/configs/shared/.zsh_profile +++ b/configs/shared/.zsh_profile @@ -1,52 +1,23 @@ export PATH=$HOME/bin:/opt/local/bin:/opt/local/sbin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/opt/fzf/bin:$HOME/n/bin:$HOME/.cargo/bin -# Have zsh export variables for Emacs to track the cwd -if [ -n "$INSIDE_EMACS" ]; then - chpwd() { print -P "\033AnSiTc %d" } - print -P "\033AnSiTu %n" - print -P "\033AnSiTc %d" -fi - -# make vim the default editor for commit messages etc -export EDITOR=$(which vim) - - -# update prompt to save space -PS1="${PS1} - " - - -echo "Welcome back, $USER" - - -# display the space available on each mounted Volume -df -hl +# minimalistic theme +ZSH_THEME="spaceship" # use emacs bindings (default) for terminal input set -o emacs -# aliases source $HOME/pc_settings/aliases.sh - -# functions source $HOME/pc_settings/functions/index.sh - -# setup keybindings for history functions source $HOME/pc_settings/scripts/setup_keybindings.sh - -# setup emacs + shell configuration source $HOME/pc_settings/emacs/index.sh -# BEGIN: bindkeys bindkey "^R" history-incremental-search-backward -bindkey -M viins 'jk' vi-cmd-mode -# END: bindkeys # export docker env variables # re-enable this line when using docker otherwise you will receive @@ -69,6 +40,7 @@ stty -ixon export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -l -g ""' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" + # CTRL-Y - Paste the selected branch(es) into the command line __bsel() { local cmd="git branch -a | tr -d '* ' | sed 's/^remotes\/origin\///' | sort | uniq" diff --git a/emacs/index.sh b/emacs/index.sh index e794c24ae942..d80372eba312 100755 --- a/emacs/index.sh +++ b/emacs/index.sh @@ -1,6 +1,15 @@ #!/usr/bin/env zsh +# Have zsh export variables for Emacs to track the cwd +if [ -n "$INSIDE_EMACS" ]; then + chpwd() { print -P "\033AnSiTc %d" } + print -P "\033AnSiTu %n" + print -P "\033AnSiTc %d" +fi + + +# Custom emacs pager support if [ -n "$INSIDE_EMACS" ]; then export PAGER="create-shell-pager.sh" else @@ -8,22 +17,25 @@ else fi +# Edit commit messages, etc from ansi-term in emacs if [ -n "$INSIDE_EMACS" ]; then export EDITOR="edit-file-in-emacs.sh" else - export EDITOR="command nvim" + export EDITOR="command vim" fi +# Calls to vim from within ansi-term trigger emacs find-file vim () { if [ -n "$INSIDE_EMACS" ]; then emacsclient -e "(find-file-other-window \"$1\")" else - nvim "$1" + command vim "$1" fi } +# Calls to man from within ansi-term trigger emacs man man () { if [ -n "$INSIDE_EMACS" ]; then emacsclient -e "(man \"$1\")" |