From 389df0cb5cf77a3591ccdec029e5a23e3b599f34 Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 24 Jan 2025 03:20:56 -0500 Subject: [PATCH] generate and upload sd image --- .../workflows/build-machines-and-homes.yml | 17 ++++-- flake.lock | 61 +++++++++++++++++-- flake.nix | 4 +- hosts/pancake/default.nix | 13 +--- 4 files changed, 73 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml index 768a3c5..89e36da 100644 --- a/.github/workflows/build-machines-and-homes.yml +++ b/.github/workflows/build-machines-and-homes.yml @@ -8,12 +8,12 @@ jobs: strategy: matrix: machine: - - chunk - - ytnix - - titan + # - chunk + # - ytnix + # - titan - pancake os: - - ubuntu-latest + # - ubuntu-latest - ubuntu-24.04-arm runs-on: ${{ matrix.os }} continue-on-error: true @@ -67,7 +67,14 @@ jobs: purge-primary-key: never # always save the cache save-always: true - - run: nix build -L .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel + # - run: nix build -L .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel + # - run: nix run -L github:nix-community/nixos-generators -- --flake .#pancake -f sd-aarch64 --system aarch64-linux + - run: nix build -L .#nixosConfigurations.pancake.config.formats.sd-aarch64 + - name: upload artifacts + uses: actions/upload-artifact@v4 + with: + name: image + path: result/ build-homes: strategy: matrix: diff --git a/flake.lock b/flake.lock index 2acaba0..bba3cfd 100644 --- a/flake.lock +++ b/flake.lock @@ -899,6 +899,40 @@ "type": "github" } }, + "nixlib": { + "locked": { + "lastModified": 1736643958, + "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixos-generators": { + "inputs": { + "nixlib": "nixlib", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1737057290, + "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", + "owner": "nix-community", + "repo": "nixos-generators", + "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-generators", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1737590910, @@ -1076,16 +1110,32 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1737642748, - "narHash": "sha256-VsCzuoavNERLs46aw38nmORT4F5pLOZDDe2bzFo+jsE=", + "lastModified": 1736657626, + "narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2f9e2f85cb14a46410a1399aa9ea7ecf433e422e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1737569578, + "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "864f89f98b0b4e1bbcb762b025fd83da8bc1bae0", + "rev": "47addd76727f42d351590c905d9d1905ca895b82", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable-small", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -1238,8 +1288,9 @@ "lix": "lix", "lix-module": "lix-module", "niri": "niri", + "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-garage": "nixpkgs-garage", "nixpkgs-rpi": "nixpkgs-rpi", "nixvim": "nixvim", diff --git a/flake.nix b/flake.nix index 920750a..920cc27 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "cy's flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -70,6 +70,7 @@ }; nixos-hardware.url = "github:nixos/nixos-hardware"; nixpkgs-rpi.url = "github:nixos/nixpkgs/d4e529a24b66b0341f2b866c5abe3ad8a96be2d7"; + nixos-generators.url = "github:nix-community/nixos-generators"; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR @@ -212,6 +213,7 @@ nixpkgs.pkgs = pkgsFor "aarch64-linux"; } inputs.nixos-hardware.nixosModules.raspberry-pi-3 + inputs.nixos-generators.nixosModules.all-formats ./hosts/pancake ./modules ]; diff --git a/hosts/pancake/default.nix b/hosts/pancake/default.nix index 221b3dc..561d7f0 100644 --- a/hosts/pancake/default.nix +++ b/hosts/pancake/default.nix @@ -10,7 +10,7 @@ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/profiles/qemu-guest.nix") ../common.nix - ./hardware-configuration.nix + # ./hardware-configuration.nix ../zsh.nix ]; @@ -57,11 +57,6 @@ hardware.enableRedistributableFirmware = true; - services.desktopManager.plasma6.enable = true; - services.displayManager = { - enable = true; - autoLogin.user = "yt"; - }; users.users.yt.extraGroups = [ "wheel" ]; @@ -70,10 +65,6 @@ users.users.root.initialHashedPassword = ""; users.users.yt.initialHashedPassword = ""; - boot.loader.generic-extlinux-compatible.mirroredBoots = [ - { path = "/boot/firmware"; } - ]; - # remove this after https://github.com/NixOS/nixpkgs/pull/375165 lands on unstable - boot.kernelPackages = lib.mkForce inputs.nixpkgs-rpi.legacyPackages.aarch64-linux.linuxKernel.packages.linux_rpi3; + # boot.kernelPackages = lib.mkForce inputs.nixpkgs-rpi.legacyPackages.aarch64-linux.linuxKernel.packages.linux_rpi3; }