Commits

Mike Steder committed 4854207

Adding remaining changes to from UC work machine.

  • Participants
  • Parent commits 93e5b61

Comments (0)

Files changed (5)

 
 # switch to regexp syntax.
 syntax: regexp
+
+^pkg/
 # EC2
 
 export AWS_KEYPAIR=steder.ci
+# bryce uses EC2_KEY in his configs
+export EC2_KEY=$EC2_PRIVATE_KEY
+
 export EC2_CERT=$(/bin/ls ~/.ec2/cert-*.pem)
 export EC2_PRIVATE_KEY=$(/bin/ls ~/.ec2/pk-*.pem)
-# bryce uses EC2_KEY in his configs
-export EC2_KEY=$EC2_PRIVATE_KEY
+
 export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
 export EC2_AMITOOL_HOME="/usr/local/Cellar/ec2-ami-tools/1.3-45758/jars"
 export EC2_HOME="/usr/local/Cellar/ec2-api-tools/1.4.2.2/jars"

File emacs.d/custom.el

   ;; Your init file should contain only one such instance.
   ;; If there is more than one, they won't work right.
  '(aquamacs-additional-fontsets nil t)
- '(aquamacs-customization-version-id 213 t)
+ '(aquamacs-customization-version-id 215 t)
  '(aquamacs-tool-bar-user-customization nil t)
- '(default-frame-alist (quote ((vertical-scroll-bars . right) (menu-bar-lines . 1) (tool-bar-lines . 0) (fringe) (right-fringe) (left-fringe . 1) (internal-border-width . 0) (cursor-type . box) (background-color . "#ffffff") (background-mode . light) (border-color . "black") (cursor-color . "#000000") (foreground-color . "#000000") (mouse-color . "#000000"))))
+ '(column-number-mode nil)
+ '(default-frame-alist (quote ((vertical-scroll-bars . right) (internal-border-width . 0) (cursor-type . box) (modeline . t) (fringe) (border-color . "black") (mouse-color . "black") (background-mode . light) (tool-bar-lines . 0) (menu-bar-lines . 1) (right-fringe . 11) (left-fringe . 3) (cursor-color . "red") (background-color . "white") (foreground-color . "black") (font . "-apple-Monaco-medium-normal-normal-*-12-*-*-*-m-0-iso10646-1") (fontsize . 0) (font-backend ns))))
  '(display-time-mode t)
  '(mu-worlds (quote (["Waterfall Glen" "wfg.mcs.anl.gov" 7777 "mikeps" "bub4202"])))
  '(ns-tool-bar-display-mode nil t)

File emacs.d/mspython.el

-;; Advanced Python stuff
-;; Pymacs
-;(require 'pymacs)
-;(autoload 'pymacs "pymacs" nil t)
-;(autoload 'pymacs-load "pymacs" nil t)
-;(autoload 'pymacs-eval "pymacs" nil t)
-;(autoload 'pymacs-apply "pymacs")
-;(autoload 'pymacs-call "pymacs")
-
-;; python-mode:
-;(setq load-path (cons "/usr/share/emacs/site-lisp" load-path))
-;(autoload 'python-mode "python-mode" "Python editing mode." t)
-;(setq auto-mode-alist
-;      (cons '("\\.py$" . python-mode) auto-mode-alist))
-
-;; Bicycle Repair - Python Refactoring
-;(pymacs-load "bikeemacs" "brm-")
-;(brm-init)
-
-;;; Get python documentation 
-;; get help on a symbol: C-c C-f
-;(add-hook 'python-mode-hook
-;          '(lambda () (eldoc-mode 1)) t)
-
+;;; My python configuration
+;;
+;; Highlights
+;; + Pyflakes
+;; + Support for syntax highlighting in common files like tap, tac, tml, yaml
+;; + Pymacs + Rope for Refactoring, Completion, Help at Point, etc
+;;  *
+;;  *
 
 ;; PYTHON MODE FOR TWISTED
 (add-to-list 'auto-mode-alist '("\\.tap\\'" . python-mode))
 (add-to-list 'auto-mode-alist '("\\.tac\\'" . python-mode))
 (add-to-list 'auto-mode-alist '("\\.tml\\'" . python-mode))
 
-;; Pyflakes and Flymake for Python!  WHOOO!
-; (defun py-pychecker-run ()
-;  (interactive)
-;    (shell-command (concat
-;                    "pyflakes "
-;                    (buffer-file-name))
-;                   "*compilation*")
-;    (switch-to-buffer-other-window "*compilation*"))
-
+;; PYFLAKES
 ;; configure hooks to run pyflakes automatically with flymake mode:
 ;; NOTE: this is super sweet
 (when (load "flymake" t)
   (delete '("\\.xml?\\'" flymake-xml-init) flymake-allowed-file-name-masks)
   (add-to-list 'flymake-allowed-file-name-masks
                '("\\.py\\'" flymake-pyflakes-init)))
-;; 
+;;
 (add-hook 'find-file-hook 'flymake-find-file-hook)
 
 ;; run pyflakes(instead of pychecker) manually with C-c C-w:
 
 
 ;; MS TEST
+;; TODO: Probably shouldn't be python specific:
 (require 'mstest)
 
 ;; YAML mode:
 (add-to-list 'auto-mode-alist '("\\.jinja2\\'" . nxml-mode))
 ;;(add-to-list 'auto-mode-alist '("\\.jsp\\'" . jsp-mode))
 
+;; Pymacs
+;;  Provides elisp to python bridge allowing you to call elisp from
+;;  python and vice versa.  Also enables extensions to Emacs through
+;;  Python code.
+;;
+;;  see ~/etc/setup_pymacs.sh
+;; (require 'pymacs)
+;; (autoload 'pymacs "pymacs" nil t)
+;; (autoload 'pymacs-load "pymacs" nil t)
+;; (autoload 'pymacs-eval "pymacs" nil t)
+;; (autoload 'pymacs-apply "pymacs")
+;; (autoload 'pymacs-call "pymacs")
+
+;; Rope and RopeEmacs
+;;
+;; Refactoring and Autocompletion
+;;
+;; Although I'm only using Rope for Python it is
+;; a general library and can be used with other languages.
+;;
+;; set ~/etc/setup_rope.sh
+;;(pymacs-load "ropemacs" "rope-")
+
 
 [extensions]
 hgext.convert=
+hgext.bookmarks =
+hggit =
 
 [alias]
 latest = log --limit 5