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

View File

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