Jonathan
7 years ago
commit
1f1c86140c
110 changed files with 304 additions and 3638 deletions
@ -1 +0,0 @@ |
|||||||
bash_logout |
|
||||||
@ -1 +0,0 @@ |
|||||||
bash_profile |
|
||||||
@ -1 +0,0 @@ |
|||||||
gitconfig |
|
||||||
@ -1,6 +1,9 @@ |
|||||||
[submodule "config/vim"] |
[submodule "config/vim"] |
||||||
path = config/vim |
path = vim |
||||||
url = git@github.com:Jab2870/vim.git |
url = git@github.com:Jab2870/vim.git |
||||||
[submodule "custom-oh-my-zsh/themes/powerlevel9k"] |
[submodule "custom-oh-my-zsh/themes/powerlevel9k"] |
||||||
path = custom-oh-my-zsh/themes/powerlevel9k |
path = custom-oh-my-zsh/themes/powerlevel9k |
||||||
url = https://github.com/bhilburn/powerlevel9k.git |
url = https://github.com/bhilburn/powerlevel9k.git |
||||||
|
[submodule "shells/zsh/zsh-syntax-highlighting"] |
||||||
|
path = shells/zsh/zsh-syntax-highlighting |
||||||
|
url = https://github.com/zsh-users/zsh-syntax-highlighting.git |
||||||
|
|||||||
@ -1,3 +0,0 @@ |
|||||||
# |
|
||||||
# ~/.bash_logout |
|
||||||
# |
|
||||||
@ -1,31 +0,0 @@ |
|||||||
# |
|
||||||
# ~/.bash_profile |
|
||||||
# |
|
||||||
|
|
||||||
|
|
||||||
[[ -f ~/.bashrc ]] && . ~/.bashrc |
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export TERMINAL=/usr/bin/konsole |
|
||||||
export TERM=xterm-256color |
|
||||||
export PATH=~/.bin:$PATH:/opt/lampp/bin:. |
|
||||||
export EDITOR='vim --servername jab2870' |
|
||||||
export CDPATH=.:~:~/Sites |
|
||||||
|
|
||||||
#Ruby things |
|
||||||
GEM_HOME=$(ls -t -U | ruby -e 'puts Gem.user_dir') |
|
||||||
GEM_PATH=$GEM_HOME |
|
||||||
export PATH=$PATH:$GEM_HOME/bin |
|
||||||
export GEM_HOME=$(ruby -e 'print Gem.user_dir') |
|
||||||
|
|
||||||
|
|
||||||
# tab completion for ssh hosts |
|
||||||
complete -o default -o nospace -W "$(/usr/bin/env ruby -ne 'puts $_.split(/[,\s]+/)[1..-1].reject{|host| host.match(/\*|\?/)} if $_.match(/^\s*Host\s+/);' < $HOME/.ssh/config)" scp sftp ssh |
|
||||||
|
|
||||||
#echo -e "Please don't sabotage my computer while I'm away \n\nTo turn on the print server, run the command 'cups'\n\nTo update 3d party plugins, run command 'u3p'" | /usr/bin/cowsay -f tux -W 80 |
|
||||||
|
|
||||||
|
|
||||||
[ -r "$HOME/.smartcd_config" ] && ( [ -n $BASH_VERSION ] || [ -n $ZSH_VERSION ] ) && source ~/.smartcd_config |
|
||||||
|
|
||||||
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function* |
|
||||||
@ -1,367 +0,0 @@ |
|||||||
# |
|
||||||
# ~/.bashrc |
|
||||||
# |
|
||||||
|
|
||||||
# If not running interactively, don't do anything |
|
||||||
[[ $- != *i* ]] && return |
|
||||||
|
|
||||||
|
|
||||||
big-chromium () { |
|
||||||
chromium --force-device-scale-factor=$1 |
|
||||||
} |
|
||||||
|
|
||||||
big-new-chromium () { |
|
||||||
chromium-snapshot-bin --force-device-scale-factor=$1 |
|
||||||
} |
|
||||||
|
|
||||||
#Swap two files |
|
||||||
function swap() { |
|
||||||
mv $1 $1._tmp; |
|
||||||
mv $2 $1; |
|
||||||
mv $1._tmp $2; |
|
||||||
} |
|
||||||
|
|
||||||
function old() { |
|
||||||
mv "$1" "$1.old" |
|
||||||
} |
|
||||||
|
|
||||||
#This prints the current working directory after doing a cd" |
|
||||||
cdls(){ |
|
||||||
cd "$@" |
|
||||||
ls -F --color=always |
|
||||||
} |
|
||||||
|
|
||||||
#Takes you to the aquarius theme |
|
||||||
function aquarius() { |
|
||||||
public_html=${PWD%/public_html*}/public_html |
|
||||||
if [ -d $public_html ]; then |
|
||||||
theme=$public_html/wp-content/themes |
|
||||||
if [ -d $theme ]; then |
|
||||||
cdls $theme/aquarius |
|
||||||
else |
|
||||||
echo " Can't find theme folder " |
|
||||||
fi |
|
||||||
else |
|
||||||
echo " Can't find public_html folder." |
|
||||||
fi |
|
||||||
} |
|
||||||
|
|
||||||
#Takes you to the child theme |
|
||||||
function theme() { |
|
||||||
public_html=${PWD%/public_html*}/public_html |
|
||||||
if [ -d $public_html ]; then |
|
||||||
theme=$public_html/wp-content/themes |
|
||||||
if [ -d $theme ]; then |
|
||||||
child=$(ls -d $theme/*/ | grep -v "$theme\/aquarius" | grep -v "$theme\/twenty*" | grep -v "$theme\/barelycorporate" -m 1) |
|
||||||
cdls $child |
|
||||||
else |
|
||||||
echo " Can't find theme folder " |
|
||||||
fi |
|
||||||
else |
|
||||||
echo " Can't find public_html folder." |
|
||||||
fi |
|
||||||
} |
|
||||||
|
|
||||||
######################################## |
|
||||||
## ## |
|
||||||
## Search Functions ## |
|
||||||
## ## |
|
||||||
######################################## |
|
||||||
|
|
||||||
#These search functions use grep to search all sub-folders of the current working directory |
|
||||||
searchjs() { |
|
||||||
# This will search through .js and .es6 files but won't search minified files |
|
||||||
grep -r -i -n --color="always" --include=\*.{js,es6} --exclude=\*.min.js "$1" . |
|
||||||
} |
|
||||||
searchcss() { |
|
||||||
# This will search through .css and .less files but won't search minified files |
|
||||||
grep -r -i -n --color="always" --include=\*.{css,less,scss,sass} --exclude=\*.min.css "$1" . |
|
||||||
} |
|
||||||
searchphp() { |
|
||||||
grep -r -i -n --color="always" --include="*.php" "$1" . |
|
||||||
} |
|
||||||
|
|
||||||
# This makes cd use function above |
|
||||||
alias cd="cdls" |
|
||||||
|
|
||||||
# These alow me to easily set the file and folder permissions for a wordpress instilation. |
|
||||||
alias folder-perms='find . -type d -not -path "./.git/*" -not -path "./.git" -exec chmod 775 {} \;' |
|
||||||
alias file-perms='find . -type f -not -path "./.git/*" -not -path "./.git" -exec chmod 664 {} \;' |
|
||||||
alias wp-perms='folder-perms; file-perms' |
|
||||||
alias magentoPerms='cd ${PWD%/public_html*}/public_html;sudo chown -R jonathan:http .; folder-perms; file-perms; chmod +x bin/magento; cd -' |
|
||||||
# |
|
||||||
# Make ls add Indicator#s to file names and colour the output |
|
||||||
alias ls='ls -F --color=auto' |
|
||||||
|
|
||||||
# Make tree add indicators and color |
|
||||||
alias tree='tree -F -C' |
|
||||||
|
|
||||||
#Start cups |
|
||||||
alias cups='sudo systemctl start org.cups.cupsd.service' |
|
||||||
|
|
||||||
#Start network manager |
|
||||||
alias net='sudo systemctl start NetworkManager.service' |
|
||||||
|
|
||||||
# Alias lampp because I don't want to clog my PATH |
|
||||||
alias lampp='/opt/lampp/lampp' |
|
||||||
alias glampp='gksudo /opt/lampp/manager-linux-x64.run' |
|
||||||
alias php='/opt/lampp/bin/php' |
|
||||||
alias php-cgi='/opt/lampp/bin/php-cgi' |
|
||||||
alias php-config='/opt/lampp/bin/php-config' |
|
||||||
|
|
||||||
#Always make all directories necesary |
|
||||||
alias mkdir='mkdir -p' |
|
||||||
|
|
||||||
# Shortcut for rewriting wp permalinks |
|
||||||
alias perms='wp rewrite flush' |
|
||||||
|
|
||||||
#Clear terminal and screenfetch |
|
||||||
alias cls='clear; screenfetch' |
|
||||||
|
|
||||||
#An alias for my standard less configuration |
|
||||||
#I don't set it to lessc because sometimes I don't use this config and I always forget how to ignore an alias |
|
||||||
#alias myless='lessc --clean-css --source-map-basepath=/home/jonathan/Sites/charts/public_html --source-map --autoprefix="last 3 versions, ie >= 9" styles.less styles.min.css' |
|
||||||
alias myless='lessc --clean-css --source-map --autoprefix="last 3 versions, ie >= 9" styles.less styles.min.css' |
|
||||||
|
|
||||||
# Git shortcuts |
|
||||||
alias status='git status ' |
|
||||||
alias st='git status' |
|
||||||
alias checkout='git checkout' |
|
||||||
alias ch='git checkout' |
|
||||||
alias push='git push ' |
|
||||||
alias pull='git pull ' |
|
||||||
alias bb='git open' |
|
||||||
|
|
||||||
# Always make grep ouput color |
|
||||||
alias grep="grep --color=auto" |
|
||||||
|
|
||||||
# Shortcuts to sites folder |
|
||||||
alias sites="cd ~/Sites" |
|
||||||
alias s="cd ~/Sites" |
|
||||||
|
|
||||||
# Shortcuts to documents folder |
|
||||||
alias documents="cd ~/Documents/" |
|
||||||
alias d="cd ~/Documents/" |
|
||||||
|
|
||||||
# Shortcuts to home folder |
|
||||||
alias home="cd ~/" |
|
||||||
alias ~="cd ~/" |
|
||||||
|
|
||||||
#Goes up to the public_html folder |
|
||||||
alias ph='cd ${PWD%/public_html*}/public_html' |
|
||||||
|
|
||||||
# Quit the terminal using :q (The same as Vi/Vim) |
|
||||||
alias :q='exit;' |
|
||||||
|
|
||||||
# Not sure why and how but this makes sudo work with my aliases |
|
||||||
alias sudo='sudo ' |
|
||||||
|
|
||||||
#Make the cal command default to start on Sunday |
|
||||||
alias cal='cal -s' |
|
||||||
|
|
||||||
# update the third party wordpress plugins we are mirroring |
|
||||||
alias u3p='update3rdPartyPlugins' |
|
||||||
|
|
||||||
# Edit my bashrc |
|
||||||
alias brc='$EDITOR ~/.bashrc' |
|
||||||
|
|
||||||
# Edit my vimrc |
|
||||||
alias vrc='$EDITOR ~/.vimrc' |
|
||||||
|
|
||||||
# Go to my .vim folder |
|
||||||
alias .v='cd ~/.vim/' |
|
||||||
# Go to my dotfiles folder |
|
||||||
#if [[ $(hostname) == "jonathansnuc" ]]; then |
|
||||||
# #Please don't judge - This is a reminant from first days of version controlling dotfiles |
|
||||||
# alias df='cd ~/Downloads/laptopConfig/' |
|
||||||
#else |
|
||||||
alias df='cd ~/.dotfiles' |
|
||||||
#fi |
|
||||||
|
|
||||||
#Make vim start in server mode |
|
||||||
alias vim='vim --servername jab2870' |
|
||||||
|
|
||||||
# moon phase |
|
||||||
alias moonphase='weather moon' |
|
||||||
|
|
||||||
#Radio Stations |
|
||||||
AUDIO=mpv |
|
||||||
alias radio2="$AUDIO http://a.files.bbci.co.uk/media/live/manifesto/audio/simulcast/hls/uk/sbr_med/llnw/bbc_radio_two.m3u8" |
|
||||||
alias radio4="$AUDIO http://a.files.bbci.co.uk/media/live/manifesto/audio/simulcast/hls/uk/sbr_med/llnw/bbc_radio_fourfm.m3u8" |
|
||||||
alias classic="$AUDIO http://icy-e-bab-04-cr.sharp-stream.com/absoluteradio.mp3" |
|
||||||
alias absolute="$AUDIO http://network.absoluteradio.co.uk/core/audio/mp3/live.pls?service=vrbb" |
|
||||||
|
|
||||||
alias bs="curl -s http://cbsg.sourceforge.net/cgi-bin/live | grep -Eo '^<li>.*</li>' | sed s,\\</\\\\?li\\>,,g | shuf -n 1 | cowsay" |
|
||||||
|
|
||||||
alias jq="jq -C" |
|
||||||
|
|
||||||
alias debugBuild='node --inspect-brk /usr/bin/grunt build' |
|
||||||
|
|
||||||
#alias xkcd='curl https://xkcd.com/info.0.json 2> /dev/null| \jq ".img" | xargs feh' |
|
||||||
|
|
||||||
#Old ps1 |
|
||||||
#PS1='[\u@\h \W]\$ ' |
|
||||||
|
|
||||||
|
|
||||||
# bash completion for the `wp` command |
|
||||||
_wp_complete() { |
|
||||||
local OLD_IFS="$IFS" |
|
||||||
local cur=${COMP_WORDS[COMP_CWORD]} |
|
||||||
IFS=$'\n'; # want to preserve spaces at the end |
|
||||||
local opts="$(wp cli completions --line="$COMP_LINE" --point="$COMP_POINT")" |
|
||||||
if [[ "$opts" =~ \<file\>\s* ]] |
|
||||||
then |
|
||||||
COMPREPLY=( $(compgen -f -- $cur) ) |
|
||||||
elif [[ $opts = "" ]] |
|
||||||
then |
|
||||||
COMPREPLY=( $(compgen -f -- $cur) ) |
|
||||||
else |
|
||||||
COMPREPLY=( ${opts[*]} ) |
|
||||||
fi |
|
||||||
IFS="$OLD_IFS" |
|
||||||
return 0 |
|
||||||
} |
|
||||||
complete -o nospace -F _wp_complete wp |
|
||||||
|
|
||||||
export GIT_PS1_SHOWDIRTYSTATE=1 # Show the +(Staged) or *(unstaged) next to branch name for |
|
||||||
export GIT_PS1_SHOWUNTRACKEDFILES=1 # Show the %(Untracked) next to branch name |
|
||||||
export GIT_PS1_SHOWUPSTREAM="auto" |
|
||||||
|
|
||||||
source /usr/share/git/completion/git-completion.bash |
|
||||||
source /usr/share/git/completion/git-prompt.sh |
|
||||||
|
|
||||||
source $HOME/.dotfiles/t-completion.sh |
|
||||||
|
|
||||||
|
|
||||||
############################################ |
|
||||||
## ## |
|
||||||
## Colours for output ## |
|
||||||
## ## |
|
||||||
############################################ |
|
||||||
#{{{ |
|
||||||
# Reset |
|
||||||
Color_Off="\[\033[0m\]" # Text Reset |
|
||||||
|
|
||||||
# Regular Colors |
|
||||||
Black="\[\033[0;30m\]" # Black |
|
||||||
Red="\[\033[0;31m\]" # Red |
|
||||||
Green="\[\033[0;32m\]" # Green |
|
||||||
Yellow="\[\033[0;33m\]" # Yellow |
|
||||||
Blue="\[\033[0;34m\]" # Blue |
|
||||||
Purple="\[\033[0;35m\]" # Purple |
|
||||||
Cyan="\[\033[0;36m\]" # Cyan |
|
||||||
White="\[\033[0;37m\]" # White |
|
||||||
|
|
||||||
# Bold |
|
||||||
BBlack="\[\033[1;30m\]" # Black |
|
||||||
BRed="\[\033[1;31m\]" # Red |
|
||||||
BGreen="\[\033[1;32m\]" # Green |
|
||||||
BYellow="\[\033[1;33m\]" # Yellow |
|
||||||
BBlue="\[\033[1;34m\]" # Blue |
|
||||||
BPurple="\[\033[1;35m\]" # Purple |
|
||||||
BCyan="\[\033[1;36m\]" # Cyan |
|
||||||
BWhite="\[\033[1;37m\]" # White |
|
||||||
|
|
||||||
# Underline |
|
||||||
UBlack="\[\033[4;30m\]" # Black |
|
||||||
URed="\[\033[4;31m\]" # Red |
|
||||||
UGreen="\[\033[4;32m\]" # Green |
|
||||||
UYellow="\[\033[4;33m\]" # Yellow |
|
||||||
UBlue="\[\033[4;34m\]" # Blue |
|
||||||
UPurple="\[\033[4;35m\]" # Purple |
|
||||||
UCyan="\[\033[4;36m\]" # Cyan |
|
||||||
UWhite="\[\033[4;37m\]" # White |
|
||||||
|
|
||||||
# Background |
|
||||||
On_Black="\[\033[40m\]" # Black |
|
||||||
On_Red="\[\033[41m\]" # Red |
|
||||||
On_Green="\[\033[42m\]" # Green |
|
||||||
On_Yellow="\[\033[43m\]" # Yellow |
|
||||||
On_Blue="\[\033[44m\]" # Blue |
|
||||||
On_Purple="\[\033[45m\]" # Purple |
|
||||||
On_Cyan="\[\033[46m\]" # Cyan |
|
||||||
On_White="\[\033[47m\]" # White |
|
||||||
|
|
||||||
# High Intensty |
|
||||||
IBlack="\[\033[0;90m\]" # Black |
|
||||||
IRed="\[\033[0;91m\]" # Red |
|
||||||
IGreen="\[\033[0;92m\]" # Green |
|
||||||
IYellow="\[\033[0;93m\]" # Yellow |
|
||||||
IBlue="\[\033[0;94m\]" # Blue |
|
||||||
IPurple="\[\033[0;95m\]" # Purple |
|
||||||
ICyan="\[\033[0;96m\]" # Cyan |
|
||||||
IWhite="\[\033[0;97m\]" # White |
|
||||||
|
|
||||||
# Bold High Intensty |
|
||||||
BIBlack="\[\033[1;90m\]" # Black |
|
||||||
BIRed="\[\033[1;91m\]" # Red |
|
||||||
BIGreen="\[\033[1;92m\]" # Green |
|
||||||
BIYellow="\[\033[1;93m\]" # Yellow |
|
||||||
BIBlue="\[\033[1;94m\]" # Blue |
|
||||||
BIPurple="\[\033[1;95m\]" # Purple |
|
||||||
BICyan="\[\033[1;96m\]" # Cyan |
|
||||||
BIWhite="\[\033[1;97m\]" # White |
|
||||||
|
|
||||||
# High Intensty backgrounds |
|
||||||
On_IBlack="\[\033[0;100m\]" # Black |
|
||||||
On_IRed="\[\033[0;101m\]" # Red |
|
||||||
On_IGreen="\[\033[0;102m\]" # Green |
|
||||||
On_IYellow="\[\033[0;103m\]" # Yellow |
|
||||||
On_IBlue="\[\033[0;104m\]" # Blue |
|
||||||
On_IPurple="\[\033[10;95m\]" # Purple |
|
||||||
On_ICyan="\[\033[0;106m\]" # Cyan |
|
||||||
On_IWhite="\[\033[0;107m\]" # White |
|
||||||
#}}} |
|
||||||
# Various variables you might want for your PS1 prompt instead |
|
||||||
Time12h="\T" |
|
||||||
Time12a="\@" |
|
||||||
PathShort="\w" |
|
||||||
PathFull="\W" |
|
||||||
NewLine="\n" |
|
||||||
Jobs="\j" |
|
||||||
Username="\u" |
|
||||||
|
|
||||||
# Default PS1 |
|
||||||
# \u@\h [\w]$ |
|
||||||
export PS1=$Username" "$Yellow$PathShort$Color_Off'$(git branch &>/dev/null;\ |
|
||||||
if [ $? -eq 0 ]; then \ |
|
||||||
echo "$(echo `git status` | grep "nothing to commit" > /dev/null 2>&1; \ |
|
||||||
if [ "$?" -eq "0" ]; then \ |
|
||||||
echo "'$Green'"$(__git_ps1 " (%s)");\ |
|
||||||
else \ |
|
||||||
echo "'$Red'"$(__git_ps1 " (%s)");\ |
|
||||||
fi)"; \ |
|
||||||
fi)'$Color_Off'\$ ' |
|
||||||
|
|
||||||
# export PS1="\[\033[0;97m\]\u \[\033[0;33m\]\w"'$(git branch &>/dev/null;\ |
|
||||||
# if [ $? -eq 0 ]; then \ |
|
||||||
# echo "$(echo `git status` | grep "nothing to commit" > /dev/null 2>&1; \ |
|
||||||
# if [ "$?" -eq "0" ]; then \ |
|
||||||
# echo "\[\033[0;32m\]"$(__git_ps1 " (%s)");\ |
|
||||||
# else \ |
|
||||||
# echo "\[\033[0;91m\]"$(__git_ps1 " (%s)");\ |
|
||||||
# fi)"; \ |
|
||||||
# fi)\[\033[0m\]\$ ' |
|
||||||
function _update_ps1() { |
|
||||||
export PS1="$(~/.config/powerline-shell/powerline-shell.py $? 2> /dev/null)" |
|
||||||
} |
|
||||||
|
|
||||||
if [ "$TERM" != "linux" ]; then |
|
||||||
PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND" |
|
||||||
fi |
|
||||||
|
|
||||||
[ -r "$HOME/.smartcd_config" ] && ( [ -n $BASH_VERSION ] || [ -n $ZSH_VERSION ] ) && source ~/.smartcd_config |
|
||||||
|
|
||||||
#If on work computer, cd into sites |
|
||||||
|
|
||||||
#Add tab completeion to sudo commands |
|
||||||
complete -cf sudo |
|
||||||
|
|
||||||
clear |
|
||||||
#screenfetch |
|
||||||
#set -o vi |
|
||||||
|
|
||||||
# vim: foldmethod=marker |
|
||||||
|
|
||||||
# Add RVM to PATH for scripting. Make sure this is the last PATH variable change. |
|
||||||
export PATH="$PATH:$HOME/.rvm/bin" |
|
||||||
File diff suppressed because one or more lines are too long
@ -1 +0,0 @@ |
|||||||
*.creds |
|
||||||
@ -1,44 +0,0 @@ |
|||||||
# Source the credentials file (Not in git repo) |
|
||||||
source ./account.jonathan.creds |
|
||||||
|
|
||||||
#IMAP |
|
||||||
set imap_user=$my_user |
|
||||||
set imap_pass=$my_pass |
|
||||||
set folder=imaps://$my_user@imap.1and1.co.uk:993 |
|
||||||
|
|
||||||
#SMTP |
|
||||||
set realname = 'Jonathan Hodgson' |
|
||||||
set from = jonathan@lunarweb.co.uk |
|
||||||
set use_from = yes |
|
||||||
|
|
||||||
set smtp_url=smtps://$my_user:$my_pass@auth.smtp.1and1.co.uk |
|
||||||
set ssl_force_tls = yes |
|
||||||
|
|
||||||
# The main folder |
|
||||||
set spoolfile = "+INBOX" |
|
||||||
|
|
||||||
# Check all mail boxes |
|
||||||
set imap_check_subscribed |
|
||||||
|
|
||||||
# Store message headers locally to speed things up. |
|
||||||
# If hcache is a folder, Mutt will create sub cache folders for each account which may speeds things up even more. |
|
||||||
set header_cache = ~/.cache/mutt/jonathan.fellowshipproductions/headers |
|
||||||
|
|
||||||
# Store messages locally to speed things up, like searching message bodies. |
|
||||||
# Can be the same folder as header_cache. |
|
||||||
# This will cost important disk usage according to your e-mail amount. |
|
||||||
set message_cachedir = ~/.cache/mutt/jonathan.fellowshipproductions/bodies |
|
||||||
|
|
||||||
# Specify where to save and/or look for postponed messages. |
|
||||||
set postponed = +Drafts |
|
||||||
|
|
||||||
# Allow Mutt to open a new IMAP connection automatically. |
|
||||||
unset imap_passive |
|
||||||
|
|
||||||
# Keep the IMAP connection alive by polling intermittently (time in seconds). |
|
||||||
set imap_keepalive = 300 |
|
||||||
|
|
||||||
# How often to check for new mail (time in seconds). |
|
||||||
set mail_check = 120 |
|
||||||
|
|
||||||
set record = +Sent%20Items |
|
||||||
@ -1,7 +0,0 @@ |
|||||||
text/html; w3m -I %{charset} -T text/html; copiousoutput; |
|
||||||
|
|
||||||
text/html; mv %s %s.html && qutebrowser %s.html > /dev/null; needsterminal; |
|
||||||
|
|
||||||
image/*; ~/.config/mutt/muttimage.sh %s ; copiousoutput |
|
||||||
|
|
||||||
application/*; xdg-open %s & ; copiousoutput |
|
||||||
@ -1,151 +0,0 @@ |
|||||||
# vim: filetype=muttrc |
|
||||||
|
|
||||||
# |
|
||||||
# |
|
||||||
# make sure that you are using mutt linked against slang, not ncurses, or |
|
||||||
# suffer the consequences of weird color issues. use "mutt -v" to check this. |
|
||||||
|
|
||||||
# custom body highlights ----------------------------------------------- |
|
||||||
# highlight my name and other personally relevant strings |
|
||||||
#color body yellow default "(ethan|schoonover)" |
|
||||||
# custom index highlights ---------------------------------------------- |
|
||||||
# messages which mention my name in the body |
|
||||||
#color index yellow default "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P" |
|
||||||
#color index J_cream brightwhite "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P" |
|
||||||
#color index yellow cyan "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P" |
|
||||||
#color index yellow J_magent "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P" |
|
||||||
## messages which are in reference to my mails |
|
||||||
#color index J_magent default "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P" |
|
||||||
#color index J_magent brightwhite "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P" |
|
||||||
#color index J_magent cyan "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P" |
|
||||||
#color index J_magent red "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P" |
|
||||||
|
|
||||||
# for background in 16 color terminal, valid background colors include: |
|
||||||
# base03, bg, black, any of the non brights |
|
||||||
|
|
||||||
# basic colors --------------------------------------------------------- |
|
||||||
color normal brightyellow default |
|
||||||
color error red default |
|
||||||
color tilde black default |
|
||||||
color message cyan default |
|
||||||
color markers red white |
|
||||||
color attachment white default |
|
||||||
color search brightmagenta default |
|
||||||
#color status J_black J_status |
|
||||||
color status brightyellow black |
|
||||||
color indicator brightblack yellow |
|
||||||
color tree yellow default # arrow in threads |
|
||||||
|
|
||||||
# basic monocolor screen |
|
||||||
mono bold bold |
|
||||||
mono underline underline |
|
||||||
mono indicator reverse |
|
||||||
mono error bold |
|
||||||
|
|
||||||
# index ---------------------------------------------------------------- |
|
||||||
|
|
||||||
#color index red default "~D(!~p|~p)" # deleted |
|
||||||
#color index black default ~F # flagged |
|
||||||
#color index brightred default ~= # duplicate messages |
|
||||||
#color index brightgreen default "~A!~N!~T!~p!~Q!~F!~D!~P" # the rest |
|
||||||
#color index J_base default "~A~N!~T!~p!~Q!~F!~D" # the rest, new |
|
||||||
color index red default "~A" # all messages |
|
||||||
color index brightred default "~E" # expired messages |
|
||||||
color index blue default "~N" # new messages |
|
||||||
color index blue default "~O" # old messages |
|
||||||
color index brightmagenta default "~Q" # messages that have been replied to |
|
||||||
color index brightgreen default "~R" # read messages |
|
||||||
color index blue default "~U" # unread messages |
|
||||||
color index blue default "~U~$" # unread, unreferenced messages |
|
||||||
color index brightyellow default "~v" # messages part of a collapsed thread |
|
||||||
color index brightyellow default "~P" # messages from me |
|
||||||
color index cyan default "~p!~F" # messages to me |
|
||||||
color index cyan default "~N~p!~F" # new messages to me |
|
||||||
color index cyan default "~U~p!~F" # unread messages to me |
|
||||||
color index brightgreen default "~R~p!~F" # messages to me |
|
||||||
color index red default "~F" # flagged messages |
|
||||||
color index red default "~F~p" # flagged messages to me |
|
||||||
color index red default "~N~F" # new flagged messages |
|
||||||
color index red default "~N~F~p" # new flagged messages to me |
|
||||||
color index red default "~U~F~p" # new flagged messages to me |
|
||||||
color index black red "~D" # deleted messages |
|
||||||
color index brightcyan default "~v~(!~N)" # collapsed thread with no unread |
|
||||||
color index yellow default "~v~(~N)" # collapsed thread with some unread |
|
||||||
color index green default "~N~v~(~N)" # collapsed thread with unread parent |
|
||||||
# statusbg used to indicated flagged when foreground color shows other status |
|
||||||
# for collapsed thread |
|
||||||
color index red black "~v~(~F)!~N" # collapsed thread with flagged, no unread |
|
||||||
color index yellow black "~v~(~F~N)" # collapsed thread with some unread & flagged |
|
||||||
color index green black "~N~v~(~F~N)" # collapsed thread with unread parent & flagged |
|
||||||
color index green black "~N~v~(~F)" # collapsed thread with unread parent, no unread inside, but some flagged |
|
||||||
color index cyan black "~v~(~p)" # collapsed thread with unread parent, no unread inside, some to me directly |
|
||||||
color index yellow red "~v~(~D)" # thread with deleted (doesn't differentiate between all or partial) |
|
||||||
#color index yellow default "~(~N)" # messages in threads with some unread |
|
||||||
#color index green default "~S" # superseded messages |
|
||||||
#color index red default "~T" # tagged messages |
|
||||||
#color index brightred red "~=" # duplicated messages |
|
||||||
|
|
||||||
# message headers ------------------------------------------------------ |
|
||||||
|
|
||||||
#color header brightgreen default "^" |
|
||||||
color hdrdefault brightgreen default |
|
||||||
color header brightyellow default "^(From)" |
|
||||||
color header blue default "^(Subject)" |
|
||||||
|
|
||||||
# body ----------------------------------------------------------------- |
|
||||||
|
|
||||||
color quoted blue default |
|
||||||
color quoted1 cyan default |
|
||||||
color quoted2 yellow default |
|
||||||
color quoted3 red default |
|
||||||
color quoted4 brightred default |
|
||||||
|
|
||||||
color signature brightgreen default |
|
||||||
color bold black default |
|
||||||
color underline black default |
|
||||||
color normal default default |
|
||||||
# |
|
||||||
color body brightcyan default "[;:][-o][)/(|]" # emoticons |
|
||||||
color body brightcyan default "[;:][)(|]" # emoticons |
|
||||||
color body brightcyan default "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\ |
|
||||||
|FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\ |
|
||||||
|IRL|RTFM|ROTFL|ROFL|YMMV)[*]?" |
|
||||||
color body brightcyan default "[ ][*][^*]*[*][ ]?" # more emoticon? |
|
||||||
color body brightcyan default "[ ]?[*][^*]*[*][ ]" # more emoticon? |
|
||||||
|
|
||||||
## pgp |
|
||||||
|
|
||||||
color body red default "(BAD signature)" |
|
||||||
color body cyan default "(Good signature)" |
|
||||||
color body brightblack default "^gpg: Good signature .*" |
|
||||||
color body brightyellow default "^gpg: " |
|
||||||
color body brightyellow red "^gpg: BAD signature from.*" |
|
||||||
mono body bold "^gpg: Good signature" |
|
||||||
mono body bold "^gpg: BAD signature from.*" |
|
||||||
|
|
||||||
# yes, an insance URL regex |
|
||||||
color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]" |
|
||||||
# and a heavy handed email regex |
|
||||||
#color body J_magent default "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])" |
|
||||||
|
|
||||||
# Various smilies and the like |
|
||||||
#color body brightwhite default "<[Gg]>" # <g> |
|
||||||
#color body brightwhite default "<[Bb][Gg]>" # <bg> |
|
||||||
#color body yellow default " [;:]-*[})>{(<|]" # :-) etc... |
|
||||||
# *bold* |
|
||||||
#color body blue default "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)" |
|
||||||
#mono body bold "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)" |
|
||||||
# _underline_ |
|
||||||
#color body blue default "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)" |
|
||||||
#mono body underline "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)" |
|
||||||
# /italic/ (Sometimes gets directory names) |
|
||||||
#color body blue default "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)" |
|
||||||
#mono body underline "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)" |
|
||||||
|
|
||||||
# Border lines. |
|
||||||
#color body blue default "( *[-+=#*~_]){6,}" |
|
||||||
|
|
||||||
#folder-hook . "color status J_black J_status " |
|
||||||
#folder-hook gmail/inbox "color status J_black yellow " |
|
||||||
#folder-hook gmail/important "color status J_black yellow " |
|
||||||
|
|
||||||
@ -1,8 +0,0 @@ |
|||||||
#! /bin/sh |
|
||||||
|
|
||||||
#### Determine size of Terminal |
|
||||||
height=`stty size | awk 'BEGIN {FS = " "} {print $1;}'` |
|
||||||
width=`stty size | awk 'BEGIN {FS = " "} {print $2;}'` |
|
||||||
|
|
||||||
### Display Image / offset with mutt bar |
|
||||||
echo -e "2;3;\n0;1;210;20;$((width*7-250));$((height*14-100));0;0;0;0;$1\n4;\n3;" | /usr/lib/w3m/w3mimgdisplay & |
|
||||||
@ -1,61 +0,0 @@ |
|||||||
# Folder hooks |
|
||||||
folder-hook 'account.jonathan' 'source ~/.mutt/accounts/account.jonathan.conf' |
|
||||||
#I will put other accounts here |
|
||||||
|
|
||||||
# Default account |
|
||||||
source ~/.mutt/accounts/account.jonathan.conf |
|
||||||
|
|
||||||
#Default Editor |
|
||||||
set editor = "$EDITOR" |
|
||||||
|
|
||||||
set ssl_starttls = yes |
|
||||||
set ssl_force_tls = yes |
|
||||||
set imap_check_subscribed |
|
||||||
set mail_check = 120 |
|
||||||
set mailcap_path = ~/.mutt/mailcap |
|
||||||
set timeout = 300 |
|
||||||
set imap_keepalive = 300 |
|
||||||
set move = no |
|
||||||
set include |
|
||||||
set sort = 'threads' |
|
||||||
set sort_aux = 'reverse-last-date-received' |
|
||||||
set auto_tag = yes |
|
||||||
|
|
||||||
set date_format="%m/%d %I:%M" |
|
||||||
set index_format="%2C %Z %d %-15.15F %s (%-4.4c)" |
|
||||||
|
|
||||||
#ignore "Authentication-Results:" |
|
||||||
#ignore "DomainKey-Signature:" |
|
||||||
#ignore "DKIM-Signature:" |
|
||||||
hdr_order Date From To Cc |
|
||||||
|
|
||||||
alternative_order text/plain text/html * |
|
||||||
auto_view text/html |
|
||||||
|
|
||||||
mono bold bold |
|
||||||
mono underline underline |
|
||||||
mono indicator reverse |
|
||||||
color index yellow default '.*' |
|
||||||
color index_author red default '.*' |
|
||||||
color index_number blue default |
|
||||||
color index_subject cyan default '.s' |
|
||||||
color index_size green default |
|
||||||
color normal default default |
|
||||||
color body brightred default [\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+ |
|
||||||
color body brightblue default (https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+ |
|
||||||
|
|
||||||
source ~/.mutt/muttcol |
|
||||||
|
|
||||||
bind editor <Tab> complete-query |
|
||||||
bind editor ^T complete |
|
||||||
bind editor <space> noop |
|
||||||
bind index G last-entry |
|
||||||
bind index g noop |
|
||||||
bind index gg first-entry |
|
||||||
bind index d half-down |
|
||||||
bind index u half-up |
|
||||||
bind index D delete-message |
|
||||||
bind index U undelete-message |
|
||||||
bind index F search |
|
||||||
bind index R group-reply |
|
||||||
# }}} |
|
||||||
@ -1 +0,0 @@ |
|||||||
Subproject commit 53270a0bd774aa32f6e5f07ac780539f74d352ea |
|
||||||
@ -1,6 +1,6 @@ |
|||||||
#!/bin/sh |
#!/bin/sh |
||||||
lock() { |
lock() { |
||||||
~/.config/i3/fadeLockScreen |
~/.dotfiles/i3/fadeLockScreen |
||||||
#i3lock |
#i3lock |
||||||
} |
} |
||||||
|
|
||||||
@ -0,0 +1,15 @@ |
|||||||
|
# |
||||||
|
# ~/.bash_profile |
||||||
|
# |
||||||
|
|
||||||
|
|
||||||
|
[[ -f ~/.bashrc ]] && . ~/.bashrc |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
source ~/.dotfiles/shells/profile |
||||||
|
|
||||||
|
|
||||||
|
# tab completion for ssh hosts |
||||||
|
complete -o default -o nospace -W "$(/usr/bin/env ruby -ne 'puts $_.split(/[,\s]+/)[1..-1].reject{|host| host.match(/\*|\?/)} if $_.match(/^\s*Host\s+/);' < $HOME/.ssh/config)" scp sftp ssh |
||||||
|
|
||||||
@ -0,0 +1,181 @@ |
|||||||
|
# |
||||||
|
# ~/.bashrc |
||||||
|
# |
||||||
|
|
||||||
|
|
||||||
|
# If not running interactively, don't do anything |
||||||
|
[[ $- != *i* ]] && return |
||||||
|
|
||||||
|
source ~/.dotfiles/shells/aliases |
||||||
|
source ~/.dotfiles/shells/functions |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#alias xkcd='curl https://xkcd.com/info.0.json 2> /dev/null| \jq ".img" | xargs feh' |
||||||
|
|
||||||
|
#Old ps1 |
||||||
|
#PS1='[\u@\h \W]\$ ' |
||||||
|
|
||||||
|
|
||||||
|
# bash completion for the `wp` command |
||||||
|
_wp_complete() { |
||||||
|
local OLD_IFS="$IFS" |
||||||
|
local cur=${COMP_WORDS[COMP_CWORD]} |
||||||
|
IFS=$'\n'; # want to preserve spaces at the end |
||||||
|
local opts="$(wp cli completions --line="$COMP_LINE" --point="$COMP_POINT")" |
||||||
|
if [[ "$opts" =~ \<file\>\s* ]] |
||||||
|
then |
||||||
|
COMPREPLY=( $(compgen -f -- $cur) ) |
||||||
|
elif [[ $opts = "" ]] |
||||||
|
then |
||||||
|
COMPREPLY=( $(compgen -f -- $cur) ) |
||||||
|
else |
||||||
|
COMPREPLY=( ${opts[*]} ) |
||||||
|
fi |
||||||
|
IFS="$OLD_IFS" |
||||||
|
return 0 |
||||||
|
} |
||||||
|
complete -o nospace -F _wp_complete wp |
||||||
|
|
||||||
|
export GIT_PS1_SHOWDIRTYSTATE=1 # Show the +(Staged) or *(unstaged) next to branch name for |
||||||
|
export GIT_PS1_SHOWUNTRACKEDFILES=1 # Show the %(Untracked) next to branch name |
||||||
|
export GIT_PS1_SHOWUPSTREAM="auto" |
||||||
|
|
||||||
|
source /usr/share/git/completion/git-completion.bash |
||||||
|
source /usr/share/git/completion/git-prompt.sh |
||||||
|
|
||||||
|
source $HOME/.dotfiles/shells/bash/t-completion.sh |
||||||
|
|
||||||
|
|
||||||
|
############################################ |
||||||
|
## ## |
||||||
|
## Colours for output ## |
||||||
|
## ## |
||||||
|
############################################ |
||||||
|
#{{{ |
||||||
|
# Reset |
||||||
|
Color_Off="\[\033[0m\]" # Text Reset |
||||||
|
|
||||||
|
# Regular Colors |
||||||
|
Black="\[\033[0;30m\]" # Black |
||||||
|
Red="\[\033[0;31m\]" # Red |
||||||
|
Green="\[\033[0;32m\]" # Green |
||||||
|
Yellow="\[\033[0;33m\]" # Yellow |
||||||
|
Blue="\[\033[0;34m\]" # Blue |
||||||
|
Purple="\[\033[0;35m\]" # Purple |
||||||
|
Cyan="\[\033[0;36m\]" # Cyan |
||||||
|
White="\[\033[0;37m\]" # White |
||||||
|
|
||||||
|
# Bold |
||||||
|
BBlack="\[\033[1;30m\]" # Black |
||||||
|
BRed="\[\033[1;31m\]" # Red |
||||||
|
BGreen="\[\033[1;32m\]" # Green |
||||||
|
BYellow="\[\033[1;33m\]" # Yellow |
||||||
|
BBlue="\[\033[1;34m\]" # Blue |
||||||
|
BPurple="\[\033[1;35m\]" # Purple |
||||||
|
BCyan="\[\033[1;36m\]" # Cyan |
||||||
|
BWhite="\[\033[1;37m\]" # White |
||||||
|
|
||||||
|
# Underline |
||||||
|
UBlack="\[\033[4;30m\]" # Black |
||||||
|
URed="\[\033[4;31m\]" # Red |
||||||
|
UGreen="\[\033[4;32m\]" # Green |
||||||
|
UYellow="\[\033[4;33m\]" # Yellow |
||||||
|
UBlue="\[\033[4;34m\]" # Blue |
||||||
|
UPurple="\[\033[4;35m\]" # Purple |
||||||
|
UCyan="\[\033[4;36m\]" # Cyan |
||||||
|
UWhite="\[\033[4;37m\]" # White |
||||||
|
|
||||||
|
# Background |
||||||
|
On_Black="\[\033[40m\]" # Black |
||||||
|
On_Red="\[\033[41m\]" # Red |
||||||
|
On_Green="\[\033[42m\]" # Green |
||||||
|
On_Yellow="\[\033[43m\]" # Yellow |
||||||
|
On_Blue="\[\033[44m\]" # Blue |
||||||
|
On_Purple="\[\033[45m\]" # Purple |
||||||
|
On_Cyan="\[\033[46m\]" # Cyan |
||||||
|
On_White="\[\033[47m\]" # White |
||||||
|
|
||||||
|
# High Intensty |
||||||
|
IBlack="\[\033[0;90m\]" # Black |
||||||
|
IRed="\[\033[0;91m\]" # Red |
||||||
|
IGreen="\[\033[0;92m\]" # Green |
||||||
|
IYellow="\[\033[0;93m\]" # Yellow |
||||||
|
IBlue="\[\033[0;94m\]" # Blue |
||||||
|
IPurple="\[\033[0;95m\]" # Purple |
||||||
|
ICyan="\[\033[0;96m\]" # Cyan |
||||||
|
IWhite="\[\033[0;97m\]" # White |
||||||
|
|
||||||
|
# Bold High Intensty |
||||||
|
BIBlack="\[\033[1;90m\]" # Black |
||||||
|
BIRed="\[\033[1;91m\]" # Red |
||||||
|
BIGreen="\[\033[1;92m\]" # Green |
||||||
|
BIYellow="\[\033[1;93m\]" # Yellow |
||||||
|
BIBlue="\[\033[1;94m\]" # Blue |
||||||
|
BIPurple="\[\033[1;95m\]" # Purple |
||||||
|
BICyan="\[\033[1;96m\]" # Cyan |
||||||
|
BIWhite="\[\033[1;97m\]" # White |
||||||
|
|
||||||
|
# High Intensty backgrounds |
||||||
|
On_IBlack="\[\033[0;100m\]" # Black |
||||||
|
On_IRed="\[\033[0;101m\]" # Red |
||||||
|
On_IGreen="\[\033[0;102m\]" # Green |
||||||
|
On_IYellow="\[\033[0;103m\]" # Yellow |
||||||
|
On_IBlue="\[\033[0;104m\]" # Blue |
||||||
|
On_IPurple="\[\033[10;95m\]" # Purple |
||||||
|
On_ICyan="\[\033[0;106m\]" # Cyan |
||||||
|
On_IWhite="\[\033[0;107m\]" # White |
||||||
|
#}}} |
||||||
|
# Various variables you might want for your PS1 prompt instead |
||||||
|
Time12h="\T" |
||||||
|
Time12a="\@" |
||||||
|
PathShort="\w" |
||||||
|
PathFull="\W" |
||||||
|
NewLine="\n" |
||||||
|
Jobs="\j" |
||||||
|
Username="\u" |
||||||
|
|
||||||
|
# Default PS1 |
||||||
|
# \u@\h [\w]$ |
||||||
|
export PS1=$Username" "$Yellow$PathShort$Color_Off'$(git branch &>/dev/null;\ |
||||||
|
if [ $? -eq 0 ]; then \ |
||||||
|
echo "$(echo `git status` | grep "nothing to commit" > /dev/null 2>&1; \ |
||||||
|
if [ "$?" -eq "0" ]; then \ |
||||||
|
echo "'$Green'"$(__git_ps1 " (%s)");\ |
||||||
|
else \ |
||||||
|
echo "'$Red'"$(__git_ps1 " (%s)");\ |
||||||
|
fi)"; \ |
||||||
|
fi)'$Color_Off'\$ ' |
||||||
|
|
||||||
|
# export PS1="\[\033[0;97m\]\u \[\033[0;33m\]\w"'$(git branch &>/dev/null;\ |
||||||
|
# if [ $? -eq 0 ]; then \ |
||||||
|
# echo "$(echo `git status` | grep "nothing to commit" > /dev/null 2>&1; \ |
||||||
|
# if [ "$?" -eq "0" ]; then \ |
||||||
|
# echo "\[\033[0;32m\]"$(__git_ps1 " (%s)");\ |
||||||
|
# else \ |
||||||
|
# echo "\[\033[0;91m\]"$(__git_ps1 " (%s)");\ |
||||||
|
# fi)"; \ |
||||||
|
# fi)\[\033[0m\]\$ ' |
||||||
|
function _update_ps1() { |
||||||
|
export PS1="$(~/.dotfiles/shells/bash/powerline-shell/powerline-shell.py $? 2> /dev/null)" |
||||||
|
} |
||||||
|
|
||||||
|
if [ "$TERM" != "linux" ]; then |
||||||
|
PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND" |
||||||
|
fi |
||||||
|
|
||||||
|
[ -r "$HOME/.smartcd_config" ] && ( [ -n $BASH_VERSION ] || [ -n $ZSH_VERSION ] ) && source ~/.smartcd_config |
||||||
|
|
||||||
|
#If on work computer, cd into sites |
||||||
|
|
||||||
|
#Add tab completeion to sudo commands |
||||||
|
complete -cf sudo |
||||||
|
|
||||||
|
clear |
||||||
|
#screenfetch |
||||||
|
#set -o vi |
||||||
|
|
||||||
|
# vim: foldmethod=marker |
||||||
|
|
||||||
|
# Add RVM to PATH for scripting. Make sure this is the last PATH variable change. |
||||||
|
export PATH="$PATH:$HOME/.rvm/bin" |
||||||
@ -0,0 +1,22 @@ |
|||||||
|
source ~/.dotfiles/shells/aliases |
||||||
|
|
||||||
|
########################################### |
||||||
|
# # |
||||||
|
# Suffex Aliases # |
||||||
|
# # |
||||||
|
########################################### |
||||||
|
|
||||||
|
alias -s html=$EDITOR |
||||||
|
alias -s htm=$EDITOR |
||||||
|
|
||||||
|
alias -s php=$EDITOR |
||||||
|
|
||||||
|
alias -s less=$EDITOR |
||||||
|
alias -s css=$EDITOR |
||||||
|
|
||||||
|
alias -s js=$EDITOR |
||||||
|
alias -s es6=$EDITOR |
||||||
|
|
||||||
|
alias -s gitignore=$EDITOR |
||||||
|
|
||||||
|
alias -s json=$EDITOR |
||||||
@ -0,0 +1 @@ |
|||||||
|
source ~/.dotfiles/shells/functions |
||||||
@ -0,0 +1,2 @@ |
|||||||
|
source ~/.dotfiles/shells/profile |
||||||
|
|
||||||
@ -0,0 +1 @@ |
|||||||
|
Subproject commit 02a37dd919dc48e0821186e5f20e78bd0215f86a |
||||||
@ -0,0 +1,57 @@ |
|||||||
|
#!/usr/bin/sh |
||||||
|
|
||||||
|
# Simple shell script to symlink my dotfiles to their place in the system |
||||||
|
|
||||||
|
#whether to use -f when creating symlnk |
||||||
|
force=false |
||||||
|
#Ask if files should be overiten |
||||||
|
read -n1 -p "Do you want to overide files if they exist? [y/N] " answer |
||||||
|
|
||||||
|
#If anser is y or Y then they should be ovewriten |
||||||
|
#Anything else and they shouldn't |
||||||
|
if [[ "$answer" == "y" || "$answer" == "Y" ]]; then |
||||||
|
force=true |
||||||
|
fi |
||||||
|
|
||||||
|
# A wrapper around ln which will force if necesary |
||||||
|
function myLink(){ |
||||||
|
if $force; then |
||||||
|
/usr/bin/ln -sf "$1" "$2" |
||||||
|
echo "forced $2 -> $1" |
||||||
|
else |
||||||
|
/usr/bin/ln -s "$1" "$2" |
||||||
|
fi |
||||||
|
} |
||||||
|
|
||||||
|
#ZSH |
||||||
|
myLink $HOME/.dotfiles/shells/zsh/zprofile $HOME/.zprofile |
||||||
|
myLink $HOME/.dotfiles/shells/zsh/zshrc $HOME/.zshrc |
||||||
|
myLink $HOME/.dotfiles/shells/zsh/zshrc $HOME/.zshrc.pre-oh-my-zsh |
||||||
|
|
||||||
|
#bash |
||||||
|
myLink $HOME/.dotfiles/shells/bash/bash_profile $HOME/.bash_profile |
||||||
|
myLink $HOME/.dotfiles/shells/bash/bashrc $HOME/.bashrc |
||||||
|
|
||||||
|
#X |
||||||
|
myLink $HOME/.dotfiles/x/xinitrc $HOME/.xinitrc |
||||||
|
|
||||||
|
#Git |
||||||
|
myLink $HOME/.dotfiles/git/gitconfig $HOME/.gitconfig |
||||||
|
|
||||||
|
#i3 |
||||||
|
mkdir -p $HOME/.config/i3 |
||||||
|
myLink $HOME/.dotfiles/i3/config $HOME/.config/i3/config |
||||||
|
|
||||||
|
#vim |
||||||
|
myLink $HOME/.dotfiles/vim $HOME/.vim |
||||||
|
myLink $HOME/.dotfiles/vim/.vimrc $HOME/.vimrc |
||||||
|
|
||||||
|
#rofi |
||||||
|
myLink $HOME/.dotfiles/rofi $HOME/.config/rofi |
||||||
|
|
||||||
|
#Templates |
||||||
|
myLink $HOME/.dotfiles/Templates $HOME/Templates |
||||||
|
|
||||||
|
#Pandoc |
||||||
|
myLink $HOME/.dotfiles/pandoc $HOME/.pandoc |
||||||
|
|
||||||
@ -0,0 +1 @@ |
|||||||
|
Subproject commit 4952747d6aebaaa394e285d7e4e739165afda551 |
||||||
@ -1,93 +0,0 @@ |
|||||||
# |
|
||||||
# Directives controlling the display of server-generated directory listings. |
|
||||||
# |
|
||||||
# Required modules: mod_authz_core, mod_authz_host, |
|
||||||
# mod_autoindex, mod_alias |
|
||||||
# |
|
||||||
# To see the listing of a directory, the Options directive for the |
|
||||||
# directory must include "Indexes", and the directory must not contain |
|
||||||
# a file matching those listed in the DirectoryIndex directive. |
|
||||||
# |
|
||||||
|
|
||||||
# |
|
||||||
# IndexOptions: Controls the appearance of server-generated directory |
|
||||||
# listings. |
|
||||||
# |
|
||||||
IndexOptions FancyIndexing HTMLTable VersionSort |
|
||||||
|
|
||||||
# We include the /icons/ alias for FancyIndexed directory listings. If |
|
||||||
# you do not use FancyIndexing, you may comment this out. |
|
||||||
# |
|
||||||
Alias /icons/ "/opt/lampp/icons/" |
|
||||||
|
|
||||||
<Directory "/opt/lampp/icons"> |
|
||||||
Options Indexes MultiViews |
|
||||||
AllowOverride None |
|
||||||
Require all granted |
|
||||||
</Directory> |
|
||||||
|
|
||||||
# |
|
||||||
# AddIcon* directives tell the server which icon to show for different |
|
||||||
# files or filename extensions. These are only displayed for |
|
||||||
# FancyIndexed directories. |
|
||||||
# |
|
||||||
AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip |
|
||||||
|
|
||||||
AddIconByType (TXT,/icons/text.gif) text/* |
|
||||||
AddIconByType (IMG,/icons/image2.gif) image/* |
|
||||||
AddIconByType (SND,/icons/sound2.gif) audio/* |
|
||||||
AddIconByType (VID,/icons/movie.gif) video/* |
|
||||||
|
|
||||||
AddIcon /icons/binary.gif .bin .exe |
|
||||||
AddIcon /icons/binhex.gif .hqx |
|
||||||
AddIcon /icons/tar.gif .tar |
|
||||||
AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv |
|
||||||
AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip |
|
||||||
AddIcon /icons/a.gif .ps .ai .eps |
|
||||||
AddIcon /icons/layout.gif .html .shtml .htm .pdf |
|
||||||
AddIcon /icons/text.gif .txt |
|
||||||
AddIcon /icons/c.gif .c |
|
||||||
AddIcon /icons/p.gif .pl .py |
|
||||||
AddIcon /icons/f.gif .for |
|
||||||
AddIcon /icons/dvi.gif .dvi |
|
||||||
AddIcon /icons/uuencoded.gif .uu |
|
||||||
AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl |
|
||||||
AddIcon /icons/tex.gif .tex |
|
||||||
AddIcon /icons/bomb.gif core |
|
||||||
|
|
||||||
AddIcon /icons/back.gif .. |
|
||||||
AddIcon /icons/hand.right.gif README |
|
||||||
AddIcon /icons/folder.gif ^^DIRECTORY^^ |
|
||||||
AddIcon /icons/blank.gif ^^BLANKICON^^ |
|
||||||
|
|
||||||
# |
|
||||||
# DefaultIcon is which icon to show for files which do not have an icon |
|
||||||
# explicitly set. |
|
||||||
# |
|
||||||
DefaultIcon /icons/unknown.gif |
|
||||||
|
|
||||||
# |
|
||||||
# AddDescription allows you to place a short description after a file in |
|
||||||
# server-generated indexes. These are only displayed for FancyIndexed |
|
||||||
# directories. |
|
||||||
# Format: AddDescription "description" filename |
|
||||||
# |
|
||||||
#AddDescription "GZIP compressed document" .gz |
|
||||||
#AddDescription "tar archive" .tar |
|
||||||
#AddDescription "GZIP compressed tar archive" .tgz |
|
||||||
|
|
||||||
# |
|
||||||
# ReadmeName is the name of the README file the server will look for by |
|
||||||
# default, and append to directory listings. |
|
||||||
# |
|
||||||
# HeaderName is the name of a file which should be prepended to |
|
||||||
# directory indexes. |
|
||||||
ReadmeName README.html |
|
||||||
HeaderName HEADER.html |
|
||||||
|
|
||||||
# |
|
||||||
# IndexIgnore is a set of filenames which directory indexing should ignore |
|
||||||
# and not include in the listing. Shell-style wildcarding is permitted. |
|
||||||
# |
|
||||||
IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t |
|
||||||
|
|
||||||
@ -1,50 +0,0 @@ |
|||||||
# |
|
||||||
# Distributed authoring and versioning (WebDAV) |
|
||||||
# |
|
||||||
# Required modules: mod_alias, mod_auth_digest, mod_authn_core, mod_authn_file, |
|
||||||
# mod_authz_core, mod_authz_user, mod_dav, mod_dav_fs, |
|
||||||
# mod_setenvif |
|
||||||
|
|
||||||
# The following example gives DAV write access to a directory called |
|
||||||
# "uploads" under the ServerRoot directory. |
|
||||||
# |
|
||||||
# The User/Group specified in httpd.conf needs to have write permissions |
|
||||||
# on the directory where the DavLockDB is placed and on any directory where |
|
||||||
# "Dav On" is specified. |
|
||||||
|
|
||||||
DavLockDB "/opt/lampp/var/DavLock" |
|
||||||
|
|
||||||
Alias /uploads "/opt/lampp/uploads" |
|
||||||
|
|
||||||
<Directory "/opt/lampp/uploads"> |
|
||||||
Dav On |
|
||||||
|
|
||||||
AuthType Digest |
|
||||||
AuthName DAV-upload |
|
||||||
# You can use the htdigest program to create the password database: |
|
||||||
# htdigest -c "/opt/lampp/user.passwd" DAV-upload admin |
|
||||||
AuthUserFile "/opt/lampp/user.passwd" |
|
||||||
AuthDigestProvider file |
|
||||||
|
|
||||||
# Allow universal read-access, but writes are restricted |
|
||||||
# to the admin user. |
|
||||||
<RequireAny> |
|
||||||
Require method GET POST OPTIONS |
|
||||||
Require user admin |
|
||||||
</RequireAny> |
|
||||||
</Directory> |
|
||||||
|
|
||||||
# |
|
||||||
# The following directives disable redirects on non-GET requests for |
|
||||||
# a directory that does not include the trailing slash. This fixes a |
|
||||||
# problem with several clients that do not appropriately handle |
|
||||||
# redirects for folders with DAV methods. |
|
||||||
# |
|
||||||
BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully |
|
||||||
BrowserMatch "MS FrontPage" redirect-carefully |
|
||||||
BrowserMatch "^WebDrive" redirect-carefully |
|
||||||
BrowserMatch "^WebDAVFS/1.[01234]" redirect-carefully |
|
||||||
BrowserMatch "^gnome-vfs/1.0" redirect-carefully |
|
||||||
BrowserMatch "^XML Spy" redirect-carefully |
|
||||||
BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully |
|
||||||
BrowserMatch " Konqueror/4" redirect-carefully |
|
||||||
@ -1,90 +0,0 @@ |
|||||||
# |
|
||||||
# This configuration file reflects default settings for Apache HTTP Server. |
|
||||||
# |
|
||||||
# You may change these, but chances are that you may not need to. |
|
||||||
# |
|
||||||
|
|
||||||
# |
|
||||||
# Timeout: The number of seconds before receives and sends time out. |
|
||||||
# |
|
||||||
Timeout 300 |
|
||||||
|
|
||||||
# |
|
||||||
# KeepAlive: Whether or not to allow persistent connections (more than |
|
||||||
# one request per connection). Set to "Off" to deactivate. |
|
||||||
# |
|
||||||
KeepAlive On |
|
||||||
|
|
||||||
# |
|
||||||
# MaxKeepAliveRequests: The maximum number of requests to allow |
|
||||||
# during a persistent connection. Set to 0 to allow an unlimited amount. |
|
||||||
# We recommend you leave this number high, for maximum performance. |
|
||||||
# |
|
||||||
MaxKeepAliveRequests 100 |
|
||||||
|
|
||||||
# |
|
||||||
# KeepAliveTimeout: Number of seconds to wait for the next request from the |
|
||||||
# same client on the same connection. |
|
||||||
# |
|
||||||
KeepAliveTimeout 5 |
|
||||||
|
|
||||||
# |
|
||||||
# UseCanonicalName: Determines how Apache constructs self-referencing |
|
||||||
# URLs and the SERVER_NAME and SERVER_PORT variables. |
|
||||||
# When set "Off", Apache will use the Hostname and Port supplied |
|
||||||
# by the client. When set "On", Apache will use the value of the |
|
||||||
# ServerName directive. |
|
||||||
# |
|
||||||
UseCanonicalName Off |
|
||||||
|
|
||||||
# |
|
||||||
# AccessFileName: The name of the file to look for in each directory |
|
||||||
# for additional configuration directives. See also the AllowOverride |
|
||||||
# directive. |
|
||||||
# |
|
||||||
AccessFileName .htaccess |
|
||||||
|
|
||||||
# |
|
||||||
# ServerTokens |
|
||||||
# This directive configures what you return as the Server HTTP response |
|
||||||
# Header. The default is 'Full' which sends information about the OS-Type |
|
||||||
# and compiled in modules. |
|
||||||
# Set to one of: Full | OS | Minor | Minimal | Major | Prod |
|
||||||
# where Full conveys the most information, and Prod the least. |
|
||||||
# |
|
||||||
ServerTokens Full |
|
||||||
|
|
||||||
# |
|
||||||
# Optionally add a line containing the server version and virtual host |
|
||||||
# name to server-generated pages (internal error documents, FTP directory |
|
||||||
# listings, mod_status and mod_info output etc., but not CGI generated |
|
||||||
# documents or custom error documents). |
|
||||||
# Set to "EMail" to also include a mailto: link to the ServerAdmin. |
|
||||||
# Set to one of: On | Off | EMail |
|
||||||
# |
|
||||||
ServerSignature Off |
|
||||||
|
|
||||||
# |
|
||||||
# HostnameLookups: Log the names of clients or just their IP addresses |
|
||||||
# e.g., www.apache.org (on) or 204.62.129.132 (off). |
|
||||||
# The default is off because it'd be overall better for the net if people |
|
||||||
# had to knowingly turn this feature on, since enabling it means that |
|
||||||
# each client request will result in AT LEAST one lookup request to the |
|
||||||
# nameserver. |
|
||||||
# |
|
||||||
HostnameLookups Off |
|
||||||
|
|
||||||
# |
|
||||||
# Set a timeout for how long the client may take to send the request header |
|
||||||
# and body. |
|
||||||
# The default for the headers is header=20-40,MinRate=500, which means wait |
|
||||||
# for the first byte of headers for 20 seconds. If some data arrives, |
|
||||||
# increase the timeout corresponding to a data rate of 500 bytes/s, but not |
|
||||||
# above 40 seconds. |
|
||||||
# The default for the request body is body=20,MinRate=500, which is the same |
|
||||||
# but has no upper limit for the timeout. |
|
||||||
# To disable, set to header=0 body=0 |
|
||||||
# |
|
||||||
<IfModule reqtimeout_module> |
|
||||||
RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500 |
|
||||||
</IfModule> |
|
||||||
@ -1,36 +0,0 @@ |
|||||||
# |
|
||||||
# Get information about the requests being processed by the server |
|
||||||
# and the configuration of the server. |
|
||||||
# |
|
||||||
# Required modules: mod_authz_core, mod_authz_host, |
|
||||||
# mod_info (for the server-info handler), |
|
||||||
# mod_status (for the server-status handler) |
|
||||||
|
|
||||||
# |
|
||||||
# Allow server status reports generated by mod_status, |
|
||||||
# with the URL of http://servername/server-status |
|
||||||
# Change the ".example.com" to match your domain to enable. |
|
||||||
|
|
||||||
<Location /server-status> |
|
||||||
SetHandler server-status |
|
||||||
Require host .example.com |
|
||||||
Require ip 127 |
|
||||||
</Location> |
|
||||||
|
|
||||||
# |
|
||||||
# ExtendedStatus controls whether Apache will generate "full" status |
|
||||||
# information (ExtendedStatus On) or just basic information (ExtendedStatus |
|
||||||
# Off) when the "server-status" handler is called. The default is Off. |
|
||||||
# |
|
||||||
#ExtendedStatus On |
|
||||||
|
|
||||||
# |
|
||||||
# Allow remote server configuration reports, with the URL of |
|
||||||
# http://servername/server-info (requires that mod_info.c be loaded). |
|
||||||
# Change the ".example.com" to match your domain to enable. |
|
||||||
# |
|
||||||
<Location /server-info> |
|
||||||
SetHandler server-info |
|
||||||
Require host .example.com |
|
||||||
Require ip 127 |
|
||||||
</Location> |
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue