From 0b7ab1795e1057a926c267f539d43430c87fecb1 Mon Sep 17 00:00:00 2001 From: Tim Swihart Date: Mon, 25 Mar 2013 15:11:58 -0400 Subject: [PATCH] reorganizing files --- Linux-exports.sh | 2 +- aliases.sh | 2 +- dwmloop => bin/dwmloop | 0 startdwm => bin/startdwm | 0 Xmodmap => config/Xmodmap | 0 Xresources => config/Xresources | 0 conkyrc => config/conkyrc | 0 editrc => config/editrc | 0 gemrc => config/gemrc | 0 gitignore => config/gitignore | 0 {vim => config}/gvimrc | 0 inputrc => config/inputrc | 0 tmux.conf => config/tmux.conf | 0 todo.cfg => config/todo.cfg | 0 {vim => config}/vimrc | 0 zpreztorc => config/zpreztorc | 0 zshrc => config/zshrc | 1 + exports.sh | 24 ------------------------ setup.sh | 14 -------------- 19 files changed, 3 insertions(+), 40 deletions(-) rename dwmloop => bin/dwmloop (100%) rename startdwm => bin/startdwm (100%) rename Xmodmap => config/Xmodmap (100%) rename Xresources => config/Xresources (100%) rename conkyrc => config/conkyrc (100%) rename editrc => config/editrc (100%) rename gemrc => config/gemrc (100%) rename gitignore => config/gitignore (100%) rename {vim => config}/gvimrc (100%) rename inputrc => config/inputrc (100%) rename tmux.conf => config/tmux.conf (100%) rename todo.cfg => config/todo.cfg (100%) rename {vim => config}/vimrc (100%) rename zpreztorc => config/zpreztorc (100%) rename zshrc => config/zshrc (97%) delete mode 100644 exports.sh delete mode 100755 setup.sh diff --git a/Linux-exports.sh b/Linux-exports.sh index e650252..91d9f42 100644 --- a/Linux-exports.sh +++ b/Linux-exports.sh @@ -6,7 +6,6 @@ alias t='todo.sh' export TODOTXT_DEFAULT_ACTION=pv export REALLY_GEM_UPDATE_SYSTEM=true -export GOROOT="$HOME/dev/go" export GOROOT="$HOME/dev/go" export GOPATH=$HOME/dev/mygo @@ -17,6 +16,7 @@ export CC=/usr/bin/clang export CXX=/usr/bin/clang++ export EDITOR=vim +export SUDOEDITOR=vim source $GOROOT/misc/zsh/go diff --git a/aliases.sh b/aliases.sh index 98b7acf..6440265 100644 --- a/aliases.sh +++ b/aliases.sh @@ -4,4 +4,4 @@ alias rm=trash alias make430="PATH=`brew --prefix llvm-msp430`/bin:$PATH make" alias mspmake="PATH=`brew --prefix llvm-msp430`/bin:$PATH make" -eval "$(hub alias -s)" +#eval "$(hub alias -s)" diff --git a/dwmloop b/bin/dwmloop similarity index 100% rename from dwmloop rename to bin/dwmloop diff --git a/startdwm b/bin/startdwm similarity index 100% rename from startdwm rename to bin/startdwm diff --git a/Xmodmap b/config/Xmodmap similarity index 100% rename from Xmodmap rename to config/Xmodmap diff --git a/Xresources b/config/Xresources similarity index 100% rename from Xresources rename to config/Xresources diff --git a/conkyrc b/config/conkyrc similarity index 100% rename from conkyrc rename to config/conkyrc diff --git a/editrc b/config/editrc similarity index 100% rename from editrc rename to config/editrc diff --git a/gemrc b/config/gemrc similarity index 100% rename from gemrc rename to config/gemrc diff --git a/gitignore b/config/gitignore similarity index 100% rename from gitignore rename to config/gitignore diff --git a/vim/gvimrc b/config/gvimrc similarity index 100% rename from vim/gvimrc rename to config/gvimrc diff --git a/inputrc b/config/inputrc similarity index 100% rename from inputrc rename to config/inputrc diff --git a/tmux.conf b/config/tmux.conf similarity index 100% rename from tmux.conf rename to config/tmux.conf diff --git a/todo.cfg b/config/todo.cfg similarity index 100% rename from todo.cfg rename to config/todo.cfg diff --git a/vim/vimrc b/config/vimrc similarity index 100% rename from vim/vimrc rename to config/vimrc diff --git a/zpreztorc b/config/zpreztorc similarity index 100% rename from zpreztorc rename to config/zpreztorc diff --git a/zshrc b/config/zshrc similarity index 97% rename from zshrc rename to config/zshrc index 9affca2..46cbb6c 100644 --- a/zshrc +++ b/config/zshrc @@ -43,3 +43,4 @@ source ~/.secrets #secrets! source ~/.exports.sh if [ "$TMUX" != "" ]; then export TERM="screen-256color"; fi [[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator +source ~/.fresh/build/shell.sh diff --git a/exports.sh b/exports.sh deleted file mode 100644 index b3ec94d..0000000 --- a/exports.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -#cross-platform shell exports -export TODOTXT_DEFAULT_ACTION=ls -export REALLY_GEM_UPDATE_SYSTEM=true -export GOROOT="$HOME/dev/go" -export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.6/dist-packages" - -export CC=/usr/bin/clang -export CXX=/usr/bin/clang++ - -export EDITOR=gvim -export SUDO_EDITOR=vim - -source $GOROOT/misc/zsh/go - -export vless='/usr/share/vim/vimcurrent/macros/less.sh' -export PAGER="/bin/sh -c \"unset PAGER;col -b -x | \ - vim -R -c 'set ft=man nomod nolist' -c 'map q :q' \ - -c 'map ' -c 'map b ' \ - -c 'nmap K :Man =expand(\\\"\\\")' -\"" -alias ai="sudo apt-get install" -alias adu="sudo apt-get dist-upgrade" -alias ar="sudo apt-get remove" -alias ai="sudo apt-get install" diff --git a/setup.sh b/setup.sh deleted file mode 100755 index 7136cf6..0000000 --- a/setup.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# set up dotfiles -if [ $(uname -s) == "Darwin" ]; then - IGNORE="linux" -elif [ $(uname -s) == "Linux" ]; then - IGNORE="mac" -fi -for i in *; -do - if [ "${i}" != "setup.sh" ]; then - echo $i - #ln -sf $(pwd)/$i ../.$i - fi -done