summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/core/packages.nix1
-rw-r--r--profiles/netboot/system.nix13
2 files changed, 3 insertions, 11 deletions
diff --git a/profiles/core/packages.nix b/profiles/core/packages.nix
index 4370616..118827a 100644
--- a/profiles/core/packages.nix
+++ b/profiles/core/packages.nix
@@ -39,6 +39,7 @@ with lib;
coreutils
killall
carapace
+ vis
] ++ (optionals (!machine.isDarwin) [
man-pages
man-pages-posix
diff --git a/profiles/netboot/system.nix b/profiles/netboot/system.nix
index b0e7945..882309d 100644
--- a/profiles/netboot/system.nix
+++ b/profiles/netboot/system.nix
@@ -5,25 +5,16 @@ sys: { pkgs, lib, ... }: let
name = "run-pixiecore";
text = ''
sudo ${pkgs.pixiecore}/bin/pixiecore \
- boot kernel/bzImage initrd/initrd \
- --cmdline "init=init/init loglevel=4" \
+ boot ${build.kernel}/bzImage ${build.netbootRamdisk}/initrd \
+ --cmdline "init=${build.toplevel}/init loglevel=4" \
--debug --dhcp-no-bind \
--port 64172 --status-port 64172 "$@"
'';
};
- build-pixie = pkgs.writeShellApplication {
- name = "build-pixie";
- text = ''
- nix build /nix-config\#nixosConfigurations."$1".config.system.build.kernel --impure -o kernel
- nix build /nix-config\#nixosConfigurations."$1".config.system.build.toplevel --impure -o init
- nix build /nix-config\#nixosConfigurations."$1".config.system.build.netbootRamdisk --impure -o initrd
- '';
- };
in {
networking.firewall.allowedUDPPorts = [ 67 69 4011 ];
networking.firewall.allowedTCPPorts = [ 64172 ];
environment.systemPackages = [
run-pixiecore
- build-pixie
];
}