diff --git a/flake.lock b/flake.lock index faff562..12ec943 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,43 @@ { "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "neovim-flake": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "contrib", + "lastModified": 1621700283, + "narHash": "sha256-jU1SPAm9W86RcQ89MASKKA9K8wvVV+pkxX9X0RH0I+w=", + "owner": "neovim", + "repo": "neovim", + "rev": "5b2be75256b638275900be0b36ee02ef1730f999", + "type": "github" + }, + "original": { + "dir": "contrib", + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1621552131, @@ -10,12 +48,15 @@ "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "root": { "inputs": { + "neovim-flake": "neovim-flake", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 7625f4c..3eab63d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,18 @@ { - outputs = { self, nixpkgs }: { - nixosConfigurations.petalius = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ ./petalius.nix ]; - }; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + + neovim-flake.url = "github:neovim/neovim?dir=contrib"; + neovim-flake.inputs.nixpkgs.follows = "nixpkgs"; + }; + + outputs = { self, nixpkgs, neovim-flake, ... }: + let + neovimOverlay = { pkgs, ... }: { nixpkgs.overlays = [ neovim-flake.overlay ]; }; + in { + nixosConfigurations.petalius = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ ./petalius.nix neovimOverlay ]; + }; }; }