From ff781440d2cc6fff0a187de2a9101a86e6b5c024 Mon Sep 17 00:00:00 2001 From: Andreas Date: Tue, 24 Sep 2024 02:58:54 +0000 Subject: [PATCH] rename base-packages to installed-packages --- flake.nix | 6 +++--- {base-packages => installed-packages}/default.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename {base-packages => installed-packages}/default.nix (87%) diff --git a/flake.nix b/flake.nix index 88d0e8b..60fa8b5 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ then builtins.currentSystem else "x86_64-linux"; pkgs = import nixpkgs { inherit system; }; - basePackages = (import ./base-packages { inherit pkgs; }); + installedPackages = (import ./installed-packages { inherit pkgs; }); in { nixosConfigurations = { @@ -23,11 +23,11 @@ system.stateVersion = "24.05"; wsl.enable = true; nix.settings.experimental-features = ["nix-command" "flakes" ]; - environment.systemPackages = basePackages.mkBasePackages.packages [ + environment.systemPackages = [ pkgs.wget pkgs.git pkgs.curl - ]; + ]++installedPackages.mkBasePackages.packages; programs.nix-ld = { enable = true; package = pkgs.nix-ld-rs; diff --git a/base-packages/default.nix b/installed-packages/default.nix similarity index 87% rename from base-packages/default.nix rename to installed-packages/default.nix index cc784a9..5a7ed33 100644 --- a/base-packages/default.nix +++ b/installed-packages/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs }: +{ pkgs }: { mkBasePackages = { inherit pkgs;