Merge remote-tracking branch 'origin/develop'

default.nix

@@ -72,6 +72,14 @@ let
       src = lock.get pname;
       buildPhase = ":";
     };
+    evil-org = self.trivialBuild rec {
+      pname = "evil-org-mode";
+      version = "1";
+      recipe = null;
+      ename = pname;
+      src = lock.get pname;
+      buildPhase = ":";
+    };
     evil-quick-diff = self.trivialBuild rec {
       pname = "evil-quick-diff";
       version = "1";

derivations.json

@@ -13,6 +13,10 @@
         "owner": "Somelauw",
         "repo": "evil-markdown"
     },
+    "evil-org-mode": {
+        "owner": "hlissner",
+        "repo": "evil-org-mode"
+    },
     "evil-quick-diff": {
         "owner": "rgrinberg",
         "repo": "evil-quick-diff"

derivations.lock

@@ -4,12 +4,12 @@
         "args": {
             "owner": "hlissner",
             "repo": "doom-emacs",
-            "rev": "4d64021980c696a3f76b6d26c50514e4d91dbf57",
-            "sha256": "16r17iij3zqhb29jpbwifwj1fyvd78p6n8s3wlnhrndvkjg2hsk4"
+            "rev": "b5a279311cfec3d1e66678bf3bff47f4118a62a9",
+            "sha256": "1a1gl700f7f0jcvfljp9xw8lhxdlkv36d2mkm976n99jp6rdyhal"
         },
         "meta": {
-            "updated": "2020-01-02T12:37:57+00:00",
-            "rev": "4d64021980c696a3f76b6d26c50514e4d91dbf57"
+            "updated": "2020-01-07T09:34:04+00:00",
+            "rev": "b5a279311cfec3d1e66678bf3bff47f4118a62a9"
         }
     },
     "nix-straight.el": {
@@ -43,12 +43,12 @@
         "args": {
             "owner": "nix-community",
             "repo": "emacs-overlay",
-            "rev": "96b22f190ebc6e3c7c96e5cd3201b7165c1d07b2",
-            "sha256": "0xdi4byr19plh2jmifacgyja309ril0axg9jdq4lr633pva6rway"
+            "rev": "78dee3837b57fb29c8794d65af165582f51b2db2",
+            "sha256": "15fv8daidd6pzvvxplnl8fkw67yb8zihknjnnq0lz88x9hp3fviv"
         },
         "meta": {
-            "updated": "2020-01-02T12:38:02+00:00",
-            "rev": "96b22f190ebc6e3c7c96e5cd3201b7165c1d07b2"
+            "updated": "2020-01-07T09:34:09+00:00",
+            "rev": "78dee3837b57fb29c8794d65af165582f51b2db2"
         }
     },
     "evil-markdown": {
@@ -102,5 +102,18 @@
             "updated": "2019-12-01T14:49:48+00:00",
             "rev": "69c883720b30a892c63bc89f49d4f0e8b8028908"
         }
+    },
+    "evil-org-mode": {
+        "fetcher": "fetchFromGitHub",
+        "args": {
+            "owner": "hlissner",
+            "repo": "evil-org-mode",
+            "rev": "4d44e9bbdc3ae35d0050ca298886710f6531f434",
+            "sha256": "0kp19q58rqi2x31g5fqqy5rzw7ymxsa9iaxj3f9rya9zyyma6g59"
+        },
+        "meta": {
+            "updated": "2020-01-07T11:56:38+00:00",
+            "rev": "4d44e9bbdc3ae35d0050ca298886710f6531f434"
+        }
     }
 }

nix-integration.patch

@@ -29,12 +29,3 @@ index cb12f8d08..03f370691 100644
    "Directory for volatile local storage.
  
  Use this for files that change often, like cache files. Must end with a slash.")
-@@ -196,7 +195,7 @@ users).")
- (setq abbrev-file-name             (concat doom-local-dir "abbrev.el")
-       async-byte-compile-log-file  (concat doom-etc-dir "async-bytecomp.log")
-       bookmark-default-file        (concat doom-etc-dir "bookmarks")
--      custom-file                  (concat doom-private-dir "init.el")
-+      custom-file                  (concat doom-etc-dir "init.el")
-       custom-theme-directory       (concat doom-private-dir "themes/")
-       desktop-dirname              (concat doom-etc-dir "desktop")
-       desktop-base-file-name       "autosave"