added c mode snippet and some modified settings.

4 files changed, 14 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 1cf1cdb..46edd8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,7 @@ places
 recentf
 url
 ido*
-.mc-*
\ No newline at end of file
+.mc-*
+derby*
+auto-save-list*
+metastore_db*
\ No newline at end of file
diff --git a/init.el b/init.el
index 4e63bf6..06e9bb3 100644
--- a/init.el
+++ b/init.el
@@ -35,6 +35,7 @@
      markdown-mode
      multiple-cursors
      paredit
+     scala-mode
      visual-regexp
      yasnippet)))
 
diff --git a/settings/setup-package.el b/settings/setup-package.el
index b30a85f..f16cbbf 100644
--- a/settings/setup-package.el
+++ b/settings/setup-package.el
@@ -1,7 +1,7 @@
 (require 'package)
 ;; Taken from magnars setup-package.el
 ;; https://github.com/magnars/.emacs.d/blob/master/settings/setup-package.el
-(add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/") t)
+(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t)
 (add-to-list 'package-archives '("melpa-stable" . "http://stable.melpa.org/packages/") t)
 (package-initialize)
 
diff --git a/snippets/c-mode/headerDEF b/snippets/c-mode/headerDEF
new file mode 100644
index 0000000..a07587b
--- /dev/null
+++ b/snippets/c-mode/headerDEF
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: headerDEF
+# key: #if
+# --
+#ifndef
+#define
+
+#endif
\ No newline at end of file