From 970c8596e86b8bb3ebff5e76e152fa5acdd65f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Fri, 5 Aug 2022 08:19:33 +0200
Subject: Small rework of packages and and devices build

---
 nixos/machine/errol.nix   | 29 ++++-------------------------
 nixos/modules/generic.nix | 10 ++++++++++
 2 files changed, 14 insertions(+), 25 deletions(-)

(limited to 'nixos')

diff --git a/nixos/machine/errol.nix b/nixos/machine/errol.nix
index 5dd87a7..06e2446 100644
--- a/nixos/machine/errol.nix
+++ b/nixos/machine/errol.nix
@@ -20,8 +20,9 @@ with lib;
     hardware.cpu.amd.updateMicrocode = true;
 
     cynerd.autounlock = {
-      "encroot" = "/dev/disk/by-uuid/c07e929a-6eac-4f99-accf-f7cb3431290c";
-      "enchdd" = "/dev/disk/by-uuid/7fee3cda-efa0-47cd-8832-fdead9a7e6db";
+      "encroot" = "/dev/disk/by-uuid/8095988e-239b-4417-9df6-94a40e4133ed";
+      "enchdd1" = "/dev/disk/by-uuid/87f16080-5ff6-43dd-89f3-307455a46fbe";
+      "enchdd2" = "/dev/disk/by-uuid/be4a33fa-8bc6-431d-a3ac-787668f223ed";
     };
     fileSystems = {
       "/" = {
@@ -40,7 +41,7 @@ with lib;
       };
 
       "/home2" = {
-        device = "/dev/mapper/enchdd";
+        device = "/dev/mapper/enchdd1";
         fsType = "btrfs";
         options = ["compress=lzo" "subvol=@home"];
       };
@@ -59,28 +60,6 @@ with lib;
       configDir = "/home/cynerd/.config/syncthing";
     };
 
-    #environment.systemPackages = [ pkgs.laminar ];
-    #users.groups.build.gid = 220;
-    #users.users.build = {
-    #  group = "build";
-    #  uid = 220;
-    #  subUidRanges = [{ count = 65534; startUid = 20000; }];
-    #  subGidRanges = [{ count = 65534; startGid = 20000; }];
-    #  createHome = true;
-    #  home = "/var/build";
-    #};
-    #systemd.services.laminar = {
-    #  description = "Laminar build server";
-    #  after = [ "network.target" ];
-    #  wantedBy = [ "multi-user.target" ];
-    #  serviceConfig = {
-    #    User = "build";
-    #    ExecStart = "${pkgs.laminar}/bin/laminar";
-    #    EnvironmentFile = "/etc/laminar.conf";
-    #    Restart = "always";
-    #  };
-    #};
-
   };
 
 }
diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index 08b3bfa..2b3c3fd 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -11,6 +11,16 @@ with lib;
       extraOptions = "experimental-features = nix-command flakes";
       settings = {
         auto-optimise-store = true;
+        substituters = [
+          "https://cache.nixos.org"
+          "https://thefloweringash-armv7.cachix.org"
+          "https://arm.cachix.org"
+        ];
+        trusted-public-keys = [
+          "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+          "thefloweringash-armv7.cachix.org-1:v+5yzBD2odFKeXbmC+OPWVqx4WVoIVO6UXgnSAWFtso="
+          "arm.cachix.org-1:K3XjAeWPgWkFtSS9ge5LJSLw3xgnNqyOaG7MDecmTQ8="
+        ];
       };
       registry = {
         personal.to = {
-- 
cgit v1.2.3