diff --git a/nix-integration.patch b/nix-integration.patch index 2d61e3a..c78136f 100644 --- a/nix-integration.patch +++ b/nix-integration.patch @@ -18,7 +18,7 @@ index cb12f8d08..03f370691 100644 `doom-etc-dir' and `doom-cache-dir'. Must end with a slash.") -(defconst doom-etc-dir (concat doom-local-dir "etc/") -+(defconst doom-etc-dir "~/.local/doom" ++(defconst doom-etc-dir "~/.local/doom/" "Directory for non-volatile local storage. Use this for files that don't change much, like server binaries, external diff --git a/nix/sources.json b/nix/sources.json index 1d2d1bc..b9d77e2 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "hlissner", "repo": "doom-emacs", - "rev": "9d4f38346f2782c10f633b182bc9c53268a26091", - "sha256": "145d0l94s9wcn2p1v088xk3gywxwd72bx3gcb3iv248fb93zijnd", + "rev": "505ca8712d7ea986dc736a05604d98cd3d460a77", + "sha256": "1xhkjmhzwm22sps82g7id4lqq0h0x3yapiacpz7q2gpx7cnamkbj", "type": "tarball", - "url": "https://github.com/hlissner/doom-emacs/archive/9d4f38346f2782c10f633b182bc9c53268a26091.tar.gz", + "url": "https://github.com/hlissner/doom-emacs/archive/505ca8712d7ea986dc736a05604d98cd3d460a77.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "doom-snippets": { @@ -29,10 +29,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ecbe5b93d02935e7de755335565fc065dc9a020e", - "sha256": "0z1g2wdki9n17g4lz4wg2cm3vq88bs6clj42z2xsa419cypwyg5w", + "rev": "7a0dfdd7633f9abaa05d3502c228e477c1e8fbb6", + "sha256": "1gf3ava3272axkyj4zdl8j61xfg8dncswipkl1nlbxb5a0wk4w89", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/ecbe5b93d02935e7de755335565fc065dc9a020e.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/7a0dfdd7633f9abaa05d3502c228e477c1e8fbb6.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "emacs-so-long": { @@ -95,28 +95,16 @@ "url": "https://github.com/vlaci/nix-straight.el/archive/446f3d70f1816305130f307c0cf2bc8db77ed698.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, - "nixpkgs": { - "branch": "nixos-19.09", - "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", - "homepage": "https://github.com/NixOS/nixpkgs", - "owner": "NixOS", - "repo": "nixpkgs-channels", - "rev": "8731aaaf8b30888bc24994096db830993090d7c4", - "sha256": "1hcc89rxi47nb0mpk05nl9rbbb04kfw97xfydhpmmgh57yrp3zqa", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs-channels/archive/8731aaaf8b30888bc24994096db830993090d7c4.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, "org-mode": { "branch": "master", "description": "Mirror of org-mode from orgmode.org", "homepage": "https://code.orgmode.org/bzg/org-mode", "owner": "emacs-straight", "repo": "org-mode", - "rev": "e360cd8f3a1797c944528a73c1f1523c7909cdce", - "sha256": "06ish54rmhzfs20k21v2f0w4z2ml368sy29jlxaky0y17jiz0mgm", + "rev": "30d0b6e1f6d3c4f247a2ce1c9833d56a5401da0b", + "sha256": "0ra20nilrbxh0vpi6i85yvi56bi7r34brfrlmxkkd178mb4y6j6n", "type": "tarball", - "url": "https://github.com/emacs-straight/org-mode/archive/e360cd8f3a1797c944528a73c1f1523c7909cdce.tar.gz", + "url": "https://github.com/emacs-straight/org-mode/archive/30d0b6e1f6d3c4f247a2ce1c9833d56a5401da0b.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "org-yt": {