Merge branch 'master' into server

1 files changed, 0 insertions, 62 deletions

diff --git a/shellrc b/shellrc
deleted file mode 100644
index 1deea54..0000000
--- a/shellrc
+++ /dev/null
@@ -1,62 +0,0 @@
-# vim: ft=sh:
-# This is file with aliases and variables shared between bash and zsh
-
-# Continue only if this is interactive shell
-[[ $- != *i* ]] && return
-
-#################################################################################
-# Aliases
-
-alias ls='ls --color=auto'
-eval $(dircolors -b)
-alias ll='ls -lh'
-alias df='df -h'
-alias du='du -h'
-alias grep='grep --color=auto'
-alias git='LANG=en_GB git'
-alias gdb='gdb -q'
-alias cgdb='cgdb -q'
-alias octave='octave-cli -q'
-alias ssh='TERM="xterm-256color" ssh'
-alias feh='feh --magick-timeout 10 -.'
-
-export LESS=-R
-export LESS_TERMCAP_mb=$'\E[1;31m'
-export LESS_TERMCAP_md=$'\E[1;36m'
-export LESS_TERMCAP_me=$'\E[0m'
-export LESS_TERMCAP_se=$'\E[0m'
-export LESS_TERMCAP_so=$'\E[01;44;33m'
-export LESS_TERMCAP_ue=$'\E[0m'
-export LESS_TERMCAP_us=$'\E[1;32m'
-[ -x /usr/bin/src-hilite-lesspipe.sh ] && export LESSOPEN="| /usr/bin/src-hilite-lesspipe.sh %s"
-
-alias gst='git status'
-alias v='vim'
-alias i='i3-msg'
-
-# Systemd aliases if we are running systemd
-if pidof systemd >/dev/null 2>/dev/null; then
-	alias sctl='sudo systemctl'
-	alias usctl='systemctl --user'
-	alias jrn='journalctl'
-	alias ujrn='jrn --user'
-fi
-
-#################################################################################
-# Utility functions
-
-# Generate random password (optionally takes length of password as first argument)
-genpasswd() {
-	local l=$1
-	[ -n "$l" ] || l=16
-	tr -dc A-Za-z0-9_ < /dev/urandom | head -c "$l" | xargs
-}
-
-# Run given command every second
-dorepeat() {
-	while true; do
-		"$@"
-		sleep 1
-		echo
-	done
-}