summaryrefslogtreecommitdiff
path: root/zshrc
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2015-06-18 11:43:34 +0200
committerUrbain Vaes <urbain@vaes.uk>2015-06-18 11:43:34 +0200
commit6c9dd9ada1329bf1dc96be23ab4e48320b874865 (patch)
treeb37ff5e7ea8b59180e477e6527f81c3e13cd334d /zshrc
parenta9eafd950f9ea4bc20a5a8cd00fd1536cd0a8f2b (diff)
Add minor changes (colorschemes + fzf integration)
Diffstat (limited to 'zshrc')
-rw-r--r--zshrc16
1 files changed, 15 insertions, 1 deletions
diff --git a/zshrc b/zshrc
index 43a2c02..cfbc5a2 100644
--- a/zshrc
+++ b/zshrc
@@ -93,7 +93,6 @@ bindkey -a 'j' history-beginning-search-forward
crontab ~/.crontab
TERM=xterm-256color
-source ~/github/fzf-marks/fzf-marks.zsh
fancy-ctrl-z () {
@@ -107,4 +106,19 @@ fancy-ctrl-z () {
}
zle -N fancy-ctrl-z
bindkey '^Z' fancy-ctrl-z
+
+fshow() {
+ git log --graph --color=always \
+ --format="%C(auto)%h%d %s %C(black)%C(bold)%cr" "$@" |
+ fzf --ansi --no-sort --reverse --tiebreak=index --toggle-sort=\` \
+ --bind 'ctrl-m:execute:
+ echo {} | grep -o "[a-f0-9]\{7\}" |
+ xargs -I % sh -c "git show --color=always % | less -R"'
+}
+
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+source ~/github/fzf-marks/fzf-marks.zsh
+source ~/github/z/z.sh
+source ~/github/fzf-extras/fzf-extras.sh
+source ~/github/fzf-extras/fzf-extras.zsh
+xrdb ~/.Xressources