Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of https://github.com/magnars/.emacs.d

Conflicts:
	setup-paredit.el
  • Loading branch information...
commit 66c3893db783775f3df4a0a82992f9515cccb2c4 2 parents a75ee90 + 209cb46
Christian Johansen authored
2  .mc-lists.el
View
@@ -25,12 +25,14 @@
change-outer
cider-eval-last-sexp
clj-hippie-expand-no-case-fold
+ cljr-cycle-coll
cljr-unwind
cua-replace-region
cua-set-mark
delete-blank-lines
delete-indentation
dired-back-to-start-of-files
+ down-list
duplicate-current-line-or-region
end-of-buffer
eval-and-replace
1  key-bindings.el
View
@@ -334,6 +334,7 @@
(global-set-key (kbd "C-x C-o ft") (ffip-create-pattern-file-finder "*.feature"))
(global-set-key (kbd "C-x C-o cl") (ffip-create-pattern-file-finder "*.clj"))
(global-set-key (kbd "C-x C-o el") (ffip-create-pattern-file-finder "*.el"))
+(global-set-key (kbd "C-x C-o ed") (ffip-create-pattern-file-finder "*.edn"))
(global-set-key (kbd "C-x C-o md") (ffip-create-pattern-file-finder "*.md"))
(global-set-key (kbd "C-x C-o rb") (ffip-create-pattern-file-finder "*.rb"))
(global-set-key (kbd "C-x C-o or") (ffip-create-pattern-file-finder "*.org"))
1  mode-mappings.el
View
@@ -71,6 +71,7 @@
;; Clojure
(autoload 'clojure-mode "clojure-mode")
(add-to-list 'auto-mode-alist '("\\.clj$" . clojure-mode))
+(add-to-list 'auto-mode-alist '("\\.cljs$" . clojure-mode))
;; SVG
(add-to-list 'auto-mode-alist '("\\.svg$" . image-mode))
5 setup-ffip.el
View
@@ -52,9 +52,12 @@
(ffip--create-exclude-find-options
'("node_modules"
"target"
+ "out"
"overlays"
"build"
+ "dist"
"vendor"
- ".cask")))
+ ".cask"
+ ".repl")))
(provide 'setup-ffip)
2  setup-html-mode.el
View
@@ -61,7 +61,7 @@
(add-hook 'html-mode-hook (lambda () (tagedit-mode 1)))
;; no paredit equivalents
- (define-key html-mode-map (kbd "s-k") 'tagedit-kill-attribute)
+ (define-key html-mode-map (kbd "M-k") 'tagedit-kill-attribute)
(define-key html-mode-map (kbd "s-<return>") 'tagedit-toggle-multiline-tag)))
;; after deleting a tag, indent properly
2  site-lisp/clj-refactor
@@ -1 +1 @@
-Subproject commit f0bc2353a1a692f7b7774ad15cf7f3a011d4c80c
+Subproject commit 4ac7ad63804e2e6d92ff5b952db7857db4a73289
2  site-lisp/dash
@@ -1 +1 @@
-Subproject commit 5d25ed2e7988037616844f8b09e26500ec3afffa
+Subproject commit 8dfa9b6e6df6162ee6f0271a23276cf1995667ab
25 users/fimasvee/project-mappings.el
View
@@ -98,7 +98,7 @@
:name "kodemaker.no"
:cwd "~/projects/kodemaker.no/"
:command "lein"
- :args '("ring" "server-headless")
+ :args '("trampoline" "ring" "server-headless")
:port 3333
:tags '(ring))
@@ -142,42 +142,42 @@
:name "oiiku-central-api"
:cwd "~/projects/oiiku/oiiku-central-api/oiiku-central-api-server/"
:command "lein"
- :args '("ring" "server-headless")
+ :args '("trampoline" "ring" "server-headless")
:tags '(oiiku pillar))
(prodigy-define-service
:name "oiiku-sso"
:cwd "~/projects/oiiku/oiiku-sso/"
:command "lein"
- :args '("ring" "server-headless")
+ :args '("trampoline" "ring" "server-headless")
:tags '(oiiku pillar))
(prodigy-define-service
:name "oiiku-event-admin"
:cwd "~/projects/oiiku/oiiku-event-admin/"
:command "lein"
- :args '("ring" "server-headless")
+ :args '("trampoline" "ring" "server-headless")
:tags '(oiiku pillar))
(prodigy-define-service
:name "oiiku-attendants-app"
:cwd "~/projects/oiiku/oiiku-attendants-app/"
:command "lein"
- :args '("ring" "server-headless")
+ :args '("trampoline" "ring" "server-headless")
:tags '(oiiku pillar))
(prodigy-define-service
:name "oiiku-messages-app"
:cwd "~/projects/oiiku/oiiku-messages-app/"
:command "lein"
- :args '("ring" "server-headless")
+ :args '("trampoline" "ring" "server-headless")
:tags '(oiiku messages))
(prodigy-define-service
:name "oiiku-messages-gateway"
:cwd "~/projects/oiiku/oiiku-messages-gateway/"
:command "lein"
- :args '("ring" "server-headless")
+ :args '("trampoline" "ring" "server-headless")
:tags '(oiiku messages))
(prodigy-define-service
@@ -192,21 +192,21 @@
:name "oiiku-badges-app"
:cwd "~/projects/oiiku/oiiku-badges-app/"
:command "lein"
- :args '("ring" "server-headless")
+ :args '("trampoline" "ring" "server-headless")
:tags '(oiiku))
(prodigy-define-service
:name "oiiku-invitations-app"
:cwd "~/projects/oiiku/oiiku-invitations-app/"
:command "lein"
- :args '("ring" "server-headless")
+ :args '("trampoline" "ring" "server-headless")
:tags '(oiiku))
(prodigy-define-service
:name "oiiku-screen-admin-app"
:cwd "~/projects/oiiku/oiiku-screen-admin-app/"
:command "lein"
- :args '("ring" "server-headless")
+ :args '("trampoline" "ring" "server-headless")
:tags '(oiiku)))
;; FINN Reise
@@ -245,6 +245,11 @@
(project-specifics "projects/kodemaker.no"
(ffip-local-patterns "*.js" "*.css" "*.edn" "*.adoc" "*.clj" "*.md"))
+;; Zombie CLJ
+
+(project-specifics "zombieclj"
+ (ffip-local-patterns "*.js" "*.css" "*.edn" "*.clj" "*.cljs" "*.md" "*.html"))
+
;; Zombie TDD
(defun custom-persp/zombie ()
Please sign in to comment.
Something went wrong with that request. Please try again.