From fc327dacd538734da542d74c3fea584d205a1358 Mon Sep 17 00:00:00 2001 From: NeodarZ Date: Sat, 29 Jul 2017 20:28:50 +0200 Subject: Manual merge from t410 and update zsh conf file --- zsh/.zsh/aliases.zsh | 123 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 88 insertions(+), 35 deletions(-) (limited to 'zsh/.zsh/aliases.zsh') diff --git a/zsh/.zsh/aliases.zsh b/zsh/.zsh/aliases.zsh index 8fe9d93..fb76cbe 100755 --- a/zsh/.zsh/aliases.zsh +++ b/zsh/.zsh/aliases.zsh @@ -15,48 +15,46 @@ # ░░░░░░░░░░ # #█▓▒░ aliases -alias xyzzy="echo nothing happens" -alias ls="ls -hF --color=auto" -alias ll="ls -lahF --color=auto" -alias lsl="ls -lhF --color=auto" -alias "cd.."="cd ../" -alias up="cd ../" +alias l='ls -F --color=auto --group-directories-first' +alias la='ls -lahF --color=auto --group-directories-first --time-style=+"%d.%m.%Y %H:%M"' +alias ll='ls -lhF --color=auto --group-directories-first --time-style=+"%d.%m.%Y %H:%M"' +alias ls='ls -F --color=auto --group-directories-first' +alias ".."="cd ../" +alias "..."="cd ../.." alias rmrf="rm -rf" alias psef="ps -ef" alias mkdir="mkdir -p" alias cp="cp -r" alias scp="scp -r" -alias mkdir="mkdir -p" alias xsel="xsel -b" alias fuck='sudo $(fc -ln -1)' alias v="vim" alias vi="vim" alias emacs="vim" -alias git="hub" -alias g="hub" +alias g="git" alias ga="git add" alias gc="git commit -m" alias gs="git status" alias gd="git diff" -alias gf="git fetch" +#alias gf="git fetch" To use with hub command alias gm="git merge" alias gr="git rebase" alias gp="git push" -alias gu="git unstage" -alias gg="git graph" +alias gu="git pull" +#alias gu="git unstage" # To use with hub command +#alias gg="git graph" # To use with hub command alias gco="git checkout" alias gcs="git commit -S -m" -alias gpr="hub pull-request" +#alias gpr="hub pull-request" To use with hub command alias ag="ag --color --color-line-number '0;35' --color-match '46;30' --color-path '4;36'" alias tree='tree -CAFa -I "CVS|*.*.package|.svn|.git|.hg|node_modules|bower_components" --dirsfirst' -alias rock="ncmpcpp" alias mixer="alsamixer" -alias genplaylist="cd ~/music;find . -name '*.mp3' -o -name '*.flac'|sed -e 's%^./%%g' > ~/.mpd/playlists/all.m3u" +#alias genplaylist="cd ~/music;find . -name '*.mp3' -o -name '*.flac'|sed -e 's%^./%%g' > ~/.mpd/playlists/all.m3u" alias matrix="cmatrix -b" alias tempwatch="while :; do sensors; sleep 1 && clear; done;" -alias term="urxvtc -hold -e " #used for run menu -alias sprunge="curl -F 'sprunge=<-' http://sprunge.us" -alias clbin="curl -F 'clbin=<-' https://clbin.com" +#alias term="urxvtc -hold -e " #used for run menu +#alias sprunge="curl -F 'sprunge=<-' http://sprunge.us" +#alias clbin="curl -F 'clbin=<-' https://clbin.com" alias toiletlist='for i in ${TOILET_FONT_PATH:=/usr/share/figlet}/*.{t,f}lf; do j=${i##*/}; echo ""; echo "╓───── "$j; echo "╙────────────────────────────────────── ─ ─ "; echo ""; toilet -d "${i%/*}" -f "$j" "${j%.*}"; done' alias ascii="toilet -t -f 3d" alias future="toilet -t -f future" @@ -64,14 +62,60 @@ alias rusto="toilet -t -f rusto" alias rustofat="toilet -t -f rustofat" alias lol="base64 ~/.config/mpd/playlists/all.m3u - mpc clear - mpc load all.m3u - mpc update -} +#function genplaylist() { +# cd ~/music +# find . -name '*.mp3' -o -name '*.flac'|sed -e 's%^./%%g' > ~/.config/mpd/playlists/all.m3u +# mpc clear +# mpc load all.m3u +# mpc update +#} function t() { X=$# @@ -104,14 +148,23 @@ function c() { done } # colorized less -function l() { +function le() { pygmentize -O style=sourcerer -f console256 -g $1 | less -r } # read markdown files like manpages -function md() { +function mdm() { pandoc -s -f markdown -t man "$*" | man -l - } # nullpointer url shortener -function short() { - curl -F"shorten=$*" https://0x0.st -} +#function short() { +# curl -F"shorten=$*" https://0x0.st +#} + +mkdir -p ~/.ssh-agent-thing +if ! pgrep -u "$USER" ssh-agent > /dev/null; then + ssh-agent > ~/.ssh-agent-thing +fi +if [[ "$SSH_AGENT_PID" == "" ]]; then + eval "$(<~/.ssh-agent-thing)" +fi + -- cgit v1.2.1