fixing flake

sstent · Nov 17, 2023 · a2dabd5 · a2dabd5
1 parent 3f9744f
commit a2dabd5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/blank.yml → .github/workflows/BuildSDImage.yml b/.github/workflows/blank.yml → .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
@@ -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";