From 05bc94fde6bff1f869e38451db99225cccc918a3 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Sat, 14 Dec 2024 04:32:26 +0530 Subject: [PATCH] feat: Added everything to a singular flake --- common/home.nix | 2 +- common/nvim.nix | 12 - flake.lock | 706 +++-------------------- flake.nix | 57 +- neovim/{nvim.nix => default.nix} | 3 +- neovim/flake.lock | 946 ------------------------------- neovim/flake.nix | 99 ---- overlays.nix | 36 +- 8 files changed, 140 insertions(+), 1721 deletions(-) delete mode 100644 common/nvim.nix rename neovim/{nvim.nix => default.nix} (99%) delete mode 100644 neovim/flake.lock delete mode 100644 neovim/flake.nix diff --git a/common/home.nix b/common/home.nix index 9d711114..8379a88a 100644 --- a/common/home.nix +++ b/common/home.nix @@ -43,9 +43,9 @@ in { ./gui.nix ./kitty.nix ./ncmpcpp.nix - ./nvim.nix ./sops.nix ./tmux.nix + ../neovim ] ++ lib.optionals device.isLinux [../linux] # ++ lib.optionals.device.isMac [../macos] diff --git a/common/nvim.nix b/common/nvim.nix deleted file mode 100644 index 155b7d60..00000000 --- a/common/nvim.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - pkgs, - inputs, - ... -}: { - imports = [inputs.nixvim.homeManagerModules.nixvim]; - programs.nixvim = - pkgs.sneovim.config - // { - enable = true; - }; -} diff --git a/flake.lock b/flake.lock index 26028843..e0477a19 100644 --- a/flake.lock +++ b/flake.lock @@ -343,28 +343,6 @@ } }, "devshell": { - "inputs": { - "nixpkgs": [ - "neovim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", - "owner": "numtide", - "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -446,20 +424,6 @@ "type": "github" } }, - "flake-compat_10": { - "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-compat_2": { "flake": false, "locked": { @@ -523,38 +487,6 @@ } }, "flake-compat_6": { - "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_7": { - "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_8": { "flake": false, "locked": { "lastModified": 1641205782, @@ -570,7 +502,7 @@ "type": "github" } }, - "flake-compat_9": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1641205782, @@ -669,72 +601,6 @@ } }, "flake-parts_5": { - "inputs": { - "nixpkgs-lib": [ - "neovim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_6": { - "inputs": { - "nixpkgs-lib": [ - "neovim", - "nnn", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_7": { - "inputs": { - "nixpkgs-lib": [ - "neovim", - "nnn", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_8": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -775,25 +641,7 @@ }, "flake-utils_10": { "inputs": { - "systems": "systems_13" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_11": { - "inputs": { - "systems": "systems_14" + "systems": "systems_12" }, "locked": { "lastModified": 1710146030, @@ -809,9 +657,9 @@ "type": "github" } }, - "flake-utils_12": { + "flake-utils_11": { "inputs": { - "systems": "systems_15" + "systems": "systems_13" }, "locked": { "lastModified": 1726560853, @@ -967,72 +815,10 @@ "git-hooks": { "inputs": { "flake-compat": [ - "neovim", "nixvim", "flake-compat" ], "gitignore": "gitignore_3", - "nixpkgs": [ - "neovim", - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "neovim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { - "inputs": { - "flake-compat": "flake-compat_7", - "gitignore": "gitignore_4", - "nixpkgs": [ - "neovim", - "nnn", - "nixpkgs" - ], - "nixpkgs-stable": [ - "neovim", - "nnn", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_3": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore_5", "nixpkgs": [ "nixvim", "nixpkgs" @@ -1103,7 +889,6 @@ "gitignore_3": { "inputs": { "nixpkgs": [ - "neovim", "nixvim", "git-hooks", "nixpkgs" @@ -1123,67 +908,6 @@ "type": "github" } }, - "gitignore_4": { - "inputs": { - "nixpkgs": [ - "neovim", - "nnn", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_5": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gp-nvim": { - "flake": false, - "locked": { - "lastModified": 1726734798, - "narHash": "sha256-QUZrFU/+TPBEU8yi9gmyRYjI/u7DP88AxcS0RMk7Jvk=", - "owner": "Robitx", - "repo": "gp.nvim", - "rev": "2372d5323c6feaa2e9c19f7ccb537c615d878e18", - "type": "github" - }, - "original": { - "owner": "Robitx", - "repo": "gp.nvim", - "type": "github" - } - }, "guihua": { "flake": false, "locked": { @@ -1200,29 +924,6 @@ "type": "github" } }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_7", - "nixpkgs": [ - "neovim", - "nnn", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730903510, - "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -1244,28 +945,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "neovim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "nixvim", @@ -1549,36 +1228,6 @@ } }, "ixx": { - "inputs": { - "flake-utils": [ - "neovim", - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "neovim", - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, - "ixx_2": { "inputs": { "flake-utils": [ "nixvim", @@ -1696,11 +1345,11 @@ "navigator": { "flake": false, "locked": { - "lastModified": 1731897571, - "narHash": "sha256-vCMUcE2xgFTjGrgQSSZ+CBixu1OTZlfmfgxN07qTLNc=", + "lastModified": 1732242345, + "narHash": "sha256-Rz7G819u/K8yT0S/bsXhkn0W8mAdUEGazjp0aMvvu1I=", "owner": "ray-x", "repo": "navigator.lua", - "rev": "496a17d173f0756eaf367f4be27e55580159b125", + "rev": "b1d0da438b2e0fa32e2d52a4a047b4900bb0e8ca", "type": "github" }, "original": { @@ -1778,11 +1427,11 @@ "neorg_2": { "flake": false, "locked": { - "lastModified": 1731818282, - "narHash": "sha256-G0SDsIPCvc9KZP8hTF3uUl2x4cSE98XLacfEAHUdYVQ=", + "lastModified": 1733872345, + "narHash": "sha256-6pUwWfsJ0TmToGU7Bvaeobnj2vuIqwd4w3TDdTvQZSk=", "owner": "nvim-neorg", "repo": "neorg", - "rev": "2d8ed7ee68f9b33a75324d92dbc706d93bb258a2", + "rev": "62671a7b03a1f38a6e5e03b006a9b6f8d804be0e", "type": "github" }, "original": { @@ -1791,79 +1440,7 @@ "type": "github" } }, - "neovim": { - "inputs": { - "d2": "d2", - "gp-nvim": "gp-nvim", - "guihua": "guihua", - "navigator": "navigator", - "neogit": "neogit", - "neorg": "neorg", - "neorg-telescope": "neorg-telescope", - "nixpkgs": [ - "nixpkgs" - ], - "nixvim": "nixvim", - "nnn": "nnn", - "nno": "nno", - "nvim-devdocs": "nvim-devdocs", - "pets": "pets", - "rest-nvim": "rest-nvim", - "systems": "systems_12", - "tree-sitter-d2": "tree-sitter-d2", - "tree-sitter-just": "tree-sitter-just", - "tree-sitter-slint": "tree-sitter-slint" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-JDi/Z1w+n+XPxn123PJ0IVlAconqEM9T7GDKjKCDE5Y=", - "path": "./neovim", - "type": "path" - }, - "original": { - "path": "./neovim", - "type": "path" - } - }, - "neovim-src": { - "flake": false, - "locked": { - "lastModified": 1732143030, - "narHash": "sha256-XKPsbjqHmwbiyzZdqNtw0tKxWLGFCkVB1+Awbi8tjQU=", - "owner": "neovim", - "repo": "neovim", - "rev": "07db909eb5ae2a559771068be64439eba394cd61", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "nix-darwin": { - "inputs": { - "nixpkgs": [ - "neovim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732016537, - "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nix-darwin_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -1883,7 +1460,7 @@ "type": "github" } }, - "nix-darwin_3": { + "nix-darwin_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -1927,7 +1504,7 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1732519917, @@ -2126,38 +1703,6 @@ } }, "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": 1732014248, "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", @@ -2173,7 +1718,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1732521221, "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", @@ -2189,6 +1734,38 @@ "type": "github" } }, + "nixpkgs_6": { + "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_7": { + "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", @@ -2196,42 +1773,13 @@ "flake-parts": "flake-parts_5", "git-hooks": "git-hooks", "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", + "nix-darwin": "nix-darwin_2", "nixpkgs": [ - "neovim", "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix_2" }, - "locked": { - "lastModified": 1732143099, - "narHash": "sha256-lh2Qi8gd1SwJVGo7gJjoFvS/djS5Nimaw25j792PJjM=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "2f71c4250bef7a52fe21bd00d1e58c119f62008c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "nixvim_2": { - "inputs": { - "devshell": "devshell_2", - "flake-compat": "flake-compat_10", - "flake-parts": "flake-parts_8", - "git-hooks": "git-hooks_3", - "home-manager": "home-manager_3", - "nix-darwin": "nix-darwin_3", - "nixpkgs": [ - "nixpkgs" - ], - "nuschtosSearch": "nuschtosSearch_2", - "treefmt-nix": "treefmt-nix_3" - }, "locked": { "lastModified": 1732661768, "narHash": "sha256-3D1m2l/hMivhpVkmJoEM+4tQ9W5j6s4UESSnuVl/7LM=", @@ -2246,50 +1794,23 @@ "type": "github" } }, - "nnn": { - "inputs": { - "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_6", - "git-hooks": "git-hooks_2", - "hercules-ci-effects": "hercules-ci-effects", - "neovim-src": "neovim-src", - "nixpkgs": [ - "neovim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732173780, - "narHash": "sha256-pszcETwWdItBmb/Z2CqIiTfEiVl3K5TPpgFSwyQrghY=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "151fab1aa35e1cbc6f5caad1e175e3d621d67951", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, "nno": { "inputs": { "flake-utils": "flake-utils_7", "neorg": "neorg_2", "neorg-telescope": "neorg-telescope_2", "nixpkgs": [ - "neovim", "nixpkgs" ], "norg": "norg", "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1731933255, - "narHash": "sha256-S+4ganslYoidFxCpWFpzoGVBskUrQUwzMkUKS0rz3jY=", + "lastModified": 1734078148, + "narHash": "sha256-W3MlwXmWDMJoWwp6N+874Eh7ksq43yBXmm5HCTCLvjQ=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "24c1f958312c1125ba69cfee1f5a5d0a4940da99", + "rev": "1f1d248bd728946582a13e29de4638131af4f66b", "type": "github" }, "original": { @@ -2300,9 +1821,9 @@ }, "norg": { "inputs": { - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_6", "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1672582520, @@ -2321,9 +1842,9 @@ }, "norg-meta": { "inputs": { - "flake-compat": "flake-compat_9", + "flake-compat": "flake-compat_7", "flake-utils": "flake-utils_9", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1713028366, @@ -2359,7 +1880,6 @@ "flake-utils": "flake-utils_6", "ixx": "ixx", "nixpkgs": [ - "neovim", "nixvim", "nixpkgs" ] @@ -2378,48 +1898,9 @@ "type": "github" } }, - "nuschtosSearch_2": { - "inputs": { - "flake-utils": "flake-utils_10", - "ixx": "ixx_2", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731936508, - "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", - "owner": "NuschtOS", - "repo": "search", - "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, - "nvim-devdocs": { - "flake": false, - "locked": { - "lastModified": 1712843813, - "narHash": "sha256-NvxsUAl+FKrT60xmrVBh/EVLuWrGaLWWwFsWYrr7QKc=", - "owner": "luckasRanarison", - "repo": "nvim-devdocs", - "rev": "1ab982d3e069d191d9157b897c8b70cf48b7f77a", - "type": "github" - }, - "original": { - "owner": "luckasRanarison", - "repo": "nvim-devdocs", - "type": "github" - } - }, "onepassword-shell-plugins": { "inputs": { - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_10", "nixpkgs": [ "nixpkgs" ] @@ -2524,11 +2005,11 @@ "rest-nvim": { "flake": false, "locked": { - "lastModified": 1731137082, - "narHash": "sha256-QHJ8VrCOyOVlh4wu+KLvDrbI2z19n+MM6kw10VKLG+k=", + "lastModified": 1734014178, + "narHash": "sha256-IxFu4JvpkU4VZzrt3I46gNxkuOHRJfaInEvxLcW0qNc=", "owner": "rest-nvim", "repo": "rest.nvim", - "rev": "e82dc524894b1b55bcc3296d3644f15c9e06d5ad", + "rev": "8b489547ddbe674712750b69b34436527d855500", "type": "github" }, "original": { @@ -2545,8 +2026,10 @@ "anyrun-rink": "anyrun-rink", "cachix-deploy-flake": "cachix-deploy-flake", "csshacks": "csshacks", + "d2": "d2", "deploy-rs": "deploy-rs", "flake-utils": "flake-utils_3", + "guihua": "guihua", "home-manager": "home-manager", "hyprland": "hyprland", "hyprlock": "hyprlock", @@ -2554,17 +2037,26 @@ "lanzaboote": "lanzaboote", "music-player": "music-player", "musnix": "musnix", - "neovim": "neovim", - "nix-darwin": "nix-darwin_2", + "navigator": "navigator", + "neogit": "neogit", + "neorg": "neorg", + "neorg-telescope": "neorg-telescope", + "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "nixpkgs-master": "nixpkgs-master", - "nixvim": "nixvim_2", + "nixvim": "nixvim", + "nno": "nno", "nur": "nur", "onepassword-shell-plugins": "onepassword-shell-plugins", "openapi-tui": "openapi-tui", + "pets": "pets", + "rest-nvim": "rest-nvim", "rust-overlay": "rust-overlay_6", "sops-nix": "sops-nix", + "tree-sitter-d2": "tree-sitter-d2", + "tree-sitter-just": "tree-sitter-just", + "tree-sitter-slint": "tree-sitter-slint", "zjstatus": "zjstatus" } }, @@ -2813,36 +2305,6 @@ "type": "github" } }, - "systems_14": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_15": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -3034,28 +2496,6 @@ } }, "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "neovim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732111664, - "narHash": "sha256-XWHuPWcP59QnHEewdZJXBX1TA2lAP78Vz4daG6tfIr4=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "62003fdad7a5ab7b6af3ea9bd7290e4c220277d0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nixvim", @@ -3138,7 +2578,7 @@ "zjstatus": { "inputs": { "crane": "crane_5", - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_11", "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index c4ee37b8..d7c3dae0 100644 --- a/flake.nix +++ b/flake.nix @@ -62,10 +62,6 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - neovim = { - url = "path:./neovim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; openapi-tui = { url = "github:zaghaghi/openapi-tui"; flake = false; @@ -94,6 +90,54 @@ url = "github:MrOtherGuy/firefox-csshacks"; flake = false; }; + nno = { + url = "github:nvim-neorg/nixpkgs-neorg-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + pets = { + url = "github:giusgad/pets.nvim"; + flake = false; + }; + neorg = { + url = "github:nvim-neorg/neorg/v9.1.1"; + flake = false; + }; + neorg-telescope = { + url = "github:nvim-neorg/neorg-telescope"; + flake = false; + }; + rest-nvim = { + url = "github:rest-nvim/rest.nvim"; + flake = false; + }; + neogit = { + url = "github:NeogitOrg/neogit/nightly"; + flake = false; + }; + tree-sitter-d2 = { + url = "github:ravsii/tree-sitter-d2"; + flake = false; + }; + tree-sitter-just = { + url = "github:IndianBoy42/tree-sitter-just"; + flake = false; + }; + tree-sitter-slint = { + url = "github:slint-ui/tree-sitter-slint"; + flake = false; + }; + d2 = { + url = "github:terrastruct/d2-vim"; + flake = false; + }; + navigator = { + url = "github:ray-x/navigator.lua"; + flake = false; + }; + guihua = { + url = "github:ray-x/guihua.lua"; + flake = false; + }; }; outputs = { @@ -227,7 +271,6 @@ }; }; - packages = inputs.neovim.packages; deploy = { nodes = { mirai = { @@ -271,9 +314,5 @@ }; }; }; - - devshells.default = { - packages = packages; - }; }; } diff --git a/neovim/nvim.nix b/neovim/default.nix similarity index 99% rename from neovim/nvim.nix rename to neovim/default.nix index 450a530b..7f916a1c 100644 --- a/neovim/nvim.nix +++ b/neovim/default.nix @@ -20,7 +20,6 @@ ${lua} ''; }; -in rec { neovim = (pkgs.nixvim.makeNixvim config) // {config = config;}; config = { plugins = { @@ -802,4 +801,6 @@ in rec { extraLuaPackages = luaPkgs: with luaPkgs; [lua-utils-nvim nvim-nio pathlib-nvim]; extraPackages = [pkgs.lldb pkgs.taplo pkgs.d2 pkgs.sleek pkgs.graphqurl]; }; +in { + home.packages = [neovim]; } diff --git a/neovim/flake.lock b/neovim/flake.lock deleted file mode 100644 index ddb79d58..00000000 --- a/neovim/flake.lock +++ /dev/null @@ -1,946 +0,0 @@ -{ - "nodes": { - "d2": { - "flake": false, - "locked": { - "lastModified": 1675176182, - "narHash": "sha256-+mT4pEbtq7f9ZXhOop3Jnjr7ulxU32VtahffIwQqYF4=", - "owner": "terrastruct", - "repo": "d2-vim", - "rev": "981c87dccb63df2887cc41b96e84bf550f736c57", - "type": "github" - }, - "original": { - "owner": "terrastruct", - "repo": "d2-vim", - "type": "github" - } - }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", - "owner": "numtide", - "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "flake-compat": { - "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-compat_2": { - "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_3": { - "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_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": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nnn", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "nnn", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "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_4": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { - "inputs": { - "flake-compat": "flake-compat_3", - "gitignore": "gitignore_2", - "nixpkgs": [ - "nnn", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nnn", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "nnn", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gp-nvim": { - "flake": false, - "locked": { - "lastModified": 1726734798, - "narHash": "sha256-QUZrFU/+TPBEU8yi9gmyRYjI/u7DP88AxcS0RMk7Jvk=", - "owner": "Robitx", - "repo": "gp.nvim", - "rev": "2372d5323c6feaa2e9c19f7ccb537c615d878e18", - "type": "github" - }, - "original": { - "owner": "Robitx", - "repo": "gp.nvim", - "type": "github" - } - }, - "guihua": { - "flake": false, - "locked": { - "lastModified": 1730516234, - "narHash": "sha256-XpUsbj1boDfbyE8C6SdOvZdkd97682VVC81fvQ5WA/4=", - "owner": "ray-x", - "repo": "guihua.lua", - "rev": "d783191eaa75215beae0c80319fcce5e6b3beeda", - "type": "github" - }, - "original": { - "owner": "ray-x", - "repo": "guihua.lua", - "type": "github" - } - }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": [ - "nnn", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730903510, - "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, - "navigator": { - "flake": false, - "locked": { - "lastModified": 1731897571, - "narHash": "sha256-vCMUcE2xgFTjGrgQSSZ+CBixu1OTZlfmfgxN07qTLNc=", - "owner": "ray-x", - "repo": "navigator.lua", - "rev": "496a17d173f0756eaf367f4be27e55580159b125", - "type": "github" - }, - "original": { - "owner": "ray-x", - "repo": "navigator.lua", - "type": "github" - } - }, - "neogit": { - "flake": false, - "locked": { - "lastModified": 1716148858, - "narHash": "sha256-jO/AKIF0Z5cmp0v2KOmL4H0hYlqaQFtGqLPwMrD+AAc=", - "owner": "NeogitOrg", - "repo": "neogit", - "rev": "d55898fe64e3b3d87a0b3b38ddc9c3d57526ff48", - "type": "github" - }, - "original": { - "owner": "NeogitOrg", - "ref": "nightly", - "repo": "neogit", - "type": "github" - } - }, - "neorg": { - "flake": false, - "locked": { - "lastModified": 1721818770, - "narHash": "sha256-f6hJbZEcf9XGTLxUikTOu2Kq53hlAC08JJbz76gQk6I=", - "owner": "nvim-neorg", - "repo": "neorg", - "rev": "81ee90cb2d72ac43bfadb7dd276646f34c8f85be", - "type": "github" - }, - "original": { - "owner": "nvim-neorg", - "ref": "v9.1.1", - "repo": "neorg", - "type": "github" - } - }, - "neorg-telescope": { - "flake": false, - "locked": { - "lastModified": 1722358034, - "narHash": "sha256-ei4uUqpIQjGKzu5ryu0Hlmis9TS9FJsYnjt4J4QdWlw=", - "owner": "nvim-neorg", - "repo": "neorg-telescope", - "rev": "ddb2556644cae922699a239bbb0fe16e25b084b7", - "type": "github" - }, - "original": { - "owner": "nvim-neorg", - "repo": "neorg-telescope", - "type": "github" - } - }, - "neorg-telescope_2": { - "flake": false, - "locked": { - "lastModified": 1722358034, - "narHash": "sha256-ei4uUqpIQjGKzu5ryu0Hlmis9TS9FJsYnjt4J4QdWlw=", - "owner": "nvim-neorg", - "repo": "neorg-telescope", - "rev": "ddb2556644cae922699a239bbb0fe16e25b084b7", - "type": "github" - }, - "original": { - "owner": "nvim-neorg", - "repo": "neorg-telescope", - "type": "github" - } - }, - "neorg_2": { - "flake": false, - "locked": { - "lastModified": 1731818282, - "narHash": "sha256-G0SDsIPCvc9KZP8hTF3uUl2x4cSE98XLacfEAHUdYVQ=", - "owner": "nvim-neorg", - "repo": "neorg", - "rev": "2d8ed7ee68f9b33a75324d92dbc706d93bb258a2", - "type": "github" - }, - "original": { - "owner": "nvim-neorg", - "repo": "neorg", - "type": "github" - } - }, - "neovim-src": { - "flake": false, - "locked": { - "lastModified": 1732143030, - "narHash": "sha256-XKPsbjqHmwbiyzZdqNtw0tKxWLGFCkVB1+Awbi8tjQU=", - "owner": "neovim", - "repo": "neovim", - "rev": "07db909eb5ae2a559771068be64439eba394cd61", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732016537, - "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "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", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "home-manager": "home-manager", - "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgs" - ], - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1732143099, - "narHash": "sha256-lh2Qi8gd1SwJVGo7gJjoFvS/djS5Nimaw25j792PJjM=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "2f71c4250bef7a52fe21bd00d1e58c119f62008c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "nnn": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks_2", - "hercules-ci-effects": "hercules-ci-effects", - "neovim-src": "neovim-src", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732173780, - "narHash": "sha256-pszcETwWdItBmb/Z2CqIiTfEiVl3K5TPpgFSwyQrghY=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "151fab1aa35e1cbc6f5caad1e175e3d621d67951", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, - "nno": { - "inputs": { - "flake-utils": "flake-utils_2", - "neorg": "neorg_2", - "neorg-telescope": "neorg-telescope_2", - "nixpkgs": [ - "nixpkgs" - ], - "norg": "norg", - "norg-meta": "norg-meta" - }, - "locked": { - "lastModified": 1731933255, - "narHash": "sha256-S+4ganslYoidFxCpWFpzoGVBskUrQUwzMkUKS0rz3jY=", - "owner": "nvim-neorg", - "repo": "nixpkgs-neorg-overlay", - "rev": "24c1f958312c1125ba69cfee1f5a5d0a4940da99", - "type": "github" - }, - "original": { - "owner": "nvim-neorg", - "repo": "nixpkgs-neorg-overlay", - "type": "github" - } - }, - "norg": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_3", - "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_4", - "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" - } - }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731936508, - "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", - "owner": "NuschtOS", - "repo": "search", - "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, - "nvim-devdocs": { - "flake": false, - "locked": { - "lastModified": 1712843813, - "narHash": "sha256-NvxsUAl+FKrT60xmrVBh/EVLuWrGaLWWwFsWYrr7QKc=", - "owner": "luckasRanarison", - "repo": "nvim-devdocs", - "rev": "1ab982d3e069d191d9157b897c8b70cf48b7f77a", - "type": "github" - }, - "original": { - "owner": "luckasRanarison", - "repo": "nvim-devdocs", - "type": "github" - } - }, - "pets": { - "flake": false, - "locked": { - "lastModified": 1721891009, - "narHash": "sha256-Dslrf6aw16Q4lKrQ/OAOOrS9oC6OMlB49BadAqzBcOY=", - "owner": "giusgad", - "repo": "pets.nvim", - "rev": "8a443e2eae804e5abe21b5d00ceaef4041f882e4", - "type": "github" - }, - "original": { - "owner": "giusgad", - "repo": "pets.nvim", - "type": "github" - } - }, - "rest-nvim": { - "flake": false, - "locked": { - "lastModified": 1731137082, - "narHash": "sha256-QHJ8VrCOyOVlh4wu+KLvDrbI2z19n+MM6kw10VKLG+k=", - "owner": "rest-nvim", - "repo": "rest.nvim", - "rev": "e82dc524894b1b55bcc3296d3644f15c9e06d5ad", - "type": "github" - }, - "original": { - "owner": "rest-nvim", - "repo": "rest.nvim", - "type": "github" - } - }, - "root": { - "inputs": { - "d2": "d2", - "gp-nvim": "gp-nvim", - "guihua": "guihua", - "navigator": "navigator", - "neogit": "neogit", - "neorg": "neorg", - "neorg-telescope": "neorg-telescope", - "nixpkgs": "nixpkgs", - "nixvim": "nixvim", - "nnn": "nnn", - "nno": "nno", - "nvim-devdocs": "nvim-devdocs", - "pets": "pets", - "rest-nvim": "rest-nvim", - "systems": "systems_3", - "tree-sitter-d2": "tree-sitter-d2", - "tree-sitter-just": "tree-sitter-just" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "tree-sitter-d2": { - "flake": false, - "locked": { - "lastModified": 1731440976, - "narHash": "sha256-PiJWywcq0+eU+pv0P/461raF1pNPCQAMFBe8lDbILao=", - "owner": "ravsii", - "repo": "tree-sitter-d2", - "rev": "21b54d32365d21fd640ff8ec9b5dc83b3abb8bfd", - "type": "github" - }, - "original": { - "owner": "ravsii", - "repo": "tree-sitter-d2", - "type": "github" - } - }, - "tree-sitter-just": { - "flake": false, - "locked": { - "lastModified": 1732042972, - "narHash": "sha256-b42Dt9X0gaHjywb+tahNomGfDx9ZP+roudNuGAhKYPg=", - "owner": "IndianBoy42", - "repo": "tree-sitter-just", - "rev": "f6d29300f9fee15dcd8c2b25ab762001d38da731", - "type": "github" - }, - "original": { - "owner": "IndianBoy42", - "repo": "tree-sitter-just", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732111664, - "narHash": "sha256-XWHuPWcP59QnHEewdZJXBX1TA2lAP78Vz4daG6tfIr4=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "62003fdad7a5ab7b6af3ea9bd7290e4c220277d0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/neovim/flake.nix b/neovim/flake.nix deleted file mode 100644 index 9b50b183..00000000 --- a/neovim/flake.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - systems.url = "github:nix-systems/default"; - nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nno = { - url = "github:nvim-neorg/nixpkgs-neorg-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nnn = { - url = "github:nix-community/neovim-nightly-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - pets = { - url = "github:giusgad/pets.nvim"; - flake = false; - }; - neorg = { - url = "github:nvim-neorg/neorg/v9.1.1"; - flake = false; - }; - neorg-telescope = { - url = "github:nvim-neorg/neorg-telescope"; - flake = false; - }; - rest-nvim = { - url = "github:rest-nvim/rest.nvim"; - flake = false; - }; - gp-nvim = { - url = "github:Robitx/gp.nvim"; - flake = false; - }; - nvim-devdocs = { - url = "github:luckasRanarison/nvim-devdocs"; - flake = false; - }; - neogit = { - url = "github:NeogitOrg/neogit/nightly"; - flake = false; - }; - tree-sitter-d2 = { - url = "github:ravsii/tree-sitter-d2"; - flake = false; - }; - tree-sitter-just = { - url = "github:IndianBoy42/tree-sitter-just"; - flake = false; - }; - tree-sitter-slint = { - url = "github:slint-ui/tree-sitter-slint"; - flake = false; - }; - d2 = { - url = "github:terrastruct/d2-vim"; - flake = false; - }; - navigator = { - url = "github:ray-x/navigator.lua"; - flake = false; - }; - guihua = { - url = "github:ray-x/guihua.lua"; - flake = false; - }; - }; - - outputs = { - self, - nixpkgs, - systems, - ... - } @ inputs: let - forEachSystem = nixpkgs.lib.genAttrs (import systems); - nvim = forEachSystem (system: - import ./nvim.nix { - pkgs = import nixpkgs { - inherit system; - config.allowUnfree = true; - overlays = import ./overlays.nix { - inherit inputs; - }; - }; - }); - in rec { - packages = forEachSystem (system: rec { - neovim = nvim.${system}.neovim; - default = neovim; - }); - overlays = { - default = prev: final: { - sneovim = packages.${final.system}.neovim; - }; - }; - }; -} diff --git a/overlays.nix b/overlays.nix index 40aa86f8..6696857b 100644 --- a/overlays.nix +++ b/overlays.nix @@ -1,4 +1,4 @@ -{inputs, ...}: let +{inputs, ...} @ self: let shell-scipts = final: prev: { handlr-xdg = final.pkgs.writeShellApplication { name = "xdg-open"; @@ -223,22 +223,18 @@ csshacks = final: prev: { csshacks = inputs.csshacks; }; -in [ - libfprint - zellij - catppuccinThemes - tmuxPlugins - anyrun-overlay - nix-index-db - shell-scipts - misc-applications - # inputs.neovim-nightly-overlay.overlays.default - #inputs.nixvim.overlays.default - inputs.nur.overlay - inputs.neovim.overlays.default - # inputs.nno.overlays.default - # catppuccin - inputs.rust-overlay.overlays.default - #inputs.hyprland.overlays.default - csshacks -] +in + [ + libfprint + zellij + catppuccinThemes + tmuxPlugins + anyrun-overlay + nix-index-db + shell-scipts + misc-applications + inputs.nur.overlay + inputs.rust-overlay.overlays.default + csshacks + ] + ++ (import ./neovim/overlays.nix self)