nki-home/hardware-configuration.nix

@@ -9,22 +9,6 @@
   ...
 }:
 
-let
-  from-encdata = subvol: {
-    device = "/dev/disk/by-uuid/d1db9f65-6add-4714-b9d7-16e16f687396";
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "subvol=${subvol}"
-    ];
-    encrypted = {
-      enable = true;
-      label = "encdata";
-      blkDev = "/dev/disk/by-uuid/6544f506-9a22-479c-8bfc-aee1b9e0deda";
-      keyFile = "/sysroot/var/crypto/key_data";
-    };
-  };
-in
 {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
@@ -61,8 +45,20 @@ in
     fsType = "vfat";
   };
 
-  fileSystems."/mnt/steam" = from-encdata "steam";
-  fileSystems."/nix" = from-encdata "nix";
+  fileSystems."/mnt/steam" = {
+    device = "/dev/disk/by-uuid/d1db9f65-6add-4714-b9d7-16e16f687396";
+    fsType = "btrfs";
+    options = [
+      "compress=zstd"
+      "subvol=steam"
+    ];
+    encrypted = {
+      enable = true;
+      label = "encdata";
+      blkDev = "/dev/disk/by-uuid/6544f506-9a22-479c-8bfc-aee1b9e0deda";
+      keyFile = "/sysroot/var/crypto/key_data";
+    };
+  };
 
   swapDevices = [ { device = "/dev/disk/by-uuid/561f6441-1915-4059-a5e1-76a449b0c9bf"; } ];
 

overlay.nix

@@ -31,9 +31,7 @@ let
   };
 
   overlay-versioning = final: prev: {
-    gotosocial =
-      let
-        local = prev.gotosocial.overrideAttrs (attrs: rec {
+    gotosocial = prev.gotosocial.overrideAttrs (attrs: rec {
       version = "0.18.1";
       ldflags = [
         "-s"
@@ -58,11 +56,6 @@ let
         mv web $out/share/gotosocial/
       '';
     });
-      in
-      if builtins.compareVersions prev.gotosocial.version local.version == -1 then
-        local
-      else
-        prev.gotosocial;
 
     input-remapper = final.unstable.input-remapper;