From efc23188fe212190b506d19914275732d76f8a06 Mon Sep 17 00:00:00 2001 From: Jordan Orelli Date: Tue, 24 May 2016 12:16:18 -0400 Subject: [PATCH] yay --- .bashrc | 69 --------------------------------------------------------- .vimrc | 7 ++++++ 2 files changed, 7 insertions(+), 69 deletions(-) diff --git a/.bashrc b/.bashrc index 7159445..4ec6130 100644 --- a/.bashrc +++ b/.bashrc @@ -2,7 +2,6 @@ [ -z "$PS1" ] && return # don't put duplicate lines in the history. See bash(1) for more options -# don't overwrite GNU Midnight Commander's setting of `ignorespace'. export HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups # ... or force ignoredups and ignorespace export HISTCONTROL=ignoreboth @@ -20,14 +19,6 @@ shopt -s histappend # update the values of LINES and COLUMNS. shopt -s checkwinsize -# make less more friendly for non-text input files, see lesspipe(1) -#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - # set a fancy prompt (non-color, unless we know we "want" color) case "$TERM" in xterm-color) color_prompt=yes;; @@ -38,73 +29,13 @@ esac # should be on the output of commands, not on the prompt force_color_prompt=yes -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi -fi - -#if [ "$color_prompt" = yes ]; then -# PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' -#else -# PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' -#fi #unset color_prompt force_color_prompt export PS1="\[\e[0;32m\]\u@\h[\j] \w: \[\e[m\]" - - #If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; -esac - -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. - -#if [ -f ~/.bash_aliases ]; then -# . ~/.bash_aliases -#fi - -# enable color support of ls and also add handy aliases -if [ -x /usr/bin/dircolors ]; then - 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' - - # alias sudo='sudo -E' -fi - -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -if [ -f /etc/bash_completion ]; then - . /etc/bash_completion -fi - export EDITOR=vim -export SVN_EDITOR=vim if [ -f "$HOME/.localrc" ]; then source "$HOME/.localrc" fi -alias f='find . -type f -name' -alias d='find . -type d -name' -alias tree="tree -I '*.pyc'" alias randompass="python -c \"import string, random; print ''.join(random.sample(string.letters+string.digits, 8))\"" diff --git a/.vimrc b/.vimrc index 73cd50b..750f2c5 100644 --- a/.vimrc +++ b/.vimrc @@ -17,6 +17,7 @@ call vundle#begin() Plugin 'fatih/vim-go' Plugin 'nanotech/jellybeans.vim' Plugin 'ervandew/supertab' + Plugin 'scrooloose/nerdtree' call vundle#end() " required @@ -150,3 +151,9 @@ let g:SuperTabClosePreviewOnPopupClose = 1 " supress go fmt errors on file write let g:go_fmt_fail_silently = 1 + +" move by visual lines when mapping instead of physical lines +noremap k gk +noremap j gj +noremap 0 g0 +noremap $ g$