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

@ -5,8 +5,10 @@
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
system =
if builtins ? currentSystem
then builtins.currentSystem then builtins.currentSystem
else "x86_64-linux"; else "x86_64-linux";
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
@ -22,12 +24,12 @@
{ {
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 = [ environment.systemPackages = [
pkgs.wget
pkgs.git ]
pkgs.curl ++ installedPackages.mkBasePackages.packages
]++installedPackages.mkBasePackages.packages; ++ installedPackages.mkHaxeDevelopmentPackages.packages;
programs.nix-ld = { programs.nix-ld = {
enable = true; enable = true;
package = pkgs.nix-ld-rs; package = pkgs.nix-ld-rs;

View File

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