From 55747530b9f1487c761c0e89248fdfdb634274bc Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Wed, 18 Sep 2024 14:30:34 -0500 Subject: [PATCH] use development version of nixd for pipe support --- flake.lock | 103 ++++++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 3 ++ modules/nix.nix | 4 +- 3 files changed, 106 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index fe7e9c1..762cdd5 100644 --- a/flake.lock +++ b/flake.lock @@ -117,6 +117,24 @@ } }, "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", @@ -138,6 +156,21 @@ "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" @@ -485,7 +518,7 @@ "lib-aggregate": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1726600542, @@ -599,10 +632,10 @@ }, "nix-eval-jobs": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nix-github-actions": "nix-github-actions", "nixpkgs": "nixpkgs_5", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1726529941, @@ -660,6 +693,30 @@ "type": "github" } }, + "nixd": { + "inputs": { + "flake-parts": "flake-parts", + "flake-root": "flake-root", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1726640797, + "narHash": "sha256-tuqkFa7ZxcGwU8gTbKO61oGMdTmG9CiaI+NiaOV7SCI=", + "owner": "nix-community", + "repo": "nixd", + "rev": "e2f0d908d6f2ee7bf72c620ed3c78817143b50ae", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixd", + "rev": "e2f0d908d6f2ee7bf72c620ed3c78817143b50ae", + "type": "github" + } + }, "nixgl": { "inputs": { "flake-utils": [ @@ -722,6 +779,24 @@ } }, "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": 1726362065, "narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=", @@ -923,6 +998,7 @@ "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", @@ -1082,6 +1158,27 @@ } }, "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 82e973c..75373b5 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,8 @@ 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/e2f0d908d6f2ee7bf72c620ed3c78817143b50ae"; lix = { url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; @@ -33,6 +35,7 @@ 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 7c49bd5..b08f52f 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -4,6 +4,7 @@ lib, enabled, self, + flake, ... }: let @@ -42,11 +43,12 @@ 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;