From ea4bbc338567917bbee1b2dee2f516030c63a630 Mon Sep 17 00:00:00 2001 From: Collin Doering Date: Mon, 20 Jun 2011 20:55:55 -0400 Subject: [PATCH] Did some minor changes to .xinitrc making trayer sized more aligned with xmobars Added clojure support to emacs (requires aur/emacs-clojure-mode-git, clojure, aur/clojure-contrib-git, aur/swank-clojure-git, maven) Added path for maven (required for building clojure-contrib-git from the aur) Starting to refine use of git..Now have seperate projects for each system and a generic git tree to start from --- .emacs | 31 ++++++++++++++++++++++++++++++- .xinitrc | 2 +- .zshrc | 6 ++++-- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/.emacs b/.emacs index 970add8..84f3de9 100644 --- a/.emacs +++ b/.emacs @@ -139,7 +139,8 @@ ;; Set usable lisp implementations (setq slime-lisp-implementations '((sbcl ("/usr/bin/sbcl" "")) - (clisp ("/usr/bin/clisp" "-K full")))) + (clisp ("/usr/bin/clisp" "-K base")) + (clojure ("/usr/bin/clj" "")))) ;; Function to start and/or connect to slime (defun start-slime () @@ -152,6 +153,28 @@ (add-hook 'slime-mode-hook 'start-slime) (slime-setup '(slime-fancy)) +;; Setup clojure mode +(add-to-list 'load-path "/usr/share/emacs/site-lisp/clojure-mode") +(require 'clojure-mode) + +;; Setup swank-clojure-mode +(add-to-list 'load-path "/usr/share/emacs/site-lisp/swank-clojure") +(require 'swank-clojure) + +(add-hook 'clojure-mode-hook + '(lambda () + (define-key clojure-mode-map "\C-c\C-e" 'lisp-eval-last-sexp) + (define-key clojure-mode-map "\C-x\C-e" 'lisp-eval-last-sexp))) +(eval-after-load "slime" + `(progn + (require 'assoc) + (setq swank-clojure-classpath + (list "/usr/share/clojure/clojure.jar" + "/usr/share/clojure/clojure-contrib.jar" + "/usr/share/emacs/site-lisp/swank-clojure/src")) + (aput 'slime-lisp-implementations 'clojure + (list (swank-clojure-cmd) :init 'swank-clojure-init)))) + ;; Setup emacs-org-mode (add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode)) (add-hook 'org-mode-hook 'turn-on-font-lock) ; not needed when global-font-lock-mode is on @@ -186,6 +209,9 @@ (defvar paredit-hooks '(lisp-mode-hook lisp-interaction-mode-hook scheme-mode-hook c-mode-hook c++-mode-hook python-mode-hook)) (activate-mode-with-hooks (lambda () (paredit-mode 1)) paredit-hooks) +;; Highlight paren's in given modes [to apply globally do (show-paren-mode 1)] +(activate-mode-with-hooks (lambda () (show-paren-mode 1)) paredit-hooks) + ;; upcomming functionallity: toggle paredit-mode due to annoying things like wrapping parens when a mistake is made ;; known issue..if paredit-mode is turned on when there are unbalanced parens an error is reported (defun toggle-paredit-mode () @@ -271,3 +297,6 @@ ;; Remove tool-bar (tool-bar-mode -1) + +;; Remove scroll bars +(scroll-bar-mode -1) diff --git a/.xinitrc b/.xinitrc index f8f8766..f81adcf 100644 --- a/.xinitrc +++ b/.xinitrc @@ -19,7 +19,7 @@ nitrogen --restore & unclutter & # Setup system tray -trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 2 --height 11 --transparent true --tint 0x000000 & +trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 4 --height 2 --transparent true --tint 0x000000 & # Use xbindkeys to bind media keys etc.. xbindkeys & diff --git a/.zshrc b/.zshrc index d0de3d4..4d4876f 100644 --- a/.zshrc +++ b/.zshrc @@ -33,8 +33,10 @@ PS1="[%n@%M: %~]%% " # Turn off noscroll stty stop undef -# Modify path variable to allow execution of mathematica and tools -export PATH=${PATH}:/usr/local/bin +# Modify path variable to allow execution of the following: +# * mathematica/ tools +# * maven tools +export PATH=${PATH}:/usr/local/bin:/opt/maven/bin # start keychain eval `keychain --eval --timeout 10 --quiet --agents ssh id_rsa`