Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

unmerge profile from bashrc

  • Loading branch information...
commit aaf4f97250103138a9cdaa315fc606bcd997a2d1 1 parent e42c1aa
Nikolay Khodyunya authored
Showing with 52 additions and 52 deletions.
  1. +3 −52 dot.bashrc
  2. +49 −0 dot.profile
View
55 dot.bashrc
@@ -24,16 +24,11 @@ shopt -s globstar
# make less more friendly for non-text input files, see lesspipe(1)
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-# 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 grep='grep --color=auto'
- alias fgrep='fgrep --color=auto'
- alias egrep='egrep --color=auto'
-fi
+alias grep='grep --color=auto'
+alias fgrep='fgrep --color=auto'
+alias egrep='egrep --color=auto'
alias vi="vim"
alias sudo='sudo -E'
-alias rtorrent='dtach -A /tmp/rtorrent.socket rtorrent'
alias ls="ls -hF --color=auto --group-directories-first --sort=version"
alias l="ls"
alias ll="ls -l"
@@ -41,10 +36,6 @@ alias la="ls -A"
alias ss='python -m SimpleHTTPServer' # simple server (serves current dir on port 8000)
alias df="df -h"
alias du="du -h"
-alias less=$PAGER
-for cmd in mount ifconfig pacman chmod chown rc.d; do
- alias $cmd="sudo $cmd"
-done
# Add an "alert" alias for long running commands. Use like so:
# sleep 10; alert
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
@@ -61,46 +52,6 @@ if ! shopt -oq posix; then
fi
fi
-#merge with ~/.bash_profile
-export GREP_OPTIONS="--color=auto"
-export GREP_COLOR="1\;32"
-
-export CFLAGS="-march=native -mtune=native -O3 -pipe"
-export CXXFLAGS="$CFLAGS"
-export LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
-export MAKEFLAGS="-j5"
-# Set locale
-export LANG="ru_RU.UTF-8"
-export LC_TIME="C"
-export LC_COLLATE="C"
-export LC_MESSAGES="C"
-
-for p in $HOME/bin $HOME/.cabal/bin $HOME/.rbenv/bin /opt/bin /usr/games/bin; do
- if [[ ! -d $p ]]; then
- continue
- else
- if [[ ! $PATH == *$p* ]]; then
- PATH="$p:$PATH"
- fi
- fi
-done
-export PATH
-
-export MANPATH=$HOME/share/man:$MANPATH
-export MANWIDTH=80
-
-export PAGER='less'
-export LESS='-R -i'
-export EDITOR="/usr/bin/env vim"
-export RUBYOPT=""
-export RI="-f ansi"
-
-if [ -n "$DISPLAY" ]; then
- export GTK_IM_MODULE="xim"
- export QT_IM_MODULE="xim"
- export BROWSER=chromium
-fi
-
# Set up ssh-agent
SSH_ENV="$HOME/.ssh/environment"
View
49 dot.profile
@@ -0,0 +1,49 @@
+# ~/.profile: executed by the command interpreter for login shells.
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
+# exists.
+# see /usr/share/doc/bash/examples/startup-files for examples.
+# the files are located in the bash-doc package.
+
+# the default umask is set in /etc/profile; for setting the umask
+# for ssh logins, install and configure the libpam-umask package.
+#umask 022
+
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+ # include .bashrc if it exists
+ if [ -f "$HOME/.bashrc" ]; then
+ . "$HOME/.bashrc"
+ fi
+fi
+if [ -n "$DISPLAY" ]; then
+ export GTK_IM_MODULE="xim"
+ export QT_IM_MODULE="xim"
+ export BROWSER=chromium
+fi
+
+export GREP_OPTIONS="--color=auto"
+export GREP_COLOR="1\;32"
+
+export CFLAGS="-march=native -mtune=native -O3 -pipe"
+export CXXFLAGS="$CFLAGS"
+export LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
+export MAKEFLAGS="-j5"
+
+for p in $HOME/bin $HOME/.cabal/bin $HOME/.rbenv/bin /opt/bin /usr/games/bin; do
+ if [[ ! -d $p ]]; then
+ continue
+ else
+ if [[ ! $PATH == *$p* ]]; then
+ PATH="$p:$PATH"
+ fi
+ fi
+done
+export PATH
+
+export MANPATH=$HOME/share/man:$MANPATH
+export MANWIDTH=80
+
+export LESS='-R -i'
+export RI="-f ansi"
+
+eval "$(rbenv init -)"
Please sign in to comment.
Something went wrong with that request. Please try again.