From a2dabd5d8552b329c030cb15fe6bf255825c0f3f Mon Sep 17 00:00:00 2001 From: sstent Date: Fri, 17 Nov 2023 15:43:46 +0000 Subject: [PATCH] fixing flake --- .github/workflows/{blank.yml => BuildSDImage.yml} | 7 +++++-- flake.nix | 12 +++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) rename .github/workflows/{blank.yml => BuildSDImage.yml} (94%) diff --git a/.github/workflows/blank.yml b/.github/workflows/BuildSDImage.yml similarity index 94% rename from .github/workflows/blank.yml rename to .github/workflows/BuildSDImage.yml index 1f97532..28fbba3 100644 --- a/.github/workflows/blank.yml +++ b/.github/workflows/BuildSDImage.yml @@ -1,8 +1,11 @@ name: Build OS Image on: workflow_dispatch: - #push: - + push: + branches: [ master ] + paths: + - '*' + - '.github/workflows/BuildSDImage.yml' jobs: build-default-image: name: Build OS image diff --git a/flake.nix b/flake.nix index 7075048..032f383 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,8 @@ { imports = [ #./sd-image.nix - ./default.nix + # ./default.nix + ./kboot-conf "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix" ]; @@ -49,6 +50,15 @@ ${config.boot.loader.kboot-conf.populateCmd} -c ${config.system.build.toplevel} -d ./files/kboot.conf ''; }; + + boot.loader.grub.enable = false; + boot.loader.kboot-conf.enable = true; + boot.kernelParams = [ "console=ttyAML0,115200n8" ]; + boot.consoleLogLevel = 7; + # need latest kernel for the n2+ device tree blob + boot.kernelPackages = pkgs.linuxPackages_latest; + + services.openssh = { enable = true; settings.PermitRootLogin = "yes";