wip
This commit is contained in:
@@ -28,12 +28,9 @@
|
||||
config.vacu.acmeCertDependencies;
|
||||
in {
|
||||
console = {
|
||||
font = lib.mkDefault "Lat2-Terminus16";
|
||||
keyMap = lib.mkDefault "us";
|
||||
};
|
||||
environment.systemPackages = (import ./common-packages.nix { inherit pkgs inputs; }) ++ [
|
||||
|
||||
] ++ (if config.services.xserver.enable then [ pkgs.xorg.xev ] else []);
|
||||
environment.systemPackages = (import ./common-packages.nix { inherit pkgs inputs; }) ++ (if config.services.xserver.enable then [ pkgs.xorg.xev ] else []);
|
||||
|
||||
i18n.defaultLocale = lib.mkDefault "en_US.UTF-8";
|
||||
time.timeZone = "America/Los_Angeles";
|
||||
|
@@ -48,6 +48,7 @@
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nix-on-droid, ... }@inputs: {
|
||||
debug.isoDeriv = (import "${inputs.nixpkgs}/nixos/release-small.nix" { nixpkgs = ({ revCount = 0; } // inputs.nixpkgs); });
|
||||
nixosConfigurations.triple-dezert = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [ ./triple-dezert ];
|
||||
@@ -71,6 +72,12 @@
|
||||
modules = [ ./lp0 ];
|
||||
specialArgs = { inherit inputs; };
|
||||
};
|
||||
|
||||
nixosConfigurations.shel-installer = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [ ./installer.nix ];
|
||||
specialArgs = { inherit inputs; };
|
||||
};
|
||||
|
||||
# nixosConfigurations.devver = nixpkgs.lib.nixosSystem {
|
||||
# system = "x86_64-linux";
|
||||
|
@@ -1,7 +1,8 @@
|
||||
{ pkgs, lib, config, inputs, ... }: let
|
||||
qemu-pkg = pkgs.qemu_kvm;
|
||||
rootPath = "/trip/devver-vm/root";
|
||||
installerIsoDeriv = (import "${inputs.nixpkgs}/nixos/release-small.nix" { nixpkgs = ({ revCount = 0; } // inputs.nixpkgs); }).nixos.iso_minimal.x86_64-linux;
|
||||
installer = inputs.self.nixosConfigurations.shel-installer;
|
||||
installerIsoDeriv = installer.config.system.build.isoImage;
|
||||
installerIsoPath = "${installerIsoDeriv}/iso/${installerIsoDeriv.name}";
|
||||
bootInstaller = true;
|
||||
tapdev = "qemu-devver";
|
||||
@@ -38,7 +39,7 @@
|
||||
"-device" "virtio-net-pci,netdev=vm-devver,mac=02:19:07:A2:15:72,romfile=,mq=on,vectors=34"
|
||||
|
||||
] ++ (if bootInstaller then [
|
||||
"-boot" "once=d"
|
||||
# "-boot" "once=d"
|
||||
"-cdrom" "${installerIsoPath}"
|
||||
] else [
|
||||
"-kernel" "${rootPath}/boot/kernel"
|
||||
|
Reference in New Issue
Block a user