From 1139bd65249009ca8335b7ac98e810266fa0db3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Sun, 29 Oct 2023 17:20:35 +0100 Subject: [PATCH] nix: Various tests and cleaning --- config/nix/build-pindakaas-image.sh | 3 +++ config/nix/os/common.nix | 1 - config/nix/pindakaas.nix | 9 +++++---- config/nix/testvim.nix | 6 ------ 4 files changed, 8 insertions(+), 11 deletions(-) create mode 100755 config/nix/build-pindakaas-image.sh delete mode 100644 config/nix/testvim.nix diff --git a/config/nix/build-pindakaas-image.sh b/config/nix/build-pindakaas-image.sh new file mode 100755 index 0000000..4485564 --- /dev/null +++ b/config/nix/build-pindakaas-image.sh @@ -0,0 +1,3 @@ +#/usr/bin/env sh +export NIXPKGS_ALLOW_UNFREE=1 +nix-build '' -A config.system.build.sdImage -I nixos-config=./pindakaas.nix diff --git a/config/nix/os/common.nix b/config/nix/os/common.nix index eb435b0..f6e64f6 100644 --- a/config/nix/os/common.nix +++ b/config/nix/os/common.nix @@ -1,6 +1,5 @@ { pkgs, lib, ... }: { - boot.loader.grub.enable = true; boot.loader.efi.canTouchEfiVariables = true; time.timeZone = "Europe/Amsterdam"; diff --git a/config/nix/pindakaas.nix b/config/nix/pindakaas.nix index 38584a0..928ffd1 100644 --- a/config/nix/pindakaas.nix +++ b/config/nix/pindakaas.nix @@ -1,9 +1,10 @@ { ... }: { imports = [ - - ./os/loader.nix + # + + # ./os/loader.nix # Don't uncomment this before having put extra behind an option! ]; - - networking.hostName = "pindakaas.geoffrey.frogeye.fr"; + nixpkgs.crossSystem.system = "aarch64-linux"; + # networking.hostName = "pindakaas.geoffrey.frogeye.fr"; } diff --git a/config/nix/testvim.nix b/config/nix/testvim.nix deleted file mode 100644 index a214d0a..0000000 --- a/config/nix/testvim.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, pkgs, ... }: -{ - imports = [ - ./curacao.nix - ]; -}