From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Mon, 30 Nov 2015 10:02:29 +0000 (+0000)
Subject: Remove zsh and set up note taking
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=bd58ef5147bd0d7cfea4148e69d64634bceaa9d6;p=max%2Fdotfiles.git

Remove zsh and set up note taking
---

diff --git a/zshenv b/bash_profile
similarity index 66%
rename from zshenv
rename to bash_profile
index 06a8fbd..499dc52 100644
--- a/zshenv
+++ b/bash_profile
@@ -2,10 +2,8 @@ export NPM_PACKAGES="$HOME/.npm-packages"
 export EDITOR="/usr/bin/vim"
 export PAGER="/usr/bin/less"
 export PATH="/home/max/bin:$NPM_PACKAGES/bin:${PATH}"
+export PATH="$PATH:/home/max/bin:$NPM_PACKAGES/bin:$HOME/.rvm/bin"
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
 unset MANPATH
 MANPATH="$NPM_PACKAGES/share/man:$(manpath)"
 NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH"
-
-alias emacs="emacs -nw"
-alias ls="ls --color=auto"
-alias la="ls -la"
diff --git a/bashrc b/bashrc
index a2a2cdd..f409183 100644
--- a/bashrc
+++ b/bashrc
@@ -111,3 +111,13 @@ if ! shopt -oq posix; then
     . /etc/bash_completion
   fi
 fi
+
+
+# Some simple note taking functions
+n() {
+  $EDITOR ~/notes/"$*".txt
+}
+
+nls() {
+  ls -c ~/notes/ | grep "$*"
+}
diff --git a/zprofile b/zprofile
deleted file mode 100644
index 9b46929..0000000
--- a/zprofile
+++ /dev/null
@@ -1 +0,0 @@
-export PATH="/home/max/bin:${PATH}"
diff --git a/zshrc b/zshrc
deleted file mode 100644
index 14b884f..0000000
--- a/zshrc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/zsh
-
-# zsh config file
-
-# Completion
-autoload -U compinit
-compinit
-
-zstyle ':completion:*:descriptions' format '%U%B%d%b%u'
-zstyle ':completion:*:warnings' format '%BSorry, no matches for: %d%b'
-
-# Correction - zsh will correct mispelt commands
-setopt correctall
-
-# Prompt - Set prompt to gentoo
-autoload -U promptinit
-promptinit
-autoload -U colors && colors
-
-autoload -Uz vcs_info
-precmd () { vcs_info }
-setopt prompt_subst
-
-zstyle ':vcs_info:*' enable git
-zstyle ':vcs_info:*' formats "%s-[%b]"
-PROMPT="%F{green}%n@%m%k %B%F{blue}%3~ %# %b%f%k"
-RPROMPT="%B%F{blue} \${vcs_info_msg_0_} %(?..%F{red}<%?>)"
-
-# Command history
-export HISTSIZE=2000
-export HISTFILE="$HOME/.zsh_history"
-export SAVEHIST=$HISTSIZE
-bindkey "^[[A" history-search-backward
-bindkey "^[[B" history-search-forward
-
-setopt hist_ignore_all_dups
-setopt hist_ignore_space
-
-# Misc
-setopt autocd
-
-export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"