summary refs log tree commit diff stats
path: root/hardware-configuration.nix
diff options
context:
space:
mode:
authorene <ene@sils.li>2023-01-21 07:41:32 +0100
committerene <ene@sils.li>2023-01-21 07:41:32 +0100
commitcf63e4141cf072b7b942bff23e023890e767a3b1 (patch)
tree7eeafef988fd8c3f541369526b6711e082085a48 /hardware-configuration.nix
parentMerge branch 'server1' into server1_users (diff)
downloadnixos-server-cf63e4141cf072b7b942bff23e023890e767a3b1.tar.gz
nixos-server-cf63e4141cf072b7b942bff23e023890e767a3b1.zip
Fix: Resolve merge conflicts
Diffstat (limited to 'hardware-configuration.nix')
-rw-r--r--hardware-configuration.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 9fcbe2b..76cdb1e 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -19,13 +19,14 @@
       fsType = "btrfs";
       options = ["subvol=storage" "compress-force=zstd"];
     };
-    "/etc/nixos" = {
-      device = "/srv/nix-config";
-      options = ["bind"];
-    };
     "/boot" = {
       device = "/dev/vda3";
       options = ["subvol=boot" "compress-force=zstd"];
     };
+
+    "/etc/nixos" = {
+      device = "/srv/nix-config";
+      options = ["bind"];
+    };
   };
 }