From 0832b63b89e9aa305f3075c000860ddabefdcf38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 22 May 2025 23:28:55 +0200 Subject: [PATCH] Revert "vanadium: move nixpkgs contribution packages to environment" This reverts commit 419355f51f39c2724d5b7421dbb1fa30c50a8b62. --- nix/configurations/vanadium/home/dev.nix | 7 +++++++ nix/environments/nix.nix | 11 +++++++++++ nix/environments/nixpkgs.nix | 15 --------------- 3 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 nix/environments/nix.nix delete mode 100644 nix/environments/nixpkgs.nix diff --git a/nix/configurations/vanadium/home/dev.nix b/nix/configurations/vanadium/home/dev.nix index 914abd7a..71800101 100644 --- a/nix/configurations/vanadium/home/dev.nix +++ b/nix/configurations/vanadium/home/dev.nix @@ -7,6 +7,13 @@ home.packages = [ # preview markdown pkgs.python3Packages.grip + + # For nix contribution + pkgs.gh + pkgs.nixfmt-rfc-style + pkgs.nix-doc + pkgs.nixpkgs-review + pkgs.shellcheck ]; programs.neovim.extraPackages = [ diff --git a/nix/environments/nix.nix b/nix/environments/nix.nix new file mode 100644 index 00000000..c14a07ed --- /dev/null +++ b/nix/environments/nix.nix @@ -0,0 +1,11 @@ +{ + buildEnv, + # + nixfmt-rfc-style, +}: +buildEnv { + name = "nix"; + paths = [ + nixfmt-rfc-style + ]; +} diff --git a/nix/environments/nixpkgs.nix b/nix/environments/nixpkgs.nix deleted file mode 100644 index bbd93e51..00000000 --- a/nix/environments/nixpkgs.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - buildEnv, - # - pkgs, -}: -buildEnv { - name = "nixpkgs-contribution"; - paths = [ - pkgs.gh - pkgs.nixfmt-rfc-style - pkgs.nix-doc - pkgs.nixpkgs-review - pkgs.shellcheck - ]; -}