Permalink
Browse files

Merge branch 'master' of github.com:alexlovelltroy/dotfiles

Conflicts:
	.muttrc
  • Loading branch information...
2 parents f3a63e5 + 3895119 commit 28392d5c3cb4e74b1f9270f3cf28c0d3a02fbe7b @alexlovelltroy committed May 18, 2012
Showing with 27 additions and 6 deletions.
  1. +14 −2 .bash_profile
  2. +0 −2 .gitconfig
  3. +1 −0 .hgrc
  4. +7 −1 .muttrc
  5. +5 −1 .screenrc
View
@@ -7,10 +7,18 @@ echo "Your environment doesn't know who you are."
echo "Copy and paste the following lines into a file called ~/.BASH_IDENTITY"
echo "export GIT_AUTHOR_NAME="
echo "export GIT_AUTHOR_EMAIL="
-echo "export GIT_COMMITTER_NAME=\"$GIT_AUTHOR_NAME\""
-echo "export GIT_COMMITTER_EMAIL=\"$GIT_AUTHOR_EMAIL\""
+echo "export GIT_COMMITTER_NAME=\"\$GIT_AUTHOR_NAME\""
+echo "export GIT_COMMITTER_EMAIL=\"\$GIT_AUTHOR_EMAIL\""
fi
+#Set up the paths
+PATH="/sbin:/usr/sbin:/bin:/usr/bin"
+for dir in /usr/local/bin /usr/X11/bin /usr/local/git/bin /usr/local/MacGPG2/bin /Users/alt/Documents/ec2-api-tools-1.5.2.4/bin /usr/local/texlive/2011/bin/x86_64-darwin /usr/texbin; do
+ if [ -d "$dir" ]; then
+ PATH=$PATH:"$dir";
+ fi
+ export PATH
+done
##### Screen can work with ssh-agent even when you reconnect
#if [ -n "$SSH_AUTH_SOCK" ];
@@ -70,6 +78,10 @@ else
alias ls='ls --color=auto'
fi
+if [ -f ~/.profile ]; then
+ source ~/.profile
+fi
+
# csv from mysql output = mysql -e | sed 's/\t/","/g;s/^/"/;s/$/"/;s/\n//g' > filename.csv
function skip-first-n-lines() {
View
@@ -1,5 +1,3 @@
-[core]
- excludesfile = ~/.gitignore_global
[merge]
tool = vimdiff
[color]
View
1 .hgrc
@@ -10,5 +10,6 @@ convert =
fetch =
color =
transplant =
+hgext.mq =
pager =
rebase =
View
@@ -1,9 +1,11 @@
-# Account Information in other file
+##account settings
+Account Information in other file
source ~/.mutt_accounts
#
# Gmail for mutt
set folder = "imaps://imap.gmail.com:993"
set spoolfile = "imaps://imap.gmail.com:993/INBOX"
+#set spoolfile = "+INBOX"
set postponed = "imaps://imap.gmail.com:993/[Gmail]/Drafts"
set trash = "imaps://imap.gmail.com:993/[Gmail]/Trash"
set record = "+[Gmail]/Sent Mail"
@@ -15,8 +17,10 @@ macro index gd "<change-folder>=[Gmail]/Drafts<enter>" "Go to drafts"
set header_cache =~/.mutt/cache/headers
set message_cachedir =~/.mutt/cache/bodies
+#set certificate_file =~/.mutt/certificates
set pager_index_lines=16
set pager_context=4
+#set spoolfile=~/.mailspool/alex
set signature="~/.sig"
set move = no #Stop asking to "move read messages to mbox"!
@@ -139,6 +143,8 @@ set pgp_verify_command="gpg --no-verbose --batch --output - --verify %s %f"
set pgp_decrypt_command="gpg --passphrase-fd 0 --no-verbose --batch --output - %f"
set pgp_sign_command="gpg --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
set pgp_clearsign_command="gpg --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
+set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x3FEB79D1 -- -r %r -- %f"
+set pgp_encrypt_sign_command="pgpewrap gpg --passphrase-fd 0 --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust --encrypt-to 0x3FEB79D1 -- -r %r -- %f"
set pgp_import_command="gpg --no-verbose --import -v %f"
set pgp_export_command="gpg --no-verbose --export --armor %r"
set pgp_verify_key_command="gpg --no-verbose --batch --fingerprint --check-sigs %r"
View
@@ -1,4 +1,3 @@
-
autodetach on # default: on
crlf off # default: off
deflogin on # default: on
@@ -18,6 +17,11 @@ termcapinfo xterm-color kD=\E[3~ #make delete work
termcapinfo xterm* ti@:te@
shelltitle '] |bash'
+screen -t logs 0
+screen -t model/view 1
+screen -t templates 2
+screen -t mysql 3
+
hardstatus off
hardstatus alwayslastline

0 comments on commit 28392d5

Please sign in to comment.