From e897ee2708ddd30b44775c26b5d31de901a9b489 Mon Sep 17 00:00:00 2001 From: xunuwu Date: Sun, 2 Mar 2025 08:29:24 +0100 Subject: [PATCH] use new nvim config --- flake.lock | 331 +++++++++++++-------------------- flake.nix | 4 +- home/profiles/editors/nvim.nix | 2 +- 3 files changed, 135 insertions(+), 202 deletions(-) diff --git a/flake.lock b/flake.lock index e621739..23a13f9 100644 --- a/flake.lock +++ b/flake.lock @@ -109,28 +109,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nvim-nix", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", - "owner": "numtide", - "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "firefox-addons": { "inputs": { "flake-utils": "flake-utils_2", @@ -203,20 +181,38 @@ } }, "flake-compat_3": { + "flake": false, "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" + "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_4": { + "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_5": { "flake": false, "locked": { "lastModified": 1733328505, @@ -273,8 +269,8 @@ "flake-parts_3": { "inputs": { "nixpkgs-lib": [ - "nvim-nix", - "nixvim", + "nvim-config", + "neovim-nightly-overlay", "nixpkgs" ] }, @@ -292,6 +288,28 @@ "type": "github" } }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "nvim-config", + "neovim-nightly-overlay", + "hercules-ci-effects", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, "flake-utils": { "inputs": { "systems": [ @@ -329,24 +347,6 @@ } }, "flake-utils_3": { - "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_4": { "inputs": { "systems": [ "stylix", @@ -385,15 +385,11 @@ }, "git-hooks": { "inputs": { - "flake-compat": [ - "nvim-nix", - "nixvim", - "flake-compat" - ], + "flake-compat": "flake-compat_4", "gitignore": "gitignore", "nixpkgs": [ - "nvim-nix", - "nixvim", + "nvim-config", + "neovim-nightly-overlay", "nixpkgs" ] }, @@ -440,8 +436,8 @@ "gitignore": { "inputs": { "nixpkgs": [ - "nvim-nix", - "nixvim", + "nvim-config", + "neovim-nightly-overlay", "git-hooks", "nixpkgs" ] @@ -514,6 +510,29 @@ "type": "github" } }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": [ + "nvim-config", + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1739595404, + "narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "06519cec8fb32d219006da6eacd255504a9996af", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -535,28 +554,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nvim-nix", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738448366, - "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "stylix", @@ -577,36 +574,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nvim-nix", - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nvim-nix", - "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" - } - }, "napalm": { "inputs": { "flake-utils": [ @@ -633,25 +600,43 @@ "type": "github" } }, - "nix-darwin": { + "neovim-nightly-overlay": { "inputs": { - "nixpkgs": [ - "nvim-nix", - "nixvim", - "nixpkgs" - ] + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_3", + "git-hooks": "git-hooks", + "hercules-ci-effects": "hercules-ci-effects", + "neovim-src": "neovim-src", + "nixpkgs": "nixpkgs_3", + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1738277753, - "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9", + "lastModified": 1740790052, + "narHash": "sha256-hF7yeQ+ljZeHdybfemarAVjABCWb5SUtWgyhEgIzUVc=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "06c050aa63007593fec78c38d37f75e28fe3f740", "type": "github" }, "original": { - "owner": "lnl7", - "repo": "nix-darwin", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "type": "github" + } + }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1740786347, + "narHash": "sha256-yY6ipjD1eMUtOK69ZrBH3JCxrmKlLAxWf+DgYUpqwgE=", + "owner": "neovim", + "repo": "neovim", + "rev": "45d7aa3301d436aef3cf5d88db8d0da145f9b70c", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", "type": "github" } }, @@ -763,77 +748,40 @@ "type": "github" } }, - "nixvim": { - "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_3", - "git-hooks": "git-hooks", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nvim-nix", - "nixpkgs" - ], - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix_2" - }, + "nixpkgs_3": { "locked": { - "lastModified": 1738622717, - "narHash": "sha256-XSFbbhN8xdr4qKRFbubXJ3vkSusKSnALf69G9fdGPXE=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "6288354d43ada972480cbd10dc7102637eeafc1e", + "lastModified": 1740547748, + "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3a05eebede89661660945da1f151959900903b6a", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixvim", + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", "type": "github" } }, - "nuschtosSearch": { + "nvim-config": { "inputs": { - "flake-utils": "flake-utils_3", - "ixx": "ixx", + "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpkgs": [ - "nvim-nix", - "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", - "owner": "NuschtOS", - "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, - "nvim-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "nixvim": "nixvim" - }, - "locked": { - "lastModified": 1739518948, - "narHash": "sha256-isBkgU2iCJX/YhjFzsVt6ND+c4yY1fERVw7wH32m8go=", + "lastModified": 1740900246, + "narHash": "sha256-/6YD4Kku1hxuut6o0XGSI9pDel/rdTm+yw47VVytWXU=", "owner": "xunuwu", - "repo": "nvim-nix", - "rev": "c83b49227951572b8555dca5cd47fa9674577d99", + "repo": "nvim-config", + "rev": "6132ac0737ab20f8ee3af9b69797e6d74c6906b6", "type": "github" }, "original": { "owner": "xunuwu", - "repo": "nvim-nix", + "repo": "nvim-config", "type": "github" } }, @@ -878,7 +826,7 @@ "nix-index-database": "nix-index-database", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_2", - "nvim-nix": "nvim-nix", + "nvim-config": "nvim-config", "sobercookie": "sobercookie", "sops-nix": "sops-nix", "stylix": "stylix", @@ -932,15 +880,15 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_3", "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux", @@ -990,21 +938,6 @@ "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" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1096,17 +1029,17 @@ "treefmt-nix_2": { "inputs": { "nixpkgs": [ - "nvim-nix", - "nixvim", + "nvim-config", + "neovim-nightly-overlay", "nixpkgs" ] }, "locked": { - "lastModified": 1738070913, - "narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "bebf27d00f7d10ba75332a0541ac43676985dea3", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index eea9951..08c9a73 100644 --- a/flake.nix +++ b/flake.nix @@ -39,8 +39,8 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - nvim-nix.url = "github:xunuwu/nvim-nix"; - nvim-nix.inputs.nixpkgs.follows = "nixpkgs"; + nvim-config.url = "github:xunuwu/nvim-config"; + nvim-config.inputs.nixpkgs.follows = "nixpkgs"; stylix.url = "github:danth/stylix"; stylix.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/profiles/editors/nvim.nix b/home/profiles/editors/nvim.nix index 2ef81ee..68f0476 100644 --- a/home/profiles/editors/nvim.nix +++ b/home/profiles/editors/nvim.nix @@ -3,6 +3,6 @@ inputs, ... }: { - home.packages = [inputs.nvim-nix.packages.${pkgs.system}.default]; + home.packages = [inputs.nvim-config.packages.${pkgs.system}.default]; home.sessionVariables.EDITOR = "nvim"; }