Commit d4d9155e authored by Thomas Tsiakalakis's avatar Thomas Tsiakalakis

all the changes

parent 71eceb99
[submodule ".vim/bundle/vim-fugitive"]
path = vim/bundle/vim-fugitive
url = git://github.com/tpope/vim-fugitive.git
[submodule ".vim/bundle/vim-slim"]
path = vim/bundle/vim-slim
url = https://github.com/slim-template/vim-slim
[submodule ".oh-my-zsh"]
path = oh-my-zsh
url = https://github.com/robbyrussell/oh-my-zsh
[submodule ".vim/bundle/vimproc.vim"]
path = vim/bundle/vimproc.vim
url = https://github.com/Shougo/vimproc.vim.git
[submodule ".vim/bundle/unite.vim"]
path = vim/bundle/unite.vim
url = https://github.com/Shougo/unite.vim.git
[submodule ".vim/bundle/command-t"]
path = vim/bundle/command-t
url = git://git.wincent.com/command-t.git
[submodule ".vim/bundle/vim-phpqa"]
path = vim/bundle/vim-phpqa
url = https://github.com/joonty/vim-phpqa.git
[submodule ".vim/bundle/phpcomplete.vim"]
path = vim/bundle/phpcomplete.vim
url = https://github.com/shawncplus/phpcomplete.vim.git
[submodule "plugins/liquidprompt"]
path = plugins/liquidprompt
url = https://github.com/nojhan/liquidprompt.git
[submodule "plugins/zsh-syntax-highlighting"]
path = plugins/zsh-syntax-highlighting
url = https://github.com/zsh-users/zsh-syntax-highlighting.git
......@@ -17,18 +17,17 @@ mkdir -p ~/tmp
mkdir -p ~/.ssh
mkdir -p ~/bin
mkdir -p ~/.config
mkdir -p ${dir}/oh-my-zsh/custom/themes
rm ~/bin/Markdown.pl
rm ~/bin/cloc
rm ~/bin/compressibility
rm ~/bin/git-goodness
rm ~/bin/git-what-the-hell-just-happened
rm ~/bin/gn
rm ~/bin/line
rm ~/bin/reload-chrome
rm ~/bin/word-frequency
rm ~/bin/screenfetch
rm ~/.local/bin/Markdown.pl
rm ~/.local/bin/cloc
rm ~/.local/bin/compressibility
rm ~/.local/bin/git-goodness
rm ~/.local/bin/git-what-the-hell-just-happened
rm ~/.local/bin/gn
rm ~/.local/bin/line
rm ~/.local/bin/reload-chrome
rm ~/.local/bin/word-frequency
rm ~/.local/bin/screenfetch
rm ~/.gitconfig
rm ~/.githelpers
......@@ -41,7 +40,7 @@ rm ~/.zshrc
rm ~/.tmux.conf
rm ~/.config/i3
rm ~/.config/i3status
rm ${dir}/oh-my-zsh/custom/themes/tsia.zsh-theme
rm ~/.config/i3blocks
rm ${dir}/oh-my-zsh/plugins/liquidprompt
rm ${dir}/oh-my-zsh/plugins/zsh-syntax-highlighting
......@@ -66,16 +65,10 @@ ln -s ${dir}/vim ~/.vim
ln -s ${dir}/vimrc ~/.vimrc
ln -s ${dir}/zshrc ~/.zshrc
ln -s ${dir}/tmux.conf ~/.tmux.conf
ln -s ${dir}/tsia.zsh-theme ${dir}/oh-my-zsh/custom/themes/tsia.zsh-theme
ln -s ${dir}/i3 ~/.config/i3
ln -s ${dir}/i3status ~/.config/i3status
ln -s ${dir}/i3blocks ~/.config/i3blocks
cd ~/.vim/bundle/vimproc.vim
make
cd ~/.vim/bundle/command-t/ruby/command-t
ruby extconf.rb
make
ln -s ${dir}/plugins/liquidprompt ${dir}/oh-my-zsh/plugins/liquidprompt
ln -s ${dir}/plugins/zsh-syntax-highlighting ${dir}/oh-my-zsh/plugins/zsh-syntax-highlighting
......
#!/bin/bash
pushd "`dirname $0`"
dir=`pwd`
cd ~/.vim/bundle/vimproc.vim
make
cd ~/.vim/bundle/command-t/ruby/command-t
ruby extconf.rb
make
popd
[core]
excludesfile = /Users/tsia/.gitignore_global
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
excludesfile = ~/.gitignore_global
editor = vim
autocrlf = input
[user]
name = Thomas Tsiakalakis
email = tt@dplusc.de
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
email = mail@tsia.de
[merge]
#tool = Kaleidoscope
tool = vimdiff
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[mergetool]
prompt = false
[diff]
tool = Kaleidoscope
[color]
ui = auto
[alias]
st = status
ci = commit --verbose
co = checkout
di = diff
dc = diff --cached
amend = commit --amend
aa = add --all
ff = merge --ff-only
pullff = pull --ff-only
noff = merge --no-ff
fa = fetch --all
pom = push origin master
b = branch
ds = diff --stat=160,120
dh1 = diff HEAD~1
# Divergence (commits we added and commits remote added)
div = divergence
# Goodness (summary of diff lines added/removed/total)
gn = goodness
gnc = goodness --cached
# Fancy logging.
# h = head
# hp = head with patch
# r = recent commits, only current branch
# ra = recent commits, all reachable refs
# l = all commits, only current branch
# la = all commits, all reachable refs
head = !git r -1
h = !git head
hp = "!. ~/.githelpers && show_git_head"
r = !GIT_NO_PAGER=1 git l -30
ra = !git r --all
l = "!. ~/.githelpers && pretty_git_log"
la = !git l --all
sd = show --pretty=format:%b
diffid = "!f() { git diff \"$1^\" \"$1\"; }; f"
[push]
default = simple
[commit]
template = /Users/tsia/.stCommitMsg
template = ~/.stCommitMsg
[credential]
helper = store
[http]
sslverify = false
sslcapath = /usr/lib/ssl/certs
proxy = http://172.16.160.16:8080
[gui]
recentrepo = /home/tsiakalt/dev/haproxy_install
This diff is collapsed.
# i3blocks config file
#
# Please see man i3blocks for a complete reference!
# The man page is also hosted at http://vivien.github.io/i3blocks
#
# List of valid properties:
#
# align
# color
# command
# full_text
# instance
# interval
# label
# min_width
# name
# separator
# separator_block_width
# short_text
# signal
# urgent
# Global properties
#
# The top properties below are applied to every block, but can be overridden.
# Each block command defaults to the script name to avoid boilerplate.
# Change $SCRIPT_DIR to the location of your scripts!
command=/opt/i3blocks-contrib/$BLOCK_NAME/$BLOCK_NAME
separator_block_width=15
markup=none
# Volume indicator
#
# The first parameter sets the step (and units to display)
# The second parameter overrides the mixer selection
# See the script for details.
[volume]
label=♪
#label=VOL
#interval=once
interval=10
signal=10
#STEP=5%
# Memory usage
#
# The type defaults to "mem" if the instance is not specified.
[memory]
label=MEM
separator=false
interval=30
[memory]
label=SWAP
instance=swap
#separator=false
interval=30
# Disk usage
#
# The directory defaults to $HOME if the instance is not specified.
# The script may be called with a optional argument to set the alert
# (defaults to 10 for 10%).
[disk]
label=DISK
#DIR=/mnt/data
interval=30
# Network interface monitoring
#
# If the instance is not specified, use the interface used for default route.
# The address can be forced to IPv4 or IPv6 with -4 or -6 switches.
[iface]
#IFACE=wlan0
color=#00FF00
interval=10
separator=false
#[wifi]
#INTERFACE=wlp3s0
#label=wifi:
#interval=10
#separator=false
[bandwidth]
#INTERFACE=eth0
interval=5
# CPU usage
#
# The script may be called with -w and -c switches to specify thresholds,
# see the script for details.
[cpu_usage]
label=CPU
interval=5
min_width=CPU 100.00%
#separator=false
[load_average]
label=LOAD
interval=5
# Battery indicator
#
# The battery instance defaults to 0.
[battery]
label=BAT
#label=⚡
interval=30
# Date Time
#
#[time]
#command=date '+%Y-%m-%d %H:%M:%S'
#interval=1
# Generic media player support
#
# This displays "ARTIST - SONG" if a music is playing.
# Supported players are: spotify, vlc, audacious, xmms2, mplayer, and others.
#[mediaplayer]
#instance=spotify
#interval=5
#signal=10
# OpenVPN support
#
# Support multiple VPN, with colors.
#[openvpn]
#interval=20
# Temperature
#
# Support multiple chips, though lm-sensors.
# The script may be called with -w and -c switches to specify thresholds,
# see the script for details.
#[temperature]
#label=TEMP
#interval=10
# Key indicators
#
# Add the following bindings to i3 config file:
#
# bindsym --release Caps_Lock exec pkill -SIGRTMIN+11 i3blocks
# bindsym --release Num_Lock exec pkill -SIGRTMIN+11 i3blocks
#[keyindicator]
#KEY=CAPS
#markup=pango
#interval=once
#signal=11
#[keyindicator]
#KEY=NUM
#markup=pango
#interval=once
#signal=11
# i3blocks config file
#
# Please see man i3blocks for a complete reference!
# The man page is also hosted at http://vivien.github.io/i3blocks
#
# List of valid properties:
#
# align
# color
# command
# full_text
# instance
# interval
# label
# min_width
# name
# separator
# separator_block_width
# short_text
# signal
# urgent
# Global properties
#
# The top properties below are applied to every block, but can be overridden.
# Each block command defaults to the script name to avoid boilerplate.
# Change $SCRIPT_DIR to the location of your scripts!
command=/opt/i3blocks-contrib/$BLOCK_NAME/$BLOCK_NAME
separator_block_width=15
markup=none
[time]
command=/usr/bin/php /home/tsiakalt/dev/time/index.php
interval=once
signal=10
# Volume indicator
#
# The first parameter sets the step (and units to display)
# The second parameter overrides the mixer selection
# See the script for details.
#[volume]
#label=♪
#label=VOL
#interval=once
#signal=10
#STEP=5%
# Memory usage
#
# The type defaults to "mem" if the instance is not specified.
#[memory]
#label=MEM
#separator=false
#interval=30
#[memory]
#label=SWAP
#instance=swap
#separator=false
#interval=30
# Disk usage
#
# The directory defaults to $HOME if the instance is not specified.
# The script may be called with a optional argument to set the alert
# (defaults to 10 for 10%).
#[disk]
#label=HOME
#DIR=/mnt/data
#interval=30
# Network interface monitoring
#
# If the instance is not specified, use the interface used for default route.
# The address can be forced to IPv4 or IPv6 with -4 or -6 switches.
[iface]
#IFACE=wlan0
color=#00FF00
interval=10
separator=false
#[wifi]
#INTERFACE=wlp3s0
#label=wifi:
#interval=10
#separator=false
[bandwidth]
#INTERFACE=eth0
interval=5
# CPU usage
#
# The script may be called with -w and -c switches to specify thresholds,
# see the script for details.
#[cpu_usage]
#label=CPU
#interval=10
#min_width=CPU 100.00%
#separator=false
#[load_average]
#label=LOAD
#interval=10
# Battery indicator
#
# The battery instance defaults to 0.
[battery]
label=BAT
#label=⚡
interval=30
# Date Time
#
[time]
command=date '+%a %Y-%m-%d %H:%M:%S'
interval=1
# Generic media player support
#
# This displays "ARTIST - SONG" if a music is playing.
# Supported players are: spotify, vlc, audacious, xmms2, mplayer, and others.
#[mediaplayer]
#instance=spotify
#interval=5
#signal=10
# OpenVPN support
#
# Support multiple VPN, with colors.
#[openvpn]
#interval=20
# Temperature
#
# Support multiple chips, though lm-sensors.
# The script may be called with -w and -c switches to specify thresholds,
# see the script for details.
#[temperature]
#label=TEMP
#interval=10
# Key indicators
#
# Add the following bindings to i3 config file:
#
# bindsym --release Caps_Lock exec pkill -SIGRTMIN+11 i3blocks
# bindsym --release Num_Lock exec pkill -SIGRTMIN+11 i3blocks
#[keyindicator]
#KEY=CAPS
#markup=pango
#interval=once
#signal=11
#[keyindicator]
#KEY=NUM
#markup=pango
#interval=once
#signal=11
Subproject commit 3d5b3430fd9da12f6e33f534e487fe9b18928ac7
Subproject commit 710a3d5a1e2888a4dfb1769f8f1edd8a590eee22
Subproject commit 9c80396021a8106bfaeade9a1ea51b85152e951d
command-t @ f7344ebb
Subproject commit f7344ebbe95c532b2ad01f19877d6d611db0193b
Subproject commit 8775df13b80744a83ea33b407354e9d4cea05b7c
Subproject commit 515b01c64bd92ade146898d5ff7ad7d81a9adc2f
Subproject commit b319b694539017dcd789dc2c42f784a30d7b28b8
Subproject commit 7bba1b900e4c2190d559286dc05b4155b8ebffe9
Subproject commit 0daaa8581f9a9968cebbc7d14ae9acf1625c0389
Subproject commit 0555aecded8737435747e903efc4b6f3241cc62c
# If you come from bash you might have to change your $PATH.
# export PATH=$HOME/bin:/usr/local/bin:$PATH
# Path to your oh-my-zsh installation.
export ZSH="${HOME}/.oh-my-zsh"
plugins=(mosh npm aws battery git-flow osx brew symfony2 golang rsync python yii web-search tmux git liquidprompt zsh-syntax-highlighting)
source $ZSH/oh-my-zsh.sh
export ZSH="/home/tsiakalt/.oh-my-zsh"
# User configuration
export PATH="${HOME}/bin:${HOME}/Library/Python/2.7/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/local/go/bin"
# Set name of the theme to load --- if set to "random", it will
# load a random theme each time oh-my-zsh is loaded, in which case,
# to know which specific one was loaded, run: echo $RANDOM_THEME
# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
ZSH_THEME="robbyrussell"
# Set list of themes to pick from when loading at random
# Setting this variable when ZSH_THEME=random will cause zsh to load
# a theme from this variable instead of looking in ~/.oh-my-zsh/themes/
# If set to an empty array, this variable will have no effect.
# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
# Uncomment the following line to use case-sensitive completion.
# CASE_SENSITIVE="true"
# Uncomment the following line to use hyphen-insensitive completion.
# Case-sensitive completion must be off. _ and - will be interchangeable.
# HYPHEN_INSENSITIVE="true"
# Uncomment the following line to disable bi-weekly auto-update checks.
# DISABLE_AUTO_UPDATE="true"
# Uncomment the following line to automatically update without prompting.
# DISABLE_UPDATE_PROMPT="true"
# Uncomment the following line to change how often to auto-update (in days).
# export UPDATE_ZSH_DAYS=13
# Uncomment the following line if pasting URLs and other text is messed up.
# DISABLE_MAGIC_FUNCTIONS=true
# Uncomment the following line to disable colors in ls.
# DISABLE_LS_COLORS="true"
# Uncomment the following line to disable auto-setting terminal title.
# DISABLE_AUTO_TITLE="true"
# Uncomment the following line to enable command auto-correction.
# ENABLE_CORRECTION="true"
# Uncomment the following line to display red dots whilst waiting for completion.
# COMPLETION_WAITING_DOTS="true"
export GOPATH="${HOME}/dev/go"
export PATH=$PATH:/usr/local/opt/go/libexec/bin:${GOPATH}/bin
# Uncomment the following line if you want to disable marking untracked files
# under VCS as dirty. This makes repository status check for large repositories
# much, much faster.
# DISABLE_UNTRACKED_FILES_DIRTY="true"
# Uncomment the following line if you want to change the command execution time
# stamp shown in the history command output.
# You can set one of the optional three formats:
# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
# or set a custom format using the strftime function format specifications,
# see 'man strftime' for details.
# HIST_STAMPS="mm/dd/yyyy"
alias fuck='$(thefuck $(fc -ln -1))'
alias FUCK='fuck'
# Would you like to use another custom folder than $ZSH/custom?
# ZSH_CUSTOM=/path/to/new-custom-folder
zstyle :omz:plugins:ssh-agent agent-forwarding on
zstyle :omz:plugins:ssh-agent identities id_rsa
zstyle :omz:plugins:ssh-agent lifetime 4h
# Which plugins would you like to load?
# Standard plugins can be found in ~/.oh-my-zsh/plugins/*
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
plugins=(ansible copydir copybuffer copyfile cp debian dircycle docker-compose docker-machine docker extract git-auto-fetch git-prompt git-remote-branch git gitfast gitignore gnu-utils history httpie jsontools magic-enter node npm nvm rsync screen sublime sudo ssh-agent systemadmin systemd timer tmux tmux-cssh vscode web-search)
source $ZSH/oh-my-zsh.sh
# User configuration
# export MANPATH="/usr/local/man:$MANPATH"
# You may need to manually set your language environment
export LANG=en_US.UTF-8
export LC_ALL=en_US.UTF-8
# export LANG=en_US.UTF-8
# Preferred editor for local and remote sessions
# if [[ -n $SSH_CONNECTION ]]; then
......@@ -25,15 +89,9 @@ export LC_ALL=en_US.UTF-8
# else
# export EDITOR='mvim'
# fi
export EDITOR='vim'
# Compilation flags
export ARCHFLAGS="-arch x86_64"
# ssh
# export SSH_KEY_PATH="~/.ssh/dsa_id"
export PAGER="/usr/bin/most -s"
# export ARCHFLAGS="-arch x86_64"
# Set personal aliases, overriding those provided by oh-my-zsh libs,
# plugins, and themes. Aliases can be placed here, though oh-my-zsh
......@@ -44,51 +102,22 @@ export PAGER="/usr/bin/most -s"
# alias zshconfig="mate ~/.zshrc"
# alias ohmyzsh="mate ~/.oh-my-zsh"
alias gm="jump"
alias sm="bookmark"
alias dm="deletemark"
alias pm="showmarks"
alias lm="showmarks"
alias dt="export DT=\$(date +%Y-%m-%d_%H-%M-%S) && echo \$DT"
alias gs="git status"
alias ga="git add"
alias gd="git diff"
alias gdc="git diff --cached"
alias gc="git commit"
alias gcm="git commit -m"
alias gpu="git push"
alias gp="git pull"
alias gpr="git pull --rebase"
alias gitid="git rev-parse HEAD"
alias sshsocks="ssh -D 8123 -fCvN "
#alias ssh="~/bin/zssh"
alias xssh="/usr/bin/ssh"
export GIT_SSH="/usr/bin/ssh"
eval $(thefuck --alias)
pmanX () { man -t $1 | open -f -a /Applications/Preview.app }
pman () { man -t $1 | ps2pdf - | zathura --fork - }
ffind () { find . -type f -exec grep -Hin "$1" {} \; }
test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
iterm2_print_user_vars() {
iterm2_set_user_var load $(w | head -1 | rev | cut -f 3 -d " " | rev)
}
export NVM_DIR="${HOME}/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
PATH="${HOME}/dev/perl5/bin${PATH:+:${PATH}}"; export PATH;
PERL5LIB="${HOME}/dev/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
PERL_LOCAL_LIB_ROOT="${HOME}/dev/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
PERL_MB_OPT="--install_base \"${HOME}/dev/perl5\""; export PERL_MB_OPT;
PERL_MM_OPT="INSTALL_BASE=${HOME}/dev/perl5"; export PERL_MM_OPT;
unsetopt INC_APPEND_HISTORY
setopt INC_APPEND_HISTORY_TIME
unsetopt SHARE_HISTORY
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
stty intr \^C
# set PATH so it includes user's private bin if it exists
if [ -d "$HOME/bin" ] ; then
PATH="$HOME/bin:$PATH"
fi
# set PATH so it includes user's private bin if it exists
if [ -d "$HOME/.local/bin" ] ; then
PATH="$HOME/.local/bin:$PATH"
fi
alias ged="gedit"
alias aged="gedit ${HOME}/aliases.txt"
alias alu="apt list --upgradable"
[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
if [ -z "$STY" ]; then if $(screen -ls | grep -q pts); then screen -x; else screen -R; fi; fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment