From 36542aa869f762a7b21751577835ac4bb63bcdd0 Mon Sep 17 00:00:00 2001
From: Torxed <torxed@archlinux.org>
Date: Sat, 26 Apr 2025 11:23:05 +0200
Subject: [PATCH] Removed the @.snapshots volume in order to support both
 Snapper and Timeshift #3363

---
 archinstall/lib/disk/device_handler.py     | 4 ++--
 archinstall/lib/interactions/disk_conf.py  | 6 ++----
 docs/cli_parameters/config/disk_config.rst | 4 ----
 examples/disk_layouts-sample.json          | 1 -
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/archinstall/lib/disk/device_handler.py b/archinstall/lib/disk/device_handler.py
index bce5776782..5a0dde128d 100644
--- a/archinstall/lib/disk/device_handler.py
+++ b/archinstall/lib/disk/device_handler.py
@@ -225,8 +225,8 @@ def get_btrfs_info(
 			mountpoint = self._TMP_BTRFS_MOUNT
 		else:
 			# when multiple subvolumes are mounted then the lsblk output may look like
-			# "mountpoint": "/mnt/archinstall/.snapshots"
-			# "mountpoints": ["/mnt/archinstall/.snapshots", "/mnt/archinstall/home", ..]
+			# "mountpoint": "/mnt/archinstall/var/log"
+			# "mountpoints": ["/mnt/archinstall/var/log", "/mnt/archinstall/home", ..]
 			# so we'll determine the minimum common path and assume that's the root
 			try:
 				common_path = os.path.commonpath(lsblk_info.mountpoints)
diff --git a/archinstall/lib/interactions/disk_conf.py b/archinstall/lib/interactions/disk_conf.py
index 15c588670c..4d3d9d6854 100644
--- a/archinstall/lib/interactions/disk_conf.py
+++ b/archinstall/lib/interactions/disk_conf.py
@@ -417,8 +417,7 @@ def suggest_single_disk_layout(
 			SubvolumeModification(Path('@'), Path('/')),
 			SubvolumeModification(Path('@home'), Path('/home')),
 			SubvolumeModification(Path('@log'), Path('/var/log')),
-			SubvolumeModification(Path('@pkg'), Path('/var/cache/pacman/pkg')),
-			SubvolumeModification(Path('@.snapshots'), Path('/.snapshots'))
+			SubvolumeModification(Path('@pkg'), Path('/var/cache/pacman/pkg'))
 		]
 		root_partition.btrfs_subvols = subvolumes
 	elif using_home_partition:
@@ -596,8 +595,7 @@ def suggest_lvm_layout(
 			SubvolumeModification(Path('@'), Path('/')),
 			SubvolumeModification(Path('@home'), Path('/home')),
 			SubvolumeModification(Path('@log'), Path('/var/log')),
-			SubvolumeModification(Path('@pkg'), Path('/var/cache/pacman/pkg')),
-			SubvolumeModification(Path('@.snapshots'), Path('/.snapshots')),
+			SubvolumeModification(Path('@pkg'), Path('/var/cache/pacman/pkg'))
 		]
 
 		home_volume = False
diff --git a/docs/cli_parameters/config/disk_config.rst b/docs/cli_parameters/config/disk_config.rst
index fd8e2f9dbb..1f4997774a 100644
--- a/docs/cli_parameters/config/disk_config.rst
+++ b/docs/cli_parameters/config/disk_config.rst
@@ -200,10 +200,6 @@ This example contains both subvolumes and compression.
           {
               "mountpoint": "/var/cache/pacman/pkg",
               "name": "@pkg",
-          },
-          {
-              "mountpoint": "/.snapshots",
-              "name": "@.snapshots",
           }
       ],
       "dev_path": null,
diff --git a/examples/disk_layouts-sample.json b/examples/disk_layouts-sample.json
index ebb47c82a5..6faae48aa4 100644
--- a/examples/disk_layouts-sample.json
+++ b/examples/disk_layouts-sample.json
@@ -16,7 +16,6 @@
             {
                 "btrfs": {
                     "subvolumes": {
-                        "@.snapshots": "/.snapshots",
                         "@home": "/home",
                         "@log": "/var/log",
                         "@pkgs": "/var/cache/pacman/pkg"