From 3b3e0acf77f1b22bceb6cf10eb35c33e09787047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Tue, 8 Nov 2022 20:49:31 +0100
Subject: nixos: some tweaks and add cachix

---
 flake.lock                | 30 +++++++++++++++---------------
 flake.nix                 | 22 +++++++++++++++-------
 nixos/modules/develop.nix |  1 +
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index 86881b8..4201097 100644
--- a/flake.lock
+++ b/flake.lock
@@ -79,11 +79,11 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1667399723,
-        "narHash": "sha256-TURO4Qc7n0dYP4BSNp4qzSbgInpD9l6MLbirxlG/WKs=",
+        "lastModified": 1667896658,
+        "narHash": "sha256-M075F9+5H9gOLKEmuhLoYF6hl7RItjbnf1MQA35ft1M=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "dd1970c233a82328445b69e903574e14115ee933",
+        "rev": "37358d0bcfd8fa38b7f652c837b8e9204a3c43f9",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1667283320,
-        "narHash": "sha256-qHvB/6XBKVjjJJCUM+z6/t9HzUC7J55wdY3KJ/ZWSHo=",
+        "lastModified": 1667768008,
+        "narHash": "sha256-PGbX0s2hhXGnZDFVE6UIhPSOf5YegpWs5dUXpT/14F0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "18934557eeba8fa2e575b0fd4ab95186e2e3bde3",
+        "rev": "f6483e0def85efb9c1e884efbaff45a5e7aabb34",
         "type": "github"
       },
       "original": {
@@ -139,11 +139,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1667410462,
-        "narHash": "sha256-GWZh1/ENadYdyhz07ppJzUuF9Xf3nDhSJ3psZKJ6/+U=",
+        "lastModified": 1667909632,
+        "narHash": "sha256-p9ZTU29fRA0KNQVGIFTA06IcVeoCqYNRvegRdxGZd8k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9d28889ac87433e34a8085c08eb2909369a971ec",
+        "rev": "bc5ad970780580ec272b3a6bc5f9bddf4e250d3c",
         "type": "github"
       },
       "original": {
@@ -204,11 +204,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1667320037,
-        "narHash": "sha256-qHZZFLEsW3m7yKw8MsRCLwoni+faOffvNHDHXKGb6pg=",
+        "lastModified": 1667478456,
+        "narHash": "sha256-ZmOBIfOdnUG54/HsoU+xShr1qoYS/e6boIvvfjBcTok=",
         "owner": "cynerd",
         "repo": "nixturris",
-        "rev": "5d28f71750824b66212e9ec165f557318b79bcfb",
+        "rev": "a438d5c05d60a92e09cb9a817c418c1c4b0ae466",
         "type": "github"
       },
       "original": {
@@ -305,11 +305,11 @@
     },
     "vpsadminos": {
       "locked": {
-        "lastModified": 1667437011,
-        "narHash": "sha256-CbAQlthHSLKlNG59E+BujOrFb10KyaaUSSbB8/5WEFo=",
+        "lastModified": 1667758946,
+        "narHash": "sha256-YayYiJC7pBqxkMhPqwJwSIxyQ7IZnUAIgWFksaWPlGg=",
         "owner": "vpsfreecz",
         "repo": "vpsadminos",
-        "rev": "51fd780fb5e868defe45a0294b65e096d9804954",
+        "rev": "5a1c32f21d7122900526638691f898c980bf4631",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d768e3b..ac2c87f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,7 +65,10 @@
             nixos-hardware.nixosModules.raspberry-pi-2
             nixturris.nixosModules.turris-crossbuild
             nixturris.nixosModules.armv7l-overlay
-            { boot.loader.systemd-boot.enable = false; }
+            ({pkgs, ...}: {
+              boot.loader.systemd-boot.enable = false;
+              boot.kernelPackages = pkgs.linuxPackages_latest;
+            })
             { nixpkgs.overlays = [ (final: super: {
                 makeModulesClosure = x:
                   super.makeModulesClosure (x // { allowMissing = true; });
@@ -76,12 +79,13 @@
           system = "aarch64-linux";
           extra_modules = [
             nixturris.nixosModules.turris-crossbuild
-            ({pkgs, ...}: {
-              boot.loader.systemd-boot.enable = false;
+            {
               boot.loader.grub.enable = false;
-              boot.loader.generic-extlinux-compatible.enable = true;
-              #boot.kernelPackages = pkgs.linuxKernel.packages.linux_rpi3;
-            })
+              boot.loader.generationsDir.enable = false;
+              boot.loader.raspberryPi = {
+                enable = true; version = 3;
+              };
+            }
           ];
         };
         beagleboneSystem = genericSystem {
@@ -89,7 +93,11 @@
           extra_modules = [
             nixturris.nixosModules.turris-crossbuild
             nixturris.nixosModules.armv7l-overlay
-            # TODO
+            {
+              boot.loader.grub.enable = false;
+              boot.loader.systemd-boot.enable = false;
+              boot.loader.generic-extlinux-compatible.enable = true;
+            }
           ];
         };
 
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index ea73626..62e6bd3 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -31,6 +31,7 @@ in {
       nix-prefetch-git nix-prefetch-github nix-prefetch-scripts
       nix-universal-prefetch
       rnix-lsp
+      cachix
 
       # Shell
       dash # Posix shell
-- 
cgit v1.2.3