From 4e2cad102ab54482bf259e5650094aca01187b85 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Fri, 10 Mar 2023 22:26:21 -0600
Subject: [PATCH] Update deps, remove mkForce, remove / fs

---
 flake.lock                     | 32 ++++++++++++++++----------------
 flake.nix                      | 16 ++++++++++++----
 modules/shared/default.nix     |  5 -----
 modules/subvolumes/default.nix |  2 +-
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index d152c78..8c4faba 100644
--- a/flake.lock
+++ b/flake.lock
@@ -55,11 +55,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1677676435,
-        "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
+        "lastModified": 1678380223,
+        "narHash": "sha256-HUxnK38iqrX84QdQxbFcosRKV3/koj1Zzp5b5aP4lIo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
+        "rev": "1e2590679d0ed2cee2736e8b80373178d085d263",
         "type": "github"
       },
       "original": {
@@ -71,11 +71,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1677560965,
-        "narHash": "sha256-Tqwt5alTtMnbYUPKCYRYZqlfbjprLgDWqjMhXpFMQ6k=",
+        "lastModified": 1677948530,
+        "narHash": "sha256-BkQjq8AGHD55RJe4PUnrWRZZ8jS64p/k0bGDck5wKwY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "40968a3aa489191cf4b7ba85cf2a54d8a75c8daa",
+        "rev": "d51554151a91cd4543a7620843cc378e3cbc767e",
         "type": "github"
       },
       "original": {
@@ -98,11 +98,11 @@
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1677873285,
-        "narHash": "sha256-MwQn3S0q14ctX0PPUhVHOzF++MifLh/SHmb1+A32lYg=",
+        "lastModified": 1677977689,
+        "narHash": "sha256-2eQCJQvnEvI/gpfiBe/rUf2FziPeteiyyPzUNU8GNww=",
         "owner": "nabam",
         "repo": "nixos-rockchip",
-        "rev": "e095ced30aad1a5c45eaf07abda76fc8c31c16a4",
+        "rev": "38db05d8724b9e694248ca049f1f7559e4926d69",
         "type": "github"
       },
       "original": {
@@ -128,11 +128,11 @@
         "rockchip": "rockchip"
       },
       "locked": {
-        "lastModified": 1677971590,
-        "narHash": "sha256-D6RwLzhUMYsVVc6wV/703mdEZC1PPTFc5yKaC22b3WM=",
+        "lastModified": 1678508189,
+        "narHash": "sha256-AMm92WWStP2M7at46Je9ULCQQCQLpr2E756+wfy2Vu4=",
         "ref": "asonix/nabam-sd-image",
-        "rev": "3041519a837a11c05675fc480ffcf403eaca495f",
-        "revCount": 17,
+        "rev": "cf073db55bb48b977644991bc649ffb5671eabca",
+        "revCount": 20,
         "type": "git",
         "url": "https://git.asonix.dog/asonix/sd-images"
       },
@@ -150,11 +150,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1677833841,
-        "narHash": "sha256-yHZFGe7dhBE43FFWKiWc29NuveH+nfyTT6oKyFDEMys=",
+        "lastModified": 1678440572,
+        "narHash": "sha256-zfL09Yy6H7QQwfacCPL0gOfWpVkTbE5jXJh5oZmGf8g=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "128e9b29ddd88ceb634a28f7dbbfee7b895f005f",
+        "rev": "1568702de0d2488c1e77011a9044de7fadec80c4",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index c74d4ff..1fe1838 100644
--- a/flake.nix
+++ b/flake.nix
@@ -242,7 +242,7 @@
                       };
                   in
                   if unlockMounts && mountVolumes then
-                    lib.mkForce fileSystemConfig
+                    fileSystemConfig
                   else
                     { };
 
@@ -292,7 +292,7 @@
               inherit device subvolumes;
             })
             ({ lib, ... }: {
-              fileSystems = lib.mkForce {
+              fileSystems = {
                 "${mountDir}" = {
                   inherit device;
                   fsType = "btrfs";
@@ -420,7 +420,7 @@
                     };
                   };
                   in
-                  if unlockMounts && mountVolumes then lib.mkForce fileSystemConfig else { };
+                  if unlockMounts && mountVolumes then fileSystemConfig else { };
 
                 networking.firewall.enable = false;
               })
@@ -468,7 +468,7 @@
                   '';
                 };
 
-                fileSystems = lib.mkForce {
+                fileSystems = {
                   "${mountDir}" = {
                     inherit device;
                     fsType = "btrfs";
@@ -605,6 +605,13 @@
           macAddress = "02:6b:c5:f0:d7:6d";
         };
 
+        k3s-rock7 = makeRock64K3sConfig {
+          hostname = "k3s-rock7";
+          selfIp = "192.168.20.116";
+          serverIp = "192.168.20.120";
+          macAddress = "02:5b:c4:cf:25:c2";
+        };
+
         k3s-quartza1 = makeQuartz64AK3sConfig {
           hostname = "k3s-quartza1";
           selfIp = "192.168.20.160";
@@ -638,6 +645,7 @@
             { name = "k3s-rock4"; ip = "192.168.20.113"; }
             { name = "k3s-rock5"; ip = "192.168.20.114"; }
             { name = "k3s-rock6"; ip = "192.168.20.115"; }
+            { name = "k3s-rock7"; ip = "192.168.20.116"; }
             { name = "k3s-quartza1"; ip = "192.168.20.160"; }
             { name = "k3s-rockpro1"; ip = "192.168.20.180"; }
           ];
diff --git a/modules/shared/default.nix b/modules/shared/default.nix
index 7803dee..488902a 100644
--- a/modules/shared/default.nix
+++ b/modules/shared/default.nix
@@ -8,11 +8,6 @@
   # Enables the generation of /boot/extlinux/extlinux.conf
   boot.loader.generic-extlinux-compatible.enable = true;
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
-    fsType = "ext4";
-  };
-
   environment.systemPackages = with pkgs; [
     bottom
     cryptsetup
diff --git a/modules/subvolumes/default.nix b/modules/subvolumes/default.nix
index 1b3d889..9c82fe2 100644
--- a/modules/subvolumes/default.nix
+++ b/modules/subvolumes/default.nix
@@ -3,7 +3,7 @@
 { lib, ... }:
 
 {
-  fileSystems = lib.mkForce (builtins.foldl'
+  fileSystems = (builtins.foldl'
     (acc: subvol:
       let
         length = builtins.stringLength subvol;