diff --git a/lib/ace/ext/modelist.js b/lib/ace/ext/modelist.js
index 2cc550bb..5e6551ba 100644
--- a/lib/ace/ext/modelist.js
+++ b/lib/ace/ext/modelist.js
@@ -98,6 +98,7 @@ var supportedModes = {
     Markdown:    ["md|markdown"],
     MySQL:       ["mysql"],
     MUSHCode:    ["mc|mush"],
+    Nix:         ["nix"],
     ObjectiveC:  ["m|mm"],
     OCaml:       ["ml|mli"],
     Pascal:      ["pas|p"],
diff --git a/lib/ace/mode/nix.js b/lib/ace/mode/nix.js
new file mode 100644
index 00000000..44e55822
--- /dev/null
+++ b/lib/ace/mode/nix.js
@@ -0,0 +1,66 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
+ *
+ * Copyright (c) 2012, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * Contributor(s):
+ * 
+ *
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+  THIS FILE WAS AUTOGENERATED BY mode.tmpl.js
+*/
+
+define(function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var CMode = require("./c_cpp").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var NixHighlightRules = require("./nix_highlight_rules").NixHighlightRules;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    CMode.call(this);
+    var highlighter = new NixHighlightRules();
+    this.foldingRules = new CStyleFoldMode();
+
+    this.$tokenizer = new Tokenizer(highlighter.getRules());
+    this.$keywordList = highlighter.$keywordList;
+};
+oop.inherits(Mode, CMode);
+
+(function() {
+    // Extra logic goes here. 
+    this.lineCommentStart = "#";
+    this.blockComment = {start: "/*", end: "*/"};
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
\ No newline at end of file
diff --git a/lib/ace/mode/nix_highlight_rules.js b/lib/ace/mode/nix_highlight_rules.js
new file mode 100644
index 00000000..30143eec
--- /dev/null
+++ b/lib/ace/mode/nix_highlight_rules.js
@@ -0,0 +1,105 @@
+define(function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var NixHighlightRules = function() {
+
+    var constantLanguage = "true|false";
+    var keywordControl = "with|import|if|else|then";
+    var keywordDeclaration = "let|in|rec";
+
+    var keywordMapper = this.createKeywordMapper({
+        "constant.language.nix": constantLanguage,
+        "keyword.control.nix": keywordControl,
+        "keyword.declaration.nix": keywordDeclaration
+    }, "identifier");
+
+    this.$rules = {
+        "start": [{
+            token: "comment",
+            regex: /#.*$/
+        }, {
+            token: "comment",
+            regex: /\/\*/,
+            next: "comment"
+        }, {
+            regex: "(==|!=|<=?|>=?)",
+            token: ["keyword.operator.comparison.nix"]
+        }, {
+            regex: "((?:[+*/%-]|\\~)=)",
+            token: ["keyword.operator.assignment.arithmetic.nix"]
+        }, {
+            regex: "=",
+            token: "keyword.operator.assignment.nix"
+        }, {
+            token: "string",
+            regex: "''",
+            next: "qqdoc"
+        }, {
+            token: "string",
+            regex: "'",
+            next: "qstring"
+        }, {
+            token: "string",
+            regex: '"',
+            next: "qqstring"
+        }, {
+            token: "constant.numeric", // hex
+            regex: "0[xX][0-9a-fA-F]+\\b"
+        }, {
+            token: "constant.numeric", // float
+            regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+        }, {
+            token: keywordMapper,
+            regex: "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+        }],
+        "comment": [{
+            token: "comment", // closing comment
+            regex: ".*?\\*\\/",
+            next: "start"
+        }, {
+            token: "comment", // comment spanning whole line
+            regex: ".+"
+        }],
+        "qqdoc": [{
+            token: "constant.language.escape",
+            regex: /\$\{[^}]+\}/
+        }, {
+            token: "string",
+            regex: "''",
+            next: "start"
+        }, {
+            defaultToken: "string"
+        }],
+
+        "qqstring": [{
+            token: "constant.language.escape",
+            regex: /\$\{[^}]+\}/
+        }, {
+            token: "string",
+            regex: '"',
+            next: "start"
+        }, {
+            defaultToken: "string"
+        }],
+
+        "qstring": [{
+            token: "constant.language.escape",
+            regex: /\$\{[^}]+\}/
+        }, {
+            token: "string",
+            regex: "'",
+            next: "start"
+        }, {
+            defaultToken: "string"
+        }]
+    };
+
+};
+
+oop.inherits(NixHighlightRules, TextHighlightRules);
+
+exports.NixHighlightRules = NixHighlightRules;
+});
\ No newline at end of file