move packages and reformat

This commit is contained in:
Andreas 2024-09-24 03:15:51 +00:00
parent a58cf364f7
commit ebcd46ace4
2 changed files with 43 additions and 33 deletions

View File

@ -1,41 +1,43 @@
{
description = "Nixos config flake test";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
};
outputs = { self, nixpkgs, nixos-wsl, nix, ...}@inputs:
let system = if builtins ? currentSystem
then builtins.currentSystem
else "x86_64-linux";
pkgs = import nixpkgs { inherit system; };
installedPackages = (import ./installed-packages { inherit pkgs; });
in
{
nixosConfigurations = {
nixos = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
nixos-wsl.nixosModules.default
./configuration.nix
{
system.stateVersion = "24.05";
wsl.enable = true;
nix.settings.experimental-features = ["nix-command" "flakes" ];
environment.systemPackages = [
pkgs.wget
pkgs.git
pkgs.curl
]++installedPackages.mkBasePackages.packages;
programs.nix-ld = {
enable = true;
package = pkgs.nix-ld-rs;
};
}
];
specialArgs = { inherit inputs; };
outputs = { self, nixpkgs, nixos-wsl, nix, ... }@inputs:
let
system =
if builtins ? currentSystem
then builtins.currentSystem
else "x86_64-linux";
pkgs = import nixpkgs { inherit system; };
installedPackages = (import ./installed-packages { inherit pkgs; });
in
{
nixosConfigurations = {
nixos = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
nixos-wsl.nixosModules.default
./configuration.nix
{
system.stateVersion = "24.05";
wsl.enable = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ];
environment.systemPackages = [
]
++ installedPackages.mkBasePackages.packages
++ installedPackages.mkHaxeDevelopmentPackages.packages;
programs.nix-ld = {
enable = true;
package = pkgs.nix-ld-rs;
};
}
];
specialArgs = { inherit inputs; };
};
};
};
};
}

View File

@ -3,7 +3,15 @@
mkBasePackages = {
packages = [
pkgs.vim
pkgs.wget
pkgs.git
pkgs.curl
pkgs.nixpkgs-fmt
];
};
mkHaxeDevelopmentPackages = {
packages = [
pkgs.haxe
];
};
}
}