summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--init.el5
-rw-r--r--settings/setup-clojure-mode.el1
-rw-r--r--settings/setup-flycheck.el10
-rw-r--r--settings/setup-yasnippet.el9
-rw-r--r--snippets/clojure-mode/defn8
-rw-r--r--snippets/clojure-mode/let5
-rw-r--r--snippets/python-mode/import_from5
-rw-r--r--snippets/python-mode/lambda5
-rw-r--r--snippets/python-mode/print5
-rw-r--r--snippets/python-mode/print format5
-rw-r--r--snippets/python-mode/script10
12 files changed, 74 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1c6168c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+backups
+elpa
+history
+places
+recentf
+url
+ido* \ No newline at end of file
diff --git a/init.el b/init.el
index 0fe1d55..19f152b 100644
--- a/init.el
+++ b/init.el
@@ -27,6 +27,7 @@
dash
flycheck
flycheck-clojure
+ flycheck-pos-tip
highlight-escape-sequences
ido-vertical-mode
markdown-mode
@@ -47,10 +48,12 @@
(require-package 'exec-path-from-shell)
(exec-path-from-shell-initialize))
-(require 'setup-ido)
(require 'setup-clojure-mode)
+(require 'setup-flycheck)
+(require 'setup-ido)
(require 'setup-markdown-mode)
(require 'setup-multiple-cursors)
+(require 'setup-yasnippet)
(require 'visual-regexp)
(define-key global-map (kbd "M-&") 'vr/query-replace)
diff --git a/settings/setup-clojure-mode.el b/settings/setup-clojure-mode.el
index 9928650..109b074 100644
--- a/settings/setup-clojure-mode.el
+++ b/settings/setup-clojure-mode.el
@@ -1,5 +1,6 @@
(require 'clojure-mode)
(require 'clojure-mode-extra-font-locking)
+(require 'flycheck-clojure)
(add-hook 'clojure-mode-hook 'enable-paredit-mode)
(add-hook 'clojure-mode-hook 'prettify-symbols-mode)
diff --git a/settings/setup-flycheck.el b/settings/setup-flycheck.el
new file mode 100644
index 0000000..558252b
--- /dev/null
+++ b/settings/setup-flycheck.el
@@ -0,0 +1,10 @@
+(require 'flycheck)
+(require 'flycheck-pos-tip)
+
+(global-flycheck-mode 1)
+
+(eval-after-load 'flycheck
+ '(custom-set-variables
+ '(flycheck-display-errors-function #'flycheck-pos-tip-error-messages)))
+
+(provide 'setup-flycheck)
diff --git a/settings/setup-yasnippet.el b/settings/setup-yasnippet.el
new file mode 100644
index 0000000..fd27543
--- /dev/null
+++ b/settings/setup-yasnippet.el
@@ -0,0 +1,9 @@
+(require 'yasnippet)
+
+(setq yas-snippet-dirs '("~/.emacs.d/snippets"))
+(yas-global-mode 1)
+
+;; Jump to end of snippet definition
+(define-key yas-keymap (kbd "<return>") 'yas-exit-all-snippets)
+
+(provide 'setup-yasnippet)
diff --git a/snippets/clojure-mode/defn b/snippets/clojure-mode/defn
new file mode 100644
index 0000000..0907e4a
--- /dev/null
+++ b/snippets/clojure-mode/defn
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: defn
+# key: defn
+# --
+defn ${1:name}
+ "${2:docstring}"
+ [${3:arg-list}]
+ $0 \ No newline at end of file
diff --git a/snippets/clojure-mode/let b/snippets/clojure-mode/let
new file mode 100644
index 0000000..426caa2
--- /dev/null
+++ b/snippets/clojure-mode/let
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: let
+# key: let
+# --
+let [$0]
diff --git a/snippets/python-mode/import_from b/snippets/python-mode/import_from
new file mode 100644
index 0000000..767f344
--- /dev/null
+++ b/snippets/python-mode/import_from
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: import_from
+# key: from
+# --
+from $1 import $0
diff --git a/snippets/python-mode/lambda b/snippets/python-mode/lambda
new file mode 100644
index 0000000..08b268b
--- /dev/null
+++ b/snippets/python-mode/lambda
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: lambda
+# key: lam
+# --
+lambda ${1:x}: $0 \ No newline at end of file
diff --git a/snippets/python-mode/print b/snippets/python-mode/print
new file mode 100644
index 0000000..2392fbd
--- /dev/null
+++ b/snippets/python-mode/print
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: print
+# key: print
+# --
+print("$0") \ No newline at end of file
diff --git a/snippets/python-mode/print format b/snippets/python-mode/print format
new file mode 100644
index 0000000..704cb53
--- /dev/null
+++ b/snippets/python-mode/print format
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: print format
+# key: printf
+# --
+print("$1".format($0)) \ No newline at end of file
diff --git a/snippets/python-mode/script b/snippets/python-mode/script
new file mode 100644
index 0000000..3113da9
--- /dev/null
+++ b/snippets/python-mode/script
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# name: script
+# key: script
+# --
+#!/usr/bin/env python
+def main():
+ ${1:pass}
+
+if __name__ == '__main__':
+ main() \ No newline at end of file