Skip to content

Commit

Permalink
Moar!
Browse files Browse the repository at this point in the history
  • Loading branch information
samrat committed Sep 28, 2012
1 parent 2903a23 commit 87659ba
Show file tree
Hide file tree
Showing 33 changed files with 927 additions and 42 deletions.
3 changes: 3 additions & 0 deletions .Xdefaults
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ URxvt*termName:screen-256color
URxvt.foreground:white
URxvt.background:black
URxvt.iconFile: /usr/share/icons/gnome/48x48/apps/terminal.png
URxvt.perl-ext-common: default,matcher
URxvt.urlLauncher: /usr/bin/chromium
URxvt.matcher.button: 1

URxvt*font: xft:Droid Sans Mono for Powerline:regular:size=11
URxvt*imFont: xft:Droid Sans Mono for Powerline:regular:size=11
Expand Down
36 changes: 27 additions & 9 deletions .emacs.d/.smex-items
Original file line number Diff line number Diff line change
@@ -1,22 +1,40 @@

;; ----- smex-history -----
(
eshell
find-file-in-project
make-directory
find-file
package-install
cd
5x5
arp
dbx
dig
package-list-packages-no-fetch
erc
eshell
)

;; ----- smex-data -----
(
(package-install . 4)
(package-install . 14)
(evil-mode . 1)
(nrepl-jack-in . 12)
(nrepl-jack-in . 30)
(4clojure-problem . 3)
(python-menu . 1)
(eshell . 3)
(nrepl . 1)
(nrepl . 13)
(erc . 3)
(nrepl-macroexpansion-minor-mode . 1)
(find-file-in-project . 9)
(eval-buffer . 2)
(eval-last-sexp . 2)
(nrepl-eval-buffer . 6)
(nrepl-load-current-buffer . 5)
(paredit-mode . 1)
(nrepl-eval-region . 11)
(nrepl-switch-to-repl-buffer . 1)
(nrepl-clear-output . 1)
(package-list-packages-no-fetch . 2)
(find-file . 5)
(evil-end-of-line . 3)
(surround-delete . 1)
(make-directory . 4)
(auto-complete . 2)
(auto-complete-mode . 1)
)
16 changes: 16 additions & 0 deletions .emacs.d/ac-comphist.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
((("link-to" .
[0 0 0 0 0 1 0])
(":br" .
[8 0 0])
(":strong" .
[0 0 0 0 0 1 0])
("url" .
[1 0 0])
(":code" .
[5 0 0 0 0])
("API" .
[1 0 0])
("the" .
[1 0 0])
("common/template" .
[0 0 0 0 0 0 0 0 0 0 0 1 0 0 0])))
5 changes: 1 addition & 4 deletions .emacs.d/backups/!home!samrat!.lein!profiles.clj~
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{:user {:plugins [[lein-tarsier "0.9.1"]
{:user {:plugins [[lein-localrepo "0.4.0"]
[lein-swank "1.4.4"]
[lein-light "0.0.4"]
[lein-cljsbuild "0.2.4"]
[lein-iclojure "1.0"]
]}}
9 changes: 4 additions & 5 deletions .emacs.d/backups/!home!samrat!code!clog!project.clj~
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(defproject clog "0.1.0-SNAPSHOT"
:description "Clog: A blog engine written in Clojure"
:description "Clog- a blog engine in Clojure"
:url "http://example.com/FIXME"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
Expand All @@ -10,7 +10,6 @@
[net.cgrand/moustache "1.1.0"]
[lobos "1.0.0-SNAPSHOT"]
[korma "0.2.1"]
[enlive "1.0.0"]
[postgresql "9.1-901.jbdc4"]
[clj-yaml "0.3.1"]
])
[postgresql "9.1-901.jdbc4"]
[clj-yaml "0.3.1"]]
)
7 changes: 5 additions & 2 deletions .emacs.d/elpa/auto-complete-1.4/auto-complete-autoloads.el
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
;;; Code:


;;;### (autoloads nil nil ("auto-complete-config.el" "auto-complete-pkg.el"
;;;;;; "auto-complete.el") (20488 9048 538210))
;;;### (autoloads nil nil ("../../../../../.emacs.d/elpa/auto-complete-1.4/auto-complete-autoloads.el"
;;;;;; "../../../../../.emacs.d/elpa/auto-complete-1.4/auto-complete-config.el"
;;;;;; "../../../../../.emacs.d/elpa/auto-complete-1.4/auto-complete-pkg.el"
;;;;;; "../../../../../.emacs.d/elpa/auto-complete-1.4/auto-complete.el")
;;;;;; (20557 31848 350734))

;;;***

Expand Down
Binary file modified .emacs.d/elpa/auto-complete-1.4/auto-complete-config.elc
Binary file not shown.
Binary file modified .emacs.d/elpa/auto-complete-1.4/auto-complete-pkg.elc
Binary file not shown.
Binary file modified .emacs.d/elpa/auto-complete-1.4/auto-complete.elc
Binary file not shown.
18 changes: 18 additions & 0 deletions .emacs.d/elpa/evil-leader-0.1/evil-leader-autoloads.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
;;; evil-leader-autoloads.el --- automatically extracted autoloads
;;
;;; Code:


;;;### (autoloads nil nil ("evil-leader-pkg.el" "evil-leader.el")
;;;;;; (20519 26934 195368))

;;;***

(provide 'evil-leader-autoloads)
;; Local Variables:
;; version-control: never
;; no-byte-compile: t
;; no-update-autoloads: t
;; coding: utf-8
;; End:
;;; evil-leader-autoloads.el ends here
1 change: 1 addition & 0 deletions .emacs.d/elpa/evil-leader-0.1/evil-leader-pkg.el
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(define-package "evil-leader" "0.1" "let there be <leader>" (quote ((evil "0.0.0"))))
Binary file added .emacs.d/elpa/evil-leader-0.1/evil-leader-pkg.elc
Binary file not shown.
119 changes: 119 additions & 0 deletions .emacs.d/elpa/evil-leader-0.1/evil-leader.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
;;; evil-leader.el --- let there be <leader>

;; Copyright (C) 2011 by Michael Markert
;; Author: Michael Markert <markert.michael@googlemail.com>
;; URL: http://github.com/cofi/evil-leader
;; Git-Repository: git://github.com/cofi/evil-leader.git
;; Created: 2011-09-13
;; Version: 0.1
;; Keywords: evil vim-emulation leader
;; Package-Requires: ((evil "0.0.0"))

;; This file is not part of GNU Emacs.

;; This program is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.

;; Known Bugs:
;; See http://github.com/cofi/evil-leader/issues

;; Install:
;; (require 'evil-leader)

;; Usage:

;; bind keys using `evil-leader/set-key'
;; and call them via <leader>key or <prefixed-leader>key in emacs/insert state
;; if `evil-leader/in-all-states' is non-nil


(require 'evil)

(defvar evil-leader/map (make-sparse-keymap)
"Keymap used for leader bindings.")

;;; utilities

(defun evil-leader/set-leader (key &optional prefix)
"Set leader key to `key' and non-normal-prefix to `prefix' and remove old bindings.
Passing `nil' as `prefix' disables non-normal-prefix."
(let ((old (when (boundp 'evil-leader/leader) (read-kbd-macro evil-leader/leader)))
(old-prefixed (when (and (boundp 'evil-leader/non-normal-prefix)
(boundp 'evil-leader/leader)
evil-leader/non-normal-prefix)
(read-kbd-macro (concat evil-leader/non-normal-prefix
evil-leader/leader))))
(prefixed (when prefix
(read-kbd-macro (concat prefix key))))
(key (read-kbd-macro key)))
(when old-prefixed
(define-key evil-emacs-state-map old-prefixed nil)
(define-key evil-insert-state-map old-prefixed nil))
(when (and (boundp 'evil-leader/in-all-states) evil-leader/in-all-states prefixed)
(define-key evil-emacs-state-map prefixed evil-leader/map)
(define-key evil-insert-state-map prefixed evil-leader/map))
(when old
(define-key evil-normal-state-map old nil))
(define-key evil-normal-state-map key evil-leader/map)))

;;; customization

(defgroup evil-leader nil
"<leader> support for evil."
:group 'evil
:prefix 'evil-leader/)

(defcustom evil-leader/leader "\\"
"The <leader> key, used to access keys defined by `evil-leader/set-key' in normal state.
Must be readable by `read-kbd-macro'. For example: \",\"."
:type "string"
:group 'evil-leader
:set (lambda (sym value)
(evil-leader/set-leader value (and (boundp 'evil-leader/non-normal-prefix)
evil-leader/non-normal-prefix))
(set-default sym value)))

(defcustom evil-leader/non-normal-prefix "C-"
"Prefix for leader-map in insert- and emacs-state.
`evil-leader/in-all-states' has to be non-nil for this to be set.
The combination has to be readable by `read-kbd-macro'."
:type 'string
:group 'evil-leader
:set (lambda (sym value)
(evil-leader/set-leader evil-leader/leader value)
(set-default sym value)))

(defcustom evil-leader/in-all-states nil
"If is non-nil leader-map is accessible by <prefixed-leader> in emacs/insert state.
<prefixed-leader> is `evil-leader/non-normal-prefix' + `evil-leader/leader'"
:type 'boolean
:group 'evil-leader
:set (lambda (sym value)
(evil-leader/set-leader evil-leader/leader (and value evil-leader/non-normal-prefix))
(set-default sym value)))

(defun evil-leader/set-key (key def &rest bindings)
"Bind KEY to DEF in `evil-leader-map'."
(interactive "kKey: \naCommand: ")
(while key
(define-key evil-leader/map (read-kbd-macro key) def)
(setq key (pop bindings)
def (pop bindings))))

(put 'evil-leader/set-key 'lisp-indent-function 'defun)

(provide 'evil-leader)

;;; evil-leader.el ends here
Binary file added .emacs.d/elpa/evil-leader-0.1/evil-leader.elc
Binary file not shown.
9 changes: 6 additions & 3 deletions .emacs.d/elpa/nrepl-0.1.1/nrepl-autoloads.el
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@


;;;### (autoloads (nrepl nrepl-jack-in nrepl-enable-on-existing-clojure-buffers
;;;;;; nrepl-interaction-mode) "nrepl" "nrepl.el" (20488 5819))
;;; Generated autoloads from nrepl.el
;;;;;; nrepl-interaction-mode) "nrepl" "../../../../../.emacs.d/elpa/nrepl-0.1.1/nrepl.el"
;;;;;; "1e0e8a4ad4a6aa2c14f2860f15c46b2c")
;;; Generated autoloads from ../../../../../.emacs.d/elpa/nrepl-0.1.1/nrepl.el

(autoload 'nrepl-interaction-mode "nrepl" "\
Minor mode for nrepl interaction from a Clojure buffer.
Expand All @@ -29,7 +30,9 @@ Minor mode for nrepl interaction from a Clojure buffer.

;;;***

;;;### (autoloads nil nil ("nrepl-pkg.el") (20488 5819 529982))
;;;### (autoloads nil nil ("../../../../../.emacs.d/elpa/nrepl-0.1.1/nrepl-pkg.el"
;;;;;; "../../../../../.emacs.d/elpa/nrepl-0.1.1/nrepl.el") (20535
;;;;;; 7623 1927))

;;;***

Expand Down
Binary file modified .emacs.d/elpa/nrepl-0.1.1/nrepl-pkg.elc
Binary file not shown.
Binary file modified .emacs.d/elpa/nrepl-0.1.1/nrepl.elc
Binary file not shown.
36 changes: 36 additions & 0 deletions .emacs.d/elpa/sokoban-1.23/sokoban-autoloads.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
;;; sokoban-autoloads.el --- automatically extracted autoloads
;;
;;; Code:


;;;### (autoloads (sokoban sokoban-mode) "sokoban" "sokoban.el" (20504
;;;;;; 4203))
;;; Generated autoloads from sokoban.el

(autoload 'sokoban-mode "sokoban" "\
Major mode to play sokoban.
Commands:
\\{sokoban-mode-map}
\(fn)" t nil)

(autoload 'sokoban "sokoban" "\
Play sokoban.
\(fn)" t nil)

;;;***

;;;### (autoloads nil nil ("sokoban-pkg.el") (20504 4203 627666))

;;;***

(provide 'sokoban-autoloads)
;; Local Variables:
;; version-control: never
;; no-byte-compile: t
;; no-update-autoloads: t
;; coding: utf-8
;; End:
;;; sokoban-autoloads.el ends here
1 change: 1 addition & 0 deletions .emacs.d/elpa/sokoban-1.23/sokoban-pkg.el
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(define-package "sokoban" "1.23" "Play the Sokoban game in emacs" (quote nil))
Binary file added .emacs.d/elpa/sokoban-1.23/sokoban-pkg.elc
Binary file not shown.
Loading

0 comments on commit 87659ba

Please sign in to comment.