rename base-packages to installed-packages

This commit is contained in:
Andreas 2024-09-24 02:58:54 +00:00
parent d0ed46d044
commit ff781440d2
2 changed files with 4 additions and 4 deletions

View File

@ -10,7 +10,7 @@
then builtins.currentSystem then builtins.currentSystem
else "x86_64-linux"; else "x86_64-linux";
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
basePackages = (import ./base-packages { inherit pkgs; }); installedPackages = (import ./installed-packages { inherit pkgs; });
in in
{ {
nixosConfigurations = { nixosConfigurations = {
@ -23,11 +23,11 @@
system.stateVersion = "24.05"; system.stateVersion = "24.05";
wsl.enable = true; wsl.enable = true;
nix.settings.experimental-features = ["nix-command" "flakes" ]; nix.settings.experimental-features = ["nix-command" "flakes" ];
environment.systemPackages = basePackages.mkBasePackages.packages [ environment.systemPackages = [
pkgs.wget pkgs.wget
pkgs.git pkgs.git
pkgs.curl pkgs.curl
]; ]++installedPackages.mkBasePackages.packages;
programs.nix-ld = { programs.nix-ld = {
enable = true; enable = true;
package = pkgs.nix-ld-rs; package = pkgs.nix-ld-rs;

View File

@ -1,4 +1,4 @@
{ lib, pkgs }: { pkgs }:
{ {
mkBasePackages = { mkBasePackages = {
inherit pkgs; inherit pkgs;