diff --git a/flake.lock b/flake.lock index 8a8e1fb..a7f0f98 100644 --- a/flake.lock +++ b/flake.lock @@ -32,10 +32,31 @@ "type": "github" } }, + "flake-nvim": { + "inputs": { + "neovim": "neovim", + "nixpkgs": "nixpkgs", + "plugin-dracula": "plugin-dracula", + "plugin-gruvbox": "plugin-gruvbox" + }, + "locked": { + "lastModified": 1740493748, + "narHash": "sha256-fKVoWQHlFchsJub5s7b+krjPn3Z5NeIHxBmEYCxveKU=", + "ref": "refs/heads/main", + "rev": "b250105afaf2276d288d283fe2d79a49a3eb3f0d", + "revCount": 41, + "type": "git", + "url": "https://gitea.napo280.fr/napo280/flake-nvim" + }, + "original": { + "type": "git", + "url": "https://gitea.napo280.fr/napo280/flake-nvim" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ - "neovim", + "flake-nvim", "neovim", "nixpkgs" ] @@ -57,7 +78,7 @@ "flake-parts_2": { "inputs": { "nixpkgs-lib": [ - "neovim", + "flake-nvim", "neovim", "hercules-ci-effects", "nixpkgs" @@ -81,7 +102,7 @@ "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ - "neovim", + "flake-nvim", "neovim", "nixpkgs" ] @@ -103,7 +124,7 @@ "gitignore": { "inputs": { "nixpkgs": [ - "neovim", + "flake-nvim", "neovim", "git-hooks", "nixpkgs" @@ -127,7 +148,7 @@ "inputs": { "flake-parts": "flake-parts_2", "nixpkgs": [ - "neovim", + "flake-nvim", "neovim", "nixpkgs" ] @@ -147,43 +168,6 @@ } }, "neovim": { - "inputs": { - "neovim": "neovim_2", - "nixpkgs": "nixpkgs", - "plugin-dracula": "plugin-dracula", - "plugin-gruvbox": "plugin-gruvbox" - }, - "locked": { - "lastModified": 1740493748, - "narHash": "sha256-fKVoWQHlFchsJub5s7b+krjPn3Z5NeIHxBmEYCxveKU=", - "ref": "refs/heads/main", - "rev": "b250105afaf2276d288d283fe2d79a49a3eb3f0d", - "revCount": 41, - "type": "git", - "url": "https://gitea.napo280.fr/napo280/flake-nvim" - }, - "original": { - "type": "git", - "url": "https://gitea.napo280.fr/napo280/flake-nvim" - } - }, - "neovim-src": { - "flake": false, - "locked": { - "lastModified": 1740181035, - "narHash": "sha256-B0IflO5lsfiP5N7NOzEOWTOkWpm8Gw2eh+PHpQaxByY=", - "owner": "neovim", - "repo": "neovim", - "rev": "db2c3d1143fb5888602a2cee84578bd8a9c88bd7", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, - "neovim_2": { "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts", @@ -191,7 +175,7 @@ "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", "nixpkgs": [ - "neovim", + "flake-nvim", "nixpkgs" ], "treefmt-nix": "treefmt-nix" @@ -210,6 +194,22 @@ "type": "github" } }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1740181035, + "narHash": "sha256-B0IflO5lsfiP5N7NOzEOWTOkWpm8Gw2eh+PHpQaxByY=", + "owner": "neovim", + "repo": "neovim", + "rev": "db2c3d1143fb5888602a2cee84578bd8a9c88bd7", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1740232592, @@ -274,14 +274,14 @@ }, "root": { "inputs": { - "neovim": "neovim", + "flake-nvim": "flake-nvim", "nixpkgs": "nixpkgs_2" } }, "treefmt-nix": { "inputs": { "nixpkgs": [ - "neovim", + "flake-nvim", "neovim", "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 67747da..6886f70 100644 --- a/flake.nix +++ b/flake.nix @@ -5,19 +5,12 @@ nixpkgs = { url = "github:NixOS/nixpkgs"; }; - neovim.url = "git+https://gitea.napo280.fr/napo280/flake-nvim"; + flake-nvim.url = "git+https://gitea.napo280.fr/napo280/flake-nvim"; }; - outputs = { self, nixpkgs, flake-nvim, flake-python, ... }: + outputs = { self, nixpkgs, flake-nvim, ... }: { - nixosConfigurations.mySystem = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - - # On assemble les modules provenant des différents flakes - modules = [ - flake-nvim.nixosModules.neovim - ]; - - # Si besoin, on peut ajouter d'autres modules locaux ici - }; + nixosModules = { + neovim = flake-nvim.nixosModules.neovim; + }; }; }