awesome-emacs/nix-doom-emacs
1
0
Fork 0
mirror of https://github.com/nix-community/nix-doom-emacs synced 2025-08-31 14:43:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
László Vaskó
2021-07-27 15:39:23 +02:00
parent 3893c50877 b9bfa3cedb
commit 418a0ab5bc
4 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
flake.lock generated
View File

@@ -3,11 +3,11 @@
"doom-emacs": {
"flake": false,
"locked": {
"lastModified": 1623114989,
"narHash": "sha256-btRwMu76Gnn9lW7YbzDAgWjlJx61tCT+e3kByNx97aw=",
"lastModified": 1626604817,
"narHash": "sha256-z+dvjB02cHU+VQ5EMkzqSdX817PZar9AkmmfK27q0vo=",
"owner": "hlissner",
"repo": "doom-emacs",
"rev": "2731685095d1e6101b3215aa689426e1834ce00f",
"rev": "46732c0adaef147144418f9f284ca6b1183ab96f",
"type": "github"
},
"original": {
@@ -20,11 +20,11 @@
"doom-snippets": {
"flake": false,
"locked": {
"lastModified": 1622216706,
"narHash": "sha256-Dsl5T1OFPy++md0Lo0pKUqcpCW6T5WDF2sjeB/IVi1g=",
"lastModified": 1625547004,
"narHash": "sha256-V+ytAjB4ZZ+5dJJAu1OY7SbnqrokX5PVBWs0AsgQ8Vs=",
"owner": "hlissner",
"repo": "doom-snippets",
"rev": "bc613f448eed1bd363e61c41691a61e9fd139534",
"rev": "5c0eb5bd70f035cefb981c2ce64f4367498bdda6",
"type": "github"
},
"original": {
@@ -36,11 +36,11 @@
"emacs-overlay": {
"flake": false,
"locked": {
"lastModified": 1624554642,
"narHash": "sha256-NxmdchtWVW3rs/ufAvNR51eVAqJy4sWnEHbUlCnmPKI=",
"lastModified": 1626972035,
"narHash": "sha256-YhBtnKmLDYiEzP5ZEMEQMg6oMP5EV+ToCkku7ZYfL+A=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "f89641db533ebdfe3be6ce745a5856be3c15b853",
"rev": "be04b45efb35db58e6ac6aa86b84f850c85b5dfe",
"type": "github"
},
"original": {
@@ -68,11 +68,11 @@
"evil-markdown": {
"flake": false,
"locked": {
"lastModified": 1591038520,
"narHash": "sha256-Kt2wxG1XCFowavVWtj0urM/yURKegonpZcxTy/+CrJY=",
"lastModified": 1626852210,
"narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=",
"owner": "Somelauw",
"repo": "evil-markdown",
"rev": "064fe9b4767470472356d20bdd08e2f30ebbc9ac",
"rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477",
"type": "github"
},
"original": {
@@ -163,11 +163,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1624561540,
"narHash": "sha256-izJ2PYZMGMsSkg+e7c9A1x3t/yOLT+qzUM6WQsc2tqo=",
"lastModified": 1626852498,
"narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c6a049a3d32293b24c0f894a840872cf67fd7c11",
"rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70",
"type": "github"
},
"original": {
@@ -208,14 +208,14 @@
"type": "github"
}
},
"org-mode": {
"org": {
"flake": false,
"locked": {
"lastModified": 1624525995,
"narHash": "sha256-1eximAnDXKC+midwicoKko1cHF3ElCEOzzkUUWC8G4M=",
"lastModified": 1627155762,
"narHash": "sha256-XS1eA6P0ePabdrnUNe5lN19EA9dfK615gMGObr9wfBQ=",
"owner": "emacs-straight",
"repo": "org-mode",
"rev": "5c07b279e0737b19e91c1d1b21016d9b4c8ffa62",
"rev": "c9dfed48a607c7f6524f1c6480f09cf61a5d6237",
"type": "github"
},
"original": {
@@ -224,6 +224,22 @@
"type": "github"
}
},
"org-contrib": {
"flake": false,
"locked": {
"lastModified": 1623339452,
"narHash": "sha256-E3pioqkmAKQm5N7YsgJZil0/ozkdRE7//tE9FGbrluM=",
"ref": "master",
"rev": "fc81309cf6756607a836f93049a9393c2967c4e0",
"revCount": 2599,
"type": "git",
"url": "https://git.sr.ht/~bzg/org-contrib"
},
"original": {
"type": "git",
"url": "https://git.sr.ht/~bzg/org-contrib"
}
},
"org-yt": {
"flake": false,
"locked": {
@@ -259,11 +275,11 @@
"revealjs": {
"flake": false,
"locked": {
"lastModified": 1623242337,
"narHash": "sha256-u3gZ13x40cjK1k9HTNnqRrp3io0tDTu6JPGd05mGJGw=",
"lastModified": 1625811744,
"narHash": "sha256-Y67nVqcovn2PbHXmWOFWMq10Qz2ZIRyyWEO6qsZLbIM=",
"owner": "hakimel",
"repo": "reveal.js",
"rev": "ade234576e8ddd683cf16d0d8bb0236f37cf1a99",
"rev": "b18f12d964ef80bd9ffb061aae48ff4c15fb43ad",
"type": "github"
},
"original": {
@@ -287,7 +303,8 @@
"nixpkgs": "nixpkgs",
"nose": "nose",
"ob-racket": "ob-racket",
"org-mode": "org-mode",
"org": "org",
"org-contrib": "org-contrib",
"org-yt": "org-yt",
"php-extras": "php-extras",
"revealjs": "revealjs",

6
flake.nix
View File

@@ -58,8 +58,10 @@
nose.flake = false;
ob-racket.url = "github:xchrishawk/ob-racket";
ob-racket.flake = false;
org-mode.url = "github:emacs-straight/org-mode";
org-mode.flake = false;
org-contrib.url = "git+https://git.sr.ht/~bzg/org-contrib";
org-contrib.flake = false;
org.url = "github:emacs-straight/org-mode";
org.flake = false;
org-yt.url = "github:TobiasZawada/org-yt";
org-yt.flake = false;
php-extras.url = "github:arnested/php-extras";

12
overrides.nix
View File

@@ -46,8 +46,16 @@ self: super: {
pname = "nose";
};
org-mode = self.straightBuild rec {
pname = "org-mode";
org-contrib = self.straightBuild {
pname = "org-contrib";
installPhase = ''
mkdir -p $out/share/emacs/site-lisp
cp -r lisp/* $out/share/emacs/site-lisp
'';
};
org = self.straightBuild rec {
pname = "org";
version = "9.4";
installPhase = ''
LISPDIR=$out/share/emacs/site-lisp

3
test/doom.d/init.el
View File

@@ -31,7 +31,6 @@
doom-dashboard ; a nifty splash screen for Emacs
doom-quit ; DOOM quit-message prompts when you quit Emacs
;;(emoji +unicode) ; 🙂
;;fill-column ; a `fill-column' indicator
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
;;hydra
;;indent-guides ; highlighted indent columns
@@ -93,7 +92,7 @@
(eval +overlay) ; run code, run (also, repls)
;;gist ; interacting with github gists
lookup ; navigate your code and its documentation
;;lsp
;;lsp ; M-x vscode
magit ; a git porcelain for Emacs
;;make ; run make tasks from Emacs
;;pass ; password manager for nerds