From adcdfc77e790003de2f7e847a9973cb8ffc0609a Mon Sep 17 00:00:00 2001 From: Uttarayan Mondal Date: Tue, 16 Apr 2024 12:12:00 +0530 Subject: [PATCH] fix(neorg): Add neorg as overlay --- common/tmux.nix | 1 + flake.lock | 331 +++++++++++++++++++++++++++++++++----------- neovim/flake.lock | 219 +++++++++++++++++++++++++---- neovim/flake.nix | 12 ++ neovim/overlays.nix | 12 ++ 5 files changed, 471 insertions(+), 104 deletions(-) diff --git a/common/tmux.nix b/common/tmux.nix index d0e8ce56..80f6a897 100644 --- a/common/tmux.nix +++ b/common/tmux.nix @@ -63,6 +63,7 @@ in { bind-key -n C-\\ run-shell ${scratchpad} + bind o set status bind C-n next-window bind C-p previous-window bind C-q last-window diff --git a/flake.lock b/flake.lock index 53a66e19..241c5c9e 100644 --- a/flake.lock +++ b/flake.lock @@ -238,7 +238,7 @@ }, "devshell_2": { "inputs": { - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_14", "nixpkgs": [ "nixvim", "nixpkgs" @@ -298,6 +298,22 @@ "type": "github" } }, + "flake-compat_10": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_2": { "flake": false, "locked": { @@ -363,11 +379,11 @@ "flake-compat_6": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", "type": "github" }, "original": { @@ -377,17 +393,19 @@ } }, "flake-compat_7": { + "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" } }, "flake-compat_8": { @@ -406,6 +424,20 @@ "type": "github" } }, + "flake-compat_9": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -475,11 +507,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -632,6 +664,36 @@ } }, "flake-utils_11": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_12": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_13": { "inputs": { "systems": "systems_14" }, @@ -649,7 +711,7 @@ "type": "github" } }, - "flake-utils_12": { + "flake-utils_14": { "inputs": { "systems": "systems_15" }, @@ -667,7 +729,7 @@ "type": "github" } }, - "flake-utils_13": { + "flake-utils_15": { "inputs": { "systems": "systems_16" }, @@ -685,7 +747,7 @@ "type": "github" } }, - "flake-utils_14": { + "flake-utils_16": { "inputs": { "systems": "systems_17" }, @@ -703,7 +765,7 @@ "type": "github" } }, - "flake-utils_15": { + "flake-utils_17": { "inputs": { "systems": "systems_18" }, @@ -721,7 +783,7 @@ "type": "github" } }, - "flake-utils_16": { + "flake-utils_18": { "inputs": { "systems": "systems_19" }, @@ -1001,11 +1063,11 @@ ] }, "locked": { - "lastModified": 1713131281, - "narHash": "sha256-/Jm1X9MPfLXAxZSCdWmQAFNUQggEfNWHol5jSyyzFzw=", + "lastModified": 1713166971, + "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", "owner": "nix-community", "repo": "home-manager", - "rev": "9f32c66a51d05e6d4ec0dea555bbff9135749ec7", + "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", "type": "github" }, "original": { @@ -1023,11 +1085,11 @@ ] }, "locked": { - "lastModified": 1711625603, - "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", + "lastModified": 1712989663, + "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", + "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0", "type": "github" }, "original": { @@ -1066,11 +1128,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1711250455, - "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -1088,11 +1150,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1713015486, - "narHash": "sha256-hbLGAdWXnDyrnUc2+ShoSbOiBgfl5ESx+4agrjjivsM=", + "lastModified": 1713214544, + "narHash": "sha256-36qa6MOhCBd39YPC0FgapwGRHZXjstw8BQuKdFzwQ4k=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "04267a5f83a7cd94a2e219d22b139c72ed718182", + "rev": "2bce52f094c49109520ad37fc8f0d051acaace55", "type": "github" }, "original": { @@ -1111,11 +1173,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1713053445, - "narHash": "sha256-8U3Y9tgOj5TxW+6y/EOZ0NiBNtoyB7a/UssU07Uk8PY=", + "lastModified": 1713218218, + "narHash": "sha256-f2GOHnoLe9PeVI0Itvm0RVPxc102ZdHabNDYUxoL/RY=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "fb7f0aae32ea06e4d6e2d0efb9069038d11423ac", + "rev": "3fea6e3254a8cda16b32443d1f8f3282218b07c5", "type": "github" }, "original": { @@ -1137,11 +1199,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1712261512, - "narHash": "sha256-qsBZ3tJj/3LR8jNYyCKjyCe0ePj4cMynSWBMC1OEDtc=", + "lastModified": 1713192402, + "narHash": "sha256-M2rleMvDJyhJEDWMcwhJNAuNFtvZhN3vadve7x2KiOk=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "999c0cb03f748fe311bca78961dbf0562dc91659", + "rev": "1197e51e8f57135349bed4de791d8bab7f8cc150", "type": "github" }, "original": { @@ -1192,19 +1254,55 @@ "type": "github" } }, + "neorg": { + "flake": false, + "locked": { + "lastModified": 1713195188, + "narHash": "sha256-ukbS/aVRrTKjFHsTKQEMoUPSAFx2wAlxYMcej3PaD8Y=", + "owner": "nvim-neorg", + "repo": "neorg", + "rev": "d84610ac03db9d4bc5a5d28e9ab7e3fe7c82839a", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "repo": "neorg", + "type": "github" + } + }, + "neorg-telescope": { + "flake": false, + "locked": { + "lastModified": 1712295829, + "narHash": "sha256-Gfb/09JCp9v65CUD7ni+8x1Yqg0xnyfgycYVcVOHQvU=", + "owner": "nvim-neorg", + "repo": "neorg-telescope", + "rev": "a4fc4eb3cd5db6ccd52e99f2b49ce931c458e38f", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "repo": "neorg-telescope", + "type": "github" + } + }, "neovim": { "inputs": { + "neorg": "neorg", + "neorg-telescope": "neorg-telescope", "nixpkgs": [ "nixpkgs" ], "nixvim": "nixvim", "nnn": "nnn", + "norg": "norg", + "norg-meta": "norg-meta", "nvim-devdocs": "nvim-devdocs", "systems": "systems_13" }, "locked": { "lastModified": 1, - "narHash": "sha256-L54M7cDNrfMoILLy2Bc17srMWaNCQlc/46tAOyl4Qw8=", + "narHash": "sha256-LO+bpgwJlixOMGlQvSmXfwmAKHZACdUlWAFzn9CX0Jk=", "path": "./neovim", "type": "path" }, @@ -1224,11 +1322,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1712529338, - "narHash": "sha256-5/E8yWlb6XiQcT8LIhf1IoMQvCsJ+YI3ydNdDteh+xU=", + "lastModified": 1713224895, + "narHash": "sha256-zu0iktDPgweB4KRRYc4Qmqi86u6UggJsctx2b+LObYo=", "owner": "neovim", "repo": "neovim", - "rev": "541c2d3816cdef9aba7f55f74908fa07d0cfa3ec", + "rev": "8c970d34034c874ab12b924a5e057997797868f4", "type": "github" }, "original": { @@ -1240,7 +1338,7 @@ }, "neovim-flake_2": { "inputs": { - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_13", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -1248,11 +1346,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1713138374, - "narHash": "sha256-YBgTm3a9lBch8AYo6k6qzyE1r/xMBAEObXAck3uu8t8=", + "lastModified": 1713224895, + "narHash": "sha256-zu0iktDPgweB4KRRYc4Qmqi86u6UggJsctx2b+LObYo=", "owner": "neovim", "repo": "neovim", - "rev": "0f5c94c04b95a2d942b380be48708d3cf097de0c", + "rev": "8c970d34034c874ab12b924a5e057997797868f4", "type": "github" }, "original": { @@ -1264,7 +1362,7 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_8", "flake-parts": "flake-parts_7", "hercules-ci-effects": "hercules-ci-effects_2", "neovim-flake": "neovim-flake_2", @@ -1273,11 +1371,11 @@ ] }, "locked": { - "lastModified": 1713139466, - "narHash": "sha256-wxrLcto3oOVlTEA3Kodd1qUiREQcWkuF49TsNBI9DoI=", + "lastModified": 1713225809, + "narHash": "sha256-sTQmsPydtcomXMgVf0ipvfgjt3XEBDjg8oDBjonc6tY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "320661405475a889e702f8bcb65807d200f75075", + "rev": "20f618e5c0cf105e476fb813538ce054d914e5ee", "type": "github" }, "original": { @@ -1351,7 +1449,7 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1713067146, @@ -1448,6 +1546,38 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1712791164, "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", @@ -1463,7 +1593,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1712963716, "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", @@ -1493,11 +1623,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1712517143, - "narHash": "sha256-fC+spgEJpRBvLzTLiqOVBhcIHVWZWqQfxAG1aM2calo=", + "lastModified": 1713219346, + "narHash": "sha256-ySJSrTRhNjQwA075o4Ar1dKbWcEgq5S+4dzXDmnqz38=", "owner": "nix-community", "repo": "nixvim", - "rev": "0d85838d204d0f3d1cda22059d3fed0cd757d0ab", + "rev": "4662a06f4e405987cff5c7745ea98c044daabf87", "type": "github" }, "original": { @@ -1509,7 +1639,7 @@ "nixvim_2": { "inputs": { "devshell": "devshell_2", - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_9", "flake-parts": "flake-parts_9", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin_3", @@ -1519,11 +1649,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1713087347, - "narHash": "sha256-RpRIJcbAjR3SF6tarvdG0ErN9afifG/zjxNlntRQrw4=", + "lastModified": 1713219346, + "narHash": "sha256-ySJSrTRhNjQwA075o4Ar1dKbWcEgq5S+4dzXDmnqz38=", "owner": "nix-community", "repo": "nixvim", - "rev": "ad6a08b69528fdaf7e12c90da06f9a34f32d7ea6", + "rev": "4662a06f4e405987cff5c7745ea98c044daabf87", "type": "github" }, "original": { @@ -1544,11 +1674,11 @@ ] }, "locked": { - "lastModified": 1712534643, - "narHash": "sha256-nOR2DxznyiBQ1sDxjIk8D5nrJhD/z+PwlBfc8YonSr4=", + "lastModified": 1713225809, + "narHash": "sha256-sTQmsPydtcomXMgVf0ipvfgjt3XEBDjg8oDBjonc6tY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "4cb2a8580de0498dd38eb90791728547b5826331", + "rev": "20f618e5c0cf105e476fb813538ce054d914e5ee", "type": "github" }, "original": { @@ -1557,13 +1687,54 @@ "type": "github" } }, + "norg": { + "inputs": { + "flake-compat": "flake-compat_6", + "flake-utils": "flake-utils_11", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1672582520, + "narHash": "sha256-kv3UiJUqMSF1qd3r4OCWomVTHTYjwX/EBRWm8mOSdwg=", + "owner": "nvim-neorg", + "repo": "tree-sitter-norg", + "rev": "d7a466e182a532065a559dbfc7a847271d5e9c29", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "ref": "dev", + "repo": "tree-sitter-norg", + "type": "github" + } + }, + "norg-meta": { + "inputs": { + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_12", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1713028366, + "narHash": "sha256-8qSdwHlfnjFuQF4zNdLtU2/tzDRhDZbo9K54Xxgn5+8=", + "owner": "nvim-neorg", + "repo": "tree-sitter-norg-meta", + "rev": "6f0510cc516a3af3396a682fbd6655486c2c9d2d", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "repo": "tree-sitter-norg-meta", + "type": "github" + } + }, "nur": { "locked": { - "lastModified": 1713144897, - "narHash": "sha256-WYqYaIz/DR6Lhns6S2cuP6z6effNsNpuAjKmWnKAH+Y=", + "lastModified": 1713246771, + "narHash": "sha256-PFI5lnPZWkQ+uFRdNc6gV8oUdUStMVtgkwWMnEF0Zqk=", "owner": "nix-community", "repo": "nur", - "rev": "ed3c956628b0c09f022259974cbc9f0398f07798", + "rev": "f7ce5b8a7905c09faf7f5373fa8c3accfe2d80e9", "type": "github" }, "original": { @@ -1575,11 +1746,11 @@ "nvim-devdocs": { "flake": false, "locked": { - "lastModified": 1712567876, - "narHash": "sha256-T9bF56J2ZVlSMXP8GKLJ0vBqt0uFV0ikYH/i4eOoqtQ=", + "lastModified": 1712843813, + "narHash": "sha256-NvxsUAl+FKrT60xmrVBh/EVLuWrGaLWWwFsWYrr7QKc=", "owner": "luckasRanarison", "repo": "nvim-devdocs", - "rev": "a541e8c49a4f46c64fa559d3cd64cb0678766023", + "rev": "1ab982d3e069d191d9157b897c8b70cf48b7f77a", "type": "github" }, "original": { @@ -1605,11 +1776,11 @@ ] }, "locked": { - "lastModified": 1711760932, - "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=", + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "c11e43aed6f17336c25cd120eac886b96c455731", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", "type": "github" }, "original": { @@ -1651,8 +1822,8 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_13", + "flake-compat": "flake-compat_10", + "flake-utils": "flake-utils_15", "gitignore": "gitignore_3", "nixpkgs": [ "nixvim", @@ -1693,7 +1864,7 @@ "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin_2", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "nixvim": "nixvim_2", "nur": "nur", "rust-overlay": "rust-overlay_6", @@ -1815,17 +1986,17 @@ }, "rust-overlay_6": { "inputs": { - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_16", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1713062877, - "narHash": "sha256-msvDk9+qkD4jvMf63PieGRy+hHk0VIKruivHM1BmCM8=", + "lastModified": 1713233539, + "narHash": "sha256-dPGrCy5ttx6E3bUOmDynY/cAotRqvoIAimZlbv+Zr1w=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5990088d56f0b936fa2633c2a4d76b8d36a01105", + "rev": "847bc25ebab8dc72a86d2b1f0c088740eebbb1b8", "type": "github" }, "original": { @@ -1862,7 +2033,7 @@ "subflakes": { "inputs": { "csshacks": "csshacks", - "flake-utils": "flake-utils_15", + "flake-utils": "flake-utils_17", "nixpkgs": [ "nixpkgs" ] @@ -2166,7 +2337,7 @@ "zjstatus": { "inputs": { "crane": "crane_4", - "flake-utils": "flake-utils_16", + "flake-utils": "flake-utils_18", "nixpkgs": [ "nixpkgs" ], diff --git a/neovim/flake.lock b/neovim/flake.lock index 4a175490..f162a0fd 100644 --- a/neovim/flake.lock +++ b/neovim/flake.lock @@ -68,6 +68,38 @@ "type": "github" } }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -76,11 +108,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -185,6 +217,36 @@ "type": "github" } }, + "flake-utils_4": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -237,11 +299,11 @@ ] }, "locked": { - "lastModified": 1711625603, - "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", + "lastModified": 1712989663, + "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", + "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0", "type": "github" }, "original": { @@ -250,6 +312,38 @@ "type": "github" } }, + "neorg": { + "flake": false, + "locked": { + "lastModified": 1713195188, + "narHash": "sha256-ukbS/aVRrTKjFHsTKQEMoUPSAFx2wAlxYMcej3PaD8Y=", + "owner": "nvim-neorg", + "repo": "neorg", + "rev": "d84610ac03db9d4bc5a5d28e9ab7e3fe7c82839a", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "repo": "neorg", + "type": "github" + } + }, + "neorg-telescope": { + "flake": false, + "locked": { + "lastModified": 1712295829, + "narHash": "sha256-Gfb/09JCp9v65CUD7ni+8x1Yqg0xnyfgycYVcVOHQvU=", + "owner": "nvim-neorg", + "repo": "neorg-telescope", + "rev": "a4fc4eb3cd5db6ccd52e99f2b49ce931c458e38f", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "repo": "neorg-telescope", + "type": "github" + } + }, "neovim-flake": { "inputs": { "flake-utils": "flake-utils_3", @@ -260,11 +354,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1712529338, - "narHash": "sha256-5/E8yWlb6XiQcT8LIhf1IoMQvCsJ+YI3ydNdDteh+xU=", + "lastModified": 1713224895, + "narHash": "sha256-zu0iktDPgweB4KRRYc4Qmqi86u6UggJsctx2b+LObYo=", "owner": "neovim", "repo": "neovim", - "rev": "541c2d3816cdef9aba7f55f74908fa07d0cfa3ec", + "rev": "8c970d34034c874ab12b924a5e057997797868f4", "type": "github" }, "original": { @@ -297,11 +391,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -311,6 +405,38 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -324,11 +450,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1712517143, - "narHash": "sha256-fC+spgEJpRBvLzTLiqOVBhcIHVWZWqQfxAG1aM2calo=", + "lastModified": 1713219346, + "narHash": "sha256-ySJSrTRhNjQwA075o4Ar1dKbWcEgq5S+4dzXDmnqz38=", "owner": "nix-community", "repo": "nixvim", - "rev": "0d85838d204d0f3d1cda22059d3fed0cd757d0ab", + "rev": "4662a06f4e405987cff5c7745ea98c044daabf87", "type": "github" }, "original": { @@ -348,11 +474,11 @@ ] }, "locked": { - "lastModified": 1712534643, - "narHash": "sha256-nOR2DxznyiBQ1sDxjIk8D5nrJhD/z+PwlBfc8YonSr4=", + "lastModified": 1713225809, + "narHash": "sha256-sTQmsPydtcomXMgVf0ipvfgjt3XEBDjg8oDBjonc6tY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "4cb2a8580de0498dd38eb90791728547b5826331", + "rev": "20f618e5c0cf105e476fb813538ce054d914e5ee", "type": "github" }, "original": { @@ -361,14 +487,55 @@ "type": "github" } }, + "norg": { + "inputs": { + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1672582520, + "narHash": "sha256-kv3UiJUqMSF1qd3r4OCWomVTHTYjwX/EBRWm8mOSdwg=", + "owner": "nvim-neorg", + "repo": "tree-sitter-norg", + "rev": "d7a466e182a532065a559dbfc7a847271d5e9c29", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "ref": "dev", + "repo": "tree-sitter-norg", + "type": "github" + } + }, + "norg-meta": { + "inputs": { + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1713028366, + "narHash": "sha256-8qSdwHlfnjFuQF4zNdLtU2/tzDRhDZbo9K54Xxgn5+8=", + "owner": "nvim-neorg", + "repo": "tree-sitter-norg-meta", + "rev": "6f0510cc516a3af3396a682fbd6655486c2c9d2d", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "repo": "tree-sitter-norg-meta", + "type": "github" + } + }, "nvim-devdocs": { "flake": false, "locked": { - "lastModified": 1712567876, - "narHash": "sha256-T9bF56J2ZVlSMXP8GKLJ0vBqt0uFV0ikYH/i4eOoqtQ=", + "lastModified": 1712843813, + "narHash": "sha256-NvxsUAl+FKrT60xmrVBh/EVLuWrGaLWWwFsWYrr7QKc=", "owner": "luckasRanarison", "repo": "nvim-devdocs", - "rev": "a541e8c49a4f46c64fa559d3cd64cb0678766023", + "rev": "1ab982d3e069d191d9157b897c8b70cf48b7f77a", "type": "github" }, "original": { @@ -392,11 +559,11 @@ ] }, "locked": { - "lastModified": 1711760932, - "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=", + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "c11e43aed6f17336c25cd120eac886b96c455731", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", "type": "github" }, "original": { @@ -407,9 +574,13 @@ }, "root": { "inputs": { + "neorg": "neorg", + "neorg-telescope": "neorg-telescope", "nixpkgs": "nixpkgs", "nixvim": "nixvim", "nnn": "nnn", + "norg": "norg", + "norg-meta": "norg-meta", "nvim-devdocs": "nvim-devdocs", "systems": "systems_4" } diff --git a/neovim/flake.nix b/neovim/flake.nix index 9baf7d0e..7c37f574 100644 --- a/neovim/flake.nix +++ b/neovim/flake.nix @@ -11,6 +11,18 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + norg.url = "github:nvim-neorg/tree-sitter-norg/dev"; + norg-meta.url = "github:nvim-neorg/tree-sitter-norg-meta"; + + neorg = { + url = "github:nvim-neorg/neorg"; + flake = false; + }; + neorg-telescope = { + url = "github:nvim-neorg/neorg-telescope"; + flake = false; + }; + nvim-devdocs.url = "github:luckasRanarison/nvim-devdocs"; nvim-devdocs.flake = false; }; diff --git a/neovim/overlays.nix b/neovim/overlays.nix index ab338b9e..704c736c 100644 --- a/neovim/overlays.nix +++ b/neovim/overlays.nix @@ -48,6 +48,18 @@ version = "0.4.1"; src = inputs.nvim-devdocs; }; + neorg = final.vimUtils.buildVimPlugin { + pname = "neorg"; + version = inputs.neorg.rev; + src = inputs.neorg; + dependencies = [final.vimPlugins.plenary-nvim final.lua51Packages.lua-utils-nvim final.vimPlugins.nvim-nio final.vimPlugins.nui-nvim]; + }; + neorg-telescope = final.vimUtils.buildVimPlugin { + pname = "neorg-telescope"; + version = inputs.neorg-telescope.rev; + src = inputs.neorg-telescope; + dependencies = [final.vimPlugins.telescope-nvim final.vimPlugins.neorg]; + }; }; }; tree-sitter-grammars = final: prev: {