diff --git a/flake.lock b/flake.lock index 609c2d338..df3483f97 100644 --- a/flake.lock +++ b/flake.lock @@ -17,15 +17,16 @@ }, "flake-utils": { "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "lastModified": 1608663846, + "narHash": "sha256-YOAXeoNLW0IubQ6AZLGuSj5kAD5n4DYXLYReLtyds1A=", "owner": "numtide", "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", + "rev": "a68df93a37cd5137ac22ffeb2d8a03acf253cc24", "type": "github" }, "original": { "owner": "numtide", + "ref": "flatten-tree-system", "repo": "flake-utils", "type": "github" } @@ -51,11 +52,11 @@ }, "master": { "locked": { - "lastModified": 1607981906, - "narHash": "sha256-tFuNBkK0F5km1Lq5ulLgLVm3BvOvI7t4k4Y7xTIo3QE=", + "lastModified": 1610405177, + "narHash": "sha256-Y4GRoQpN5N2YM3qtbzrcJee/dBhJqPSSK+2290H4604=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd95aa337e23a8a48fe82f0f7b1cced8bc03e379", + "rev": "f0a7fce6ee72e574c2406bf1cfd1741c8d2cd07e", "type": "github" }, "original": { diff --git a/hosts/niximg.nix b/hosts/nixISO.nix similarity index 100% rename from hosts/niximg.nix rename to hosts/nixISO.nix diff --git a/hosts/nixSD.nix b/hosts/nixSD.nix new file mode 100644 index 000000000..d2da5e26f --- /dev/null +++ b/hosts/nixSD.nix @@ -0,0 +1,17 @@ +{ lib, pkgs, config, modulesPath, ... }: +{ + imports = [ + # passwd is nixos by default + ../users/nixos + # passwd is empty by default + ../users/root + (modulesPath + "/installer/cd-dvd/sd-image-aarch64-new-kernel.nix") + ]; + + hardware.enableRedistributableFirmware = lib.mkDefault true; + hardware.pulseaudio.enable = lib.mkDefault true; + sound.enable = lib.mkDefault true; + + documentation.enable = false; + networking.wireless.enable = true; +} diff --git a/pkgs/override.nix b/pkgs/override.nix index 154d6a427..60c35c50d 100644 --- a/pkgs/override.nix +++ b/pkgs/override.nix @@ -13,4 +13,5 @@ with pkgs; nixpkgs-fmt manix qutebrowser + ubootRaspberryPi3_64bit ] diff --git a/shell.nix b/shell.nix index 703a628d1..82d6efcaf 100644 --- a/shell.nix +++ b/shell.nix @@ -16,7 +16,7 @@ let flk = pkgs.writeShellScriptBin "flk" '' if [[ -z "$1" ]]; then - echo "Usage: $(basename "$0") [ iso | up | install {host} | {host} [switch|boot|test] ]" + echo "Usage: $(basename "$0") [ iso | sd | up | install {host} | {host} [switch|boot|test] ]" elif [[ "$1" == "up" ]]; then mkdir -p up hostname=$(hostname) @@ -29,6 +29,8 @@ let git add -f hosts/up-$hostname.nix elif [[ "$1" == "iso" ]]; then nix build $DEVSHELL_ROOT#nixosConfigurations.niximg.${build}.isoImage "${"\${@:2}"}" + elif [[ "$1" == "sd" ]]; then + nix build $DEVSHELL_ROOT#.nixSD.${build}.sdImage "${"\${@:2}"}" elif [[ "$1" == "install" ]]; then sudo nixos-install --flake ".#$2" "${"\${@:3}"}" else