From 582e5d9959733b2849e3750a41b6aa2547e949e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 5 Oct 2023 22:26:54 +0200
Subject: Cleanup a bit

---
 nixos/configurations.nix | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'nixos/configurations.nix')

diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index a4c6895..c058d16 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -13,11 +13,11 @@ with nixpkgs.lib; let
         networking.hostName = hostname;
         nixpkgs.overlays = [
           self.overlays.default
+          sterm.overlay
           agenix.overlays.default
-          nixd.overlays.default
           shvspy.overlays.default
           flatline.overlays.default
-          sterm.overlay
+          shvcli.overlays.default
         ];
         system.configurationRevision = self.rev or "dirty";
       }
@@ -64,11 +64,15 @@ with nixpkgs.lib; let
     system = "aarch64-linux";
     extra_modules = [
       ({pkgs, ...}: {
-        boot.kernelPackages = pkgs.linuxPackages_rpi3;
-        boot.initrd.includeDefaultModules = false;
-        boot.loader.grub.enable = false;
-        boot.loader.systemd-boot.enable = false;
-        boot.loader.generic-extlinux-compatible.enable = true;
+        boot = {
+          kernelPackages = pkgs.linuxPackages_rpi3;
+          initrd.includeDefaultModules = false;
+          loader = {
+            grub.enable = false;
+            systemd-boot.enable = false;
+            generic-extlinux-compatible.enable = true;
+          };
+        };
       })
     ];
   };
@@ -76,9 +80,11 @@ with nixpkgs.lib; let
     system = "armv7l-linux";
     extra_modules = [
       {
-        boot.loader.grub.enable = false;
-        boot.loader.systemd-boot.enable = false;
-        boot.loader.generic-extlinux-compatible.enable = true;
+        boot.loader = {
+          grub.enable = false;
+          systemd-boot.enable = false;
+          generic-extlinux-compatible.enable = true;
+        };
       }
     ];
   };
-- 
cgit v1.2.3