dot

packages and services management
Log | Files | Refs | README

commit 16c1add1a0bc9d5162a43b32f3f41187c8343eee
parent 5271295b33665b1552776de405a722ef9ddf5772
Author: josuah <mail@josuah.net>
Date:   Tue,  4 Oct 2016 00:57:13 -0400

Added change to tmux

Diffstat:
Aag/build.sh | 3+++
Mbin/src | 21++++++++++++---------
Mshell/.profile | 83+++++++++++++++++++++++++++++++++++++++++++++----------------------------------
Mtmux/.tmux.conf | 25+++++++++++++++++--------
Mtmux/build.sh | 2+-
Mvim/.vim/vimrc | 5+++--
6 files changed, 83 insertions(+), 56 deletions(-)

diff --git a/ag/build.sh b/ag/build.sh @@ -0,0 +1,3 @@ +# The silver searcher + +tar=http://geoff.greer.fm/ag/releases/the_silver_searcher-0.33.0.tar.gz diff --git a/bin/src b/bin/src @@ -157,14 +157,17 @@ do esac done -info "Updating index in $PREFIX. This may take a few seconds..." +index() +{ + info "Updating index in $PREFIX. This may take a few seconds..." -find "$PREFIX" -type l -delete; + find "$PREFIX" -type l -delete; -find "$PROGRAMS" -mindepth 2 ! -path "*/src*" | while read path -do - if [ -d "$path" ] - then mkdir -p "$PREFIX/${path#$PROGRAMS/*/}" - else ln -sf "$path" "$PREFIX/${path#$PROGRAMS/*/}" - fi -done + find "$PROGRAMS" -mindepth 2 ! -path "*/src*" | while read path + do + if [ -d "$path" ] + then mkdir -p "$PREFIX/${path#$PROGRAMS/*/}" + else ln -sf "$path" "$PREFIX/${path#$PROGRAMS/*/}" + fi + done +} diff --git a/shell/.profile b/shell/.profile @@ -7,9 +7,17 @@ #\/============================================================================= +# Only load the .profile once +[ "$PREFIX_LOADED" = 1 ] && return 0 +export PROFILE_LOADED=1 + + # VARIABLES #------------------------------------------------------------------------------- +export PS1='$(ps1)' +export PS2='| ' + export PATH="$CONFIG/bin:$PREFIX/bin:$PATH" solarized_light="\ @@ -30,8 +38,39 @@ coal="\ \033]P8555555 \033]P9ff6666 \033]PAaaff66 \033]PBffff99\ \033]PCaaddff \033]PDaaaaaa \033]PE99ffbb \033]PFffffff" +# Parse and merge ~/.pam_environment +[ -z "$CONFIG" ] && tee << EOF +$(sed -r ' + /^ *#/ d + /^ *$/ d + s/@/$/g + s/ *([^ ]*) *[^ ]*=/\1=/ +' ~/.pam_environment) +EOF + + +# ALIAS +#------------------------------------------------------------------------------- -# PROMPT +alias l='ls -F -w 80 --color' +alias ll='l -lh' +alias la='l -A' +alias lla='l -Alh' +alias v='$VISUAL' +alias p='$PAGER' +alias t='tmux attach || tmux' +alias f='find . -type f ! -path "*/.git/*" | fzf' +alias d='find . -type d ! -path "*/.git/*" | fzf' +alias c='cd "$(find . -maxdepth 4 -mindepth 1 -type d | fzf)"' +alias a='buffers attach' +alias r='buffers run' +alias g='grep --color=always' +alias weather='curl -4 wttr.in' +alias lines='find . -name "*.[ch]" | xargs wc -l' +alias myip='curl icanhazip.com' + + +# FUNCTIONS #------------------------------------------------------------------------------- ps1() @@ -71,40 +110,12 @@ ps1() fi # Non printable: terminal status, bell, empty line at the bottom. - printf '\a\033]0;shell\007\033[s\n\n\033[2A' + printf '\a' #\n\n\033[2A' # Last line for prompt printf '\n$ ' } -export PS1='$(ps1)' -export PS2='| ' - - -# ALIAS -#------------------------------------------------------------------------------- - -alias l='ls -F -w 80 --color' -alias ll='l -lh' -alias la='l -A' -alias lla='l -Alh' -alias v='$VISUAL' -alias p='$PAGER' -alias t='tmux attach || tmux' -alias f='find . -type f ! -path "*/.git/*" | fzf' -alias d='find . -type d ! -path "*/.git/*" | fzf' -alias c='cd "$(d)"' -alias a='buffers attach' -alias r='buffers run' -alias g='grep --color=always' -alias weather='curl -4 wttr.in' -alias lines='find . -name "*.[ch]" | xargs wc -l' -alias myip='curl icanhazip.com' - - -# FUNCTIONS -#------------------------------------------------------------------------------- - h() { for field in $@; do local cmd="$cmd $field"; done @@ -253,11 +264,11 @@ rotate() } -# TTY SETUP +# STARTUP #------------------------------------------------------------------------------- -if [ "$TERM" = 'linux' ] -then - printf "$coal" # Theme - printf '\033[?6;c' # Cursor style -fi +#if [ "$TERM" = 'linux' ] +#then +# printf "$coal" # Theme +# printf '\033[?6;c' # Cursor style +#fi diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf @@ -2,13 +2,17 @@ # / /_ ________ __ /\ __ __ # / ___\/ __ __ \ / / / / \ \' / # / / / / / / / // /_/ / ,' ,' -# \/ \/ \/ \/ \____/ /_,\_\ 2016-09-21 +# \/ \/ \/ \/ \____/ /_,\_\ 2016-10-03 #=============================================================================== -set -g base-index 1 -set -g pane-base-index 1 -set -g renumber-windows on -set -g detach-on-destroy off + +# GLOBAL OPTIONS 2016-10-03 +#------------------------------------------------------------------------------- +set -g base-index 1 +set -g pane-base-index 1 +set -g renumber-windows on +set -g display-time 2000 +set -g detach-on-destroy off # KEYBINDINGS 2016-09-21 @@ -71,9 +75,10 @@ set -g message-attr bright set -g display-panes-colour red -# STATUS +# STATUS 2016-10-03 +#------------------------------------------------------------------------------- -set -g status-position bottom +set -g status-position top set -g status-keys vi set -g status-justify centre @@ -102,8 +107,12 @@ set -g window-status-activity-fg yellow set -g window-status-activity-bg white -# BORDERS 2016-09-21 +# BORDERS 2016-10-03 #------------------------------------------------------------------------------- +set -g pane-border-style bold set -g pane-border-fg white +set -g pane-active-border-style bold set -g pane-active-border-fg green +set -g pane-border-status top +set -g pane-border-format " #{pane_index} #{pane_current_command} " diff --git a/tmux/build.sh b/tmux/build.sh @@ -1,6 +1,6 @@ # Terminal multiplexer that rocks -tar=http://github.com/tmux/tmux/releases/download/2.2/tmux-2.2.tar.gz +tar=http://github.com/tmux/tmux/releases/download/2.3/tmux-2.3.tar.gz build() { diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc @@ -14,10 +14,11 @@ syntax enable | filetype plugin on | set nocompatible set omnifunc=syntaxcomplete#Complete " Completion set autoindent copyindent " Indentation -set laststatus=2 ruler showcmd " Status +set laststatus=1 showcmd " Status +set ruler "rulerformat=%=%P set smartcase ignorecase showmatch incsearch " Searching set list listchars=tab::\ ,trail:.,nbsp:.,extends:>,precedes:< " Listchars -set fillchars=stl:_,stlnc:_,vert:: " Fillchars +set fillchars=stl:─,stlnc:─,vert:: " Fillchars set number numberwidth=1 cursorline nowrap " Interface set scrolloff=3 " Scroll set backupdir=~/.cache/vim// directory=~/.cache/vim// undodir=~/.cache/vim//