diff --git a/flake.lock b/flake.lock index 6d219cf..58a3262 100644 --- a/flake.lock +++ b/flake.lock @@ -137,6 +137,21 @@ "type": "github" } }, + "devshell_2": { + "locked": { + "lastModified": 1625086391, + "narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=", + "owner": "numtide", + "repo": "devshell", + "rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "digga": { "inputs": { "blank": "blank", @@ -223,6 +238,44 @@ "type": "github" } }, + "flakeCompat": { + "flake": false, + "locked": { + "lastModified": 1606424373, + "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "helix": { + "inputs": { + "flakeCompat": "flakeCompat", + "nixCargoIntegration": "nixCargoIntegration", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1627315633, + "narHash": "sha256-npaWU9f8/qcJjMURUYyp23ymiYZ+J+aP30GvPpYVryM=", + "owner": "helix-editor", + "repo": "helix", + "rev": "88d6f652390922b389667f469b6d308db569bdaf", + "type": "github" + }, + "original": { + "owner": "helix-editor", + "repo": "helix", + "type": "github" + } + }, "home": { "inputs": { "nixpkgs": [ @@ -298,6 +351,29 @@ "type": "github" } }, + "nixCargoIntegration": { + "inputs": { + "devshell": "devshell_2", + "nixpkgs": [ + "helix", + "nixpkgs" + ], + "rustOverlay": "rustOverlay" + }, + "locked": { + "lastModified": 1627106928, + "narHash": "sha256-JaQE0BEk1G1eT539WbYyrA2re4YYL9xo7cB+ZiV4nNM=", + "owner": "yusdacra", + "repo": "nix-cargo-integration", + "rev": "e08af05413a2d53dadbd1a39976e1da0e5385970", + "type": "github" + }, + "original": { + "owner": "yusdacra", + "repo": "nix-cargo-integration", + "type": "github" + } + }, "nixos": { "locked": { "lastModified": 1627149512, @@ -432,6 +508,32 @@ "type": "github" } }, + "rnixLsp": { + "inputs": { + "naersk": [ + "naersk" + ], + "nixpkgs": [ + "nixpkgs" + ], + "utils": [ + "flake-utils" + ] + }, + "locked": { + "lastModified": 1626644818, + "narHash": "sha256-w0hpyFXxltmOpbBKNQ2tfKRWELQzStc/ho1EcNyYaWc=", + "owner": "nix-community", + "repo": "rnix-lsp", + "rev": "1fdd7cf9bf56b8ad2dddcfd27354dae8aef2b453", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "rnix-lsp", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -454,6 +556,7 @@ "digga", "flake-utils-plus" ], + "helix": "helix", "home": "home", "latest": "latest", "naersk": "naersk_2", @@ -469,7 +572,24 @@ ], "nixpkgsWayland": "nixpkgsWayland", "nur": "nur", - "nvfetcher": "nvfetcher" + "nvfetcher": "nvfetcher", + "rnixLsp": "rnixLsp" + } + }, + "rustOverlay": { + "flake": false, + "locked": { + "lastModified": 1627092891, + "narHash": "sha256-6nN+rfsP+SNpnL3UPbrcwZe4qfh9/NH0LWtXhn9w/a4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "939f2cf1aebc86bc3e9544645b495cd05995524a", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 02d6e4f..614740b 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,16 @@ nixos-hardware.url = "github:nixos/nixos-hardware"; + rnixLsp = { + url = "github:nix-community/rnix-lsp"; + inputs.naersk.follows = "naersk"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.utils.follows = "flake-utils"; + }; + helix = { + url = "github:helix-editor/helix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixosPersistence.url = "github:nix-community/impermanence"; nixpkgsWayland = { url = "github:colemickens/nixpkgs-wayland"; @@ -60,10 +70,12 @@ , nixos-hardware , nur , agenix - , nixosPersistence - , nixpkgsWayland , nvfetcher , deploy + , nixosPersistence + , nixpkgsWayland + , rnixLsp + , helix , ... } @ inputs: digga.lib.mkFlake @@ -82,6 +94,10 @@ #nvfetcher.overlay #deploy.overlay nixpkgsWayland.overlay + (_: prev: { + helix = helix.packages.${prev.system}.helix; + rnix-lsp = rnixLsp.packages.${prev.system}.rnix-lsp; + }) ./pkgs/default.nix ]; };