aboutsummaryrefslogtreecommitdiff
path: root/Shell
diff options
context:
space:
mode:
authorVasil Zlatanov <v@skozl.com>2016-10-13 19:20:52 +0100
committerVasil Zlatanov <v@skozl.com>2016-10-13 19:20:52 +0100
commit6531c75eb9a6a664a45b372014a709ac9910c1e2 (patch)
tree191153123a8a8560aee5176422bf81be4bcb210d /Shell
parent1c221916600457d945094c1df59f0756aca19367 (diff)
parent52582edc079a197d8204c1310ecd37176bfaef84 (diff)
downloaddotfiles-6531c75eb9a6a664a45b372014a709ac9910c1e2.tar.gz
dotfiles-6531c75eb9a6a664a45b372014a709ac9910c1e2.tar.bz2
dotfiles-6531c75eb9a6a664a45b372014a709ac9910c1e2.zip
Merge branch 'master' of https://github.com/vaskozl/dotfiles
Diffstat (limited to 'Shell')
-rw-r--r--Shell/bash_aliases2
-rw-r--r--Shell/bashrc30
-rw-r--r--Shell/zshrc2
3 files changed, 18 insertions, 16 deletions
diff --git a/Shell/bash_aliases b/Shell/bash_aliases
index a284d4d..d9612b7 100644
--- a/Shell/bash_aliases
+++ b/Shell/bash_aliases
@@ -46,7 +46,7 @@ alias py='python3'
alias scan='iwlist wlp2s0 scan'
alias connect='sudo iwconfig wlan0 essid'
alias home='cd /home/vasko'
-alias l='ls -F'
+alias l='ls'
alias d='ls'
alias dm='ls | more'
alias e='cd'
diff --git a/Shell/bashrc b/Shell/bashrc
index abe85a8..2cf29d4 100644
--- a/Shell/bashrc
+++ b/Shell/bashrc
@@ -73,21 +73,21 @@ xterm*|rxvt*)
esac
# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
- test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
- alias ls='ls --color=auto'
- alias dir='dir --color=auto'
- alias vdir='vdir --color=auto'
-
- alias grep='grep --color=auto'
- alias fgrep='fgrep --color=auto'
- alias egrep='egrep --color=auto'
-fi
-
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
+#if [ -x /usr/bin/dircolors ]; then
+# test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+# alias ls='ls --color=auto'
+# alias dir='dir --color=auto'
+# alias vdir='vdir --color=auto'
+#
+# alias grep='grep --color=auto'
+# alias fgrep='fgrep --color=auto'
+# alias egrep='egrep --color=auto'
+#fi
+#
+## some more ls aliases
+#alias ll='ls -alF'
+#alias la='ls -A'
+#alias l='ls -CF'
# Add an "alert" alias for long running commands. Use like so:
# sleep 10; alert
diff --git a/Shell/zshrc b/Shell/zshrc
index 36ee6ac..3e4b71d 100644
--- a/Shell/zshrc
+++ b/Shell/zshrc
@@ -54,6 +54,8 @@ if [ -x /usr/bin/dircolors ]; then
alias egrep='egrep --color=auto'
fi
+export ANDROID_HOME=/opt/android-sdk
+
~/bin/sysinfo