diff --git a/flake.lock b/flake.lock index e3cf68b..af6e987 100644 --- a/flake.lock +++ b/flake.lock @@ -133,24 +133,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1714606777, - "narHash": "sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "4d34ce6412bc450b1d4208c953dc97c7fc764f1a", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixpkgs-wayland", @@ -172,21 +154,6 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -556,7 +523,7 @@ "lib-aggregate": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1728216729, @@ -670,10 +637,10 @@ }, "nix-eval-jobs": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nix-github-actions": "nix-github-actions", "nixpkgs": "nixpkgs_5", - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" }, "locked": { "lastModified": 1728593025, @@ -731,30 +698,6 @@ "type": "github" } }, - "nixd": { - "inputs": { - "flake-parts": "flake-parts", - "flake-root": "flake-root", - "nixpkgs": [ - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1727483986, - "narHash": "sha256-8F97zAu+icDC9ZYS7m+Y58oZQ7R3gVuXMvzAfgkVmJo=", - "owner": "nix-community", - "repo": "nixd", - "rev": "05ff3db3d1da26eafd5f58c7104e4f9ff6630894", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "2.4.0", - "repo": "nixd", - "type": "github" - } - }, "nixgl": { "inputs": { "flake-utils": [ @@ -817,24 +760,6 @@ } }, "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_2": { "locked": { "lastModified": 1728176478, "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", @@ -1076,7 +1001,6 @@ "lix-module": "lix-module", "nim2nix": "nim2nix", "nix-index-database": "nix-index-database", - "nixd": "nixd", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_4", "nixpkgs-wayland": "nixpkgs-wayland", @@ -1232,27 +1156,6 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixd", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722330636, - "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs-wayland", diff --git a/flake.nix b/flake.nix index 4f61da4..82e973c 100644 --- a/flake.nix +++ b/flake.nix @@ -9,8 +9,6 @@ nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixos-wsl.url = "github:nix-community/NixOS-WSL"; nix-index-database.url = "github:nix-community/nix-index-database"; - # pipe support added - nixd.url = "github:nix-community/nixd/2.4.0"; lix = { url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; @@ -35,7 +33,6 @@ hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git"; utils.url = "git+https://git.dayl.in/daylin/utils.git"; - nixd.inputs.nixpkgs.follows = "nixpkgs"; nim2nix.inputs.nixpkgs.follows = "nixpkgs"; hyprman.inputs.nixpkgs.follows = "nixpkgs"; f1multiviewer.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/nix.nix b/modules/nix.nix index b08f52f..9c419cc 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -43,12 +43,11 @@ in # environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath; environment.systemPackages = [ - # pkgs.nixd + pkgs.nixd pkgs.nixfmt-rfc-style pkgs.nix-output-monitor self.packages.${pkgs.system}.default - (flake.pkg "nixd") ]; programs.nix-index-database.comma = enabled;