From 27ff3ec633f1e30e3b5f9dc720d37ee9215634fc Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Wed, 7 Jun 2023 23:31:06 -0500
Subject: [PATCH] Inherit patched extlinux conf

---
 flake.lock                 | 20 ++++++++++----------
 modules/shared/default.nix |  7 -------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6d14764..14674c0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -90,11 +90,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1685865905,
-        "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=",
+        "lastModified": 1686059680,
+        "narHash": "sha256-sp0WlCIeVczzB0G8f8iyRg3IYW7KG31mI66z7HIZwrI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7",
+        "rev": "a558f7ac29f50c4b937fb5c102f587678ae1c9fb",
         "type": "github"
       },
       "original": {
@@ -120,11 +120,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1686070124,
-        "narHash": "sha256-ZDJKYcIs6KhKk/cN1cbZ/Eeglj3nyEKjdgPeX6eR/P8=",
+        "lastModified": 1686197871,
+        "narHash": "sha256-jAYEQJadd5b/HBEl0AU6jxje5cVm1+cyJQvT0DP7GnE=",
         "owner": "asonix",
         "repo": "nixos-rockchip",
-        "rev": "4207133777a4ba7671810ac666c180e93def2943",
+        "rev": "65ca5db6aa092ca8b6b83974691dcad417420fb6",
         "type": "github"
       },
       "original": {
@@ -152,11 +152,11 @@
         "rockchip": "rockchip"
       },
       "locked": {
-        "lastModified": 1686179112,
-        "narHash": "sha256-2wkmSD9F0mIZ8PoVjqgKc9PNRyf9/UxVQftooktddH0=",
+        "lastModified": 1686198160,
+        "narHash": "sha256-pgTKAla+yDPB5iVQeEZrmf7GGJuYh4Wu1UjHjhGMRJQ=",
         "ref": "asonix/nabam-sd-image",
-        "rev": "6892f699e6041cba868ad79fa732d71bb2cab5b9",
-        "revCount": 42,
+        "rev": "a14839f11f9e29bf38125baff3d074e73d70de71",
+        "revCount": 43,
         "type": "git",
         "url": "https://git.asonix.dog/asonix/sd-images"
       },
diff --git a/modules/shared/default.nix b/modules/shared/default.nix
index e1024e2..91a30b1 100644
--- a/modules/shared/default.nix
+++ b/modules/shared/default.nix
@@ -1,13 +1,6 @@
-{ pkgs, ... }:
-
 {
   services.openssh.settings.PasswordAuthentication = false;
 
-  # Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
-  boot.loader.grub.enable = false;
-  # Enables the generation of /boot/extlinux/extlinux.conf
-  boot.loader.generic-extlinux-compatible.enable = true;
-
   sops = {
     age.keyFile = "/home/asonix/.config/sops/age/keys.txt";
     age.generateKey = true;