Remove lvm under btrfs (#24)

Reviewed-on: https://codeberg.org/leana8959/.files/pulls/24
Co-authored-by: Léana 江 <leana.jiang+git@icloud.com>
Co-committed-by: Léana 江 <leana.jiang+git@icloud.com>

nix/configurations/vanadium/nixos/battery.nix

@@ -1,11 +1,7 @@
 {
-  systemd.sleep.extraConfig = ''
-    HibernateDelaySec=1d
-  '';
-
   services.logind = {
-    powerKey = "hibernate";
-    lidSwitch = "suspend-then-hibernate";
+    # Note: vanadium's btrfs disk layout has been changed and the swap has been reduced. It will not work with hibernate anymore.
+    lidSwitch = "suspend";
     lidSwitchDocked = "ignore";
   };
 }

nix/disko/vanadium/btrfs.nix

@@ -8,7 +8,7 @@
           type = "gpt";
           partitions = {
             ESP = {
-              size = "500M";
+              size = "512M";
               type = "EF00";
               content = {
                 type = "filesystem";
@@ -27,67 +27,37 @@
                 extraOpenArgs = [ ];
                 settings.allowDiscards = true;
                 content = {
-                  type = "lvm_pv";
-                  vg = "pool";
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-
-    # Use LVM to create a partition for swap
-    lvm_vg = {
-      pool = {
-        type = "lvm_vg";
-        lvs = {
-          # Set swap device as resume device
-          swap = {
-            size = "48G"; # > 32G for hibernation
-            content = {
-              type = "swap";
-              discardPolicy = "both";
-              resumeDevice = true;
-            };
-          };
-
-          # Use btrfs over ext4 for:
-          # - compression
-          #   nix store can be shrinked using this feature
-          # - more transparent partitions (subvolumes)
-          #   no more "I need more space here and not there"
-          btrfs = {
-            size = "100%";
-            content = {
-              type = "btrfs";
-
-              mountpoint = "/btrfs-root";
-
-              # # DANGER:
-              # # Override existing partition at partition creation
-              # extraArgs = ["-f"];
-
-              subvolumes = {
-                "/root" = {
-                  mountOptions = [ "noatime" ];
-                  mountpoint = "/";
-                };
-
-                "/home" = {
-                  mountOptions = [
-                    "compress=zstd"
-                    "noatime"
-                  ];
-                  mountpoint = "/home";
-                };
-
-                "/nix" = {
-                  mountOptions = [
-                    "compress=zstd"
-                    "noatime"
-                  ];
-                  mountpoint = "/nix";
+                  type = "btrfs";
+                  # # DANGER:
+                  # # Override existing partition at partition creation
+                  # extraArgs = ["-f"];
+                  subvolumes = {
+                    "/root" = {
+                      mountOptions = [
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                      mountpoint = "/";
+                    };
+                    "/home" = {
+                      mountOptions = [
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                      mountpoint = "/home";
+                    };
+                    "/nix" = {
+                      mountOptions = [
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                      mountpoint = "/nix";
+                    };
+                    "/swap" = {
+                      mountpoint = "/.swapvol";
+                      swap.swapfile.size = "1G";
+                    };
+                  };
                 };
               };
             };

nix/homeModules/common/btop/btop.conf

@@ -145,9 +145,10 @@ background_update = True
 #* Custom cpu model name, empty string to disable.
 custom_cpu_name = ""
 
+# TODO: maybe move this to vanadium because it's host based
 #* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ".
 #* Begin line with "exclude=" to change to exclude filter, otherwise defaults to "most include" filter. Example: disks_filter="exclude=/boot /home/user".
-disks_filter = "exclude=/btrfs-root /nix /home /boot"
+disks_filter = "exclude=/nix /home /boot /.swapvol"
 
 #* Show graphs instead of meters for memory values.
 mem_graphs = True

nix/identities.nix

@@ -1,6 +1,6 @@
 [
   "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGPq2o9pbmLRGrOpAP76eYCAscmfakDC7wPm9fmsCCQM leana@vanadium"
-  "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDc55vENX+13c4s2w7zjTb8T/AnBnTi96yRC5+fy7Z2A root@vanadium"
+  "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF5OgvihLpGaenFmZpbflF+UFsyYTZDwBZqTmSYdquC3 root@vanadium"
 
   "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEXzNdCA0zZ+WmeKZnhQSQtUcxnQhhDl59E3BPQfLj7Q leana@hydrogen"
   "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIMVDmEt/12u9U4QGDZBx/Sx8itzqfQ4zWJvcC3pRZqP root@hydrogen"

nix/overlays/nil.nix

@@ -12,7 +12,7 @@ final: _: {
         (final.fetchpatch {
           name = "fix-handling-inherit-and-patfield-in-inline-assist";
           url = "https://github.com/oxalica/nil/pull/178.patch";
-          hash = "sha256-4f7DeWJtt63IyOjqlwzz0f05rv1NBYZO4JWEkFeDimk=";
+          hash = "sha256-YeVshmMadgYnFWA8S+nA+MwWKjVrzn71fqhfn6oL8Uk=";
         })
       ];
     });

nix/secrets/restic_backblaze_repo.age

@@ -1,14 +1,14 @@
 age-encryption.org/v1
--> ssh-ed25519 0LL3PQ T/cXi55d6piVdR6JLJSwDkRZZUosRmp+aqVwAoVfPFA
-9qrb9A37THHtfuC8auJZvAxLJ2BNRjlSsR/I37fU8yw
--> ssh-ed25519 0dJ6Mg gJKha4ebtaBDlKGARtTg/P3DHZ71DrCg3HeEeNpkEQc
-gFKI6brdafHh2j0dJ8TGOLjC1h40+9Aie9DH8mH7Vj8
--> ssh-ed25519 7owkuQ U+Gja1vezscwMJcLU4EVxuKI3Gl+ipIFYCjG33VifX8
-xxmwm/4zFbiZQkvruSZX7FLQ+3vQXA4tTccWgUODu8Y
--> ssh-ed25519 yg55bA AGlvhXKS9pazSsJ/U3VZ8bM5PMR/u3g9FOLpgSAljkg
-kdOMWIgbFtpmYJWBvoL/0gwpRm0bfkyf/ITz/BsgXwY
--> gZmc-grease Cr hyPB5 |D/ Ahl
-dpHaveRNwJwPxTGDEmN371ODXoaZ1yfi+x659RLEfIotEaJT/CmJZ8caF32DLF2n
-pkA
---- m19Tq1Ptb7ranZor+pcrHGRuCKv/+NHGJISyhrOiESU
-Ò(Vq•]C@tKÁâ<C381>TËŠJÖ·Åi™wªa
Džš3>ÖõJVû u¶ŠOèQÞj¯Ñ;Š²UzâªëIôÝ-¾_ŠPÔ&°¯ã­Z™äjã¦We
Ù½ HJJ(Ö
+-> ssh-ed25519 7owkuQ 3a4ufOMdSHVuqRHEYqgfRZBFVVk7Sa1aM5uBSjJj91Q
+zfH8jCsa6qrn7YIT5wocNybHZgtGUm2vBAL9zLqp3KU
+-> ssh-ed25519 ks0k0A 1ktnG6ZrzqAL3C++RZDWqHYGdruYrdeh/SiUj7uj7VA
+hN+pYXzEfdvcV2lDwxB4Mzgib3eQaXngnskuzk9kesw
+-> ssh-ed25519 0LL3PQ 5EWAWySpok+BKqop6EEsVX3XIB1QiBVFe8Mroawxxng
+ePBwfGTzZWuc5vgrzhoUNd38pXuSmMfGoBT9h8tD6S4
+-> ssh-ed25519 0dJ6Mg UmH2+XRr1i9Ym65HORvq9eQsHnCM0hVNv8XsXedTpmw
+nf8zNboj4UG8UjDc/vt0rR2NkiJwaIv5qmvi5VnuZjA
+-> fA-grease w l:8 /
+klKs99O8ZOJo9SFgWKPNdXru2kKsqbU9n2BbzddOO8s1dDoqBDNmyY4lOMPccj49
+qnIYEbjiMRLwSCfqdE2u7XEGWsDj796jcL6TBfZd
+--- QT8M6U7wAPhQOUV7upjeWJrcJXO//G3C8DdqWAjS4E8
+»%ßé(!×{8,s“N's§î3	£igŒØ{˜©ÊànHhY<68>ð÷™fqÜöN»¢:FpiöC”<43>Ù"0MðÍ2qsaÏ?éó?®g;V{Yâ1:?Ïö“—ÃÅõº

nix/secrets/restic_four_pwd.age

@@ -1,14 +1,14 @@
 age-encryption.org/v1
--> ssh-ed25519 0LL3PQ xLhj3/Y4owHlZ9wSvSUO6J5QRDbAwbaMO2MNAIW/S34
-T86CtE8vACVDH34OnmUVokUY4NctvHcaVunoCvGUxEo
--> ssh-ed25519 0dJ6Mg 0sZCeLLGHhQ/ZppSTuyeZBOKdypMBNaJrI84Sdya6C0
-3koAeP0eIaSj/TQEGHYJ0GSUx9T35WQiALzLj8cykM8
--> ssh-ed25519 7owkuQ fOjqhSibMqCebX44ODbi5B6T1KGBVjgAl78XcQbGnUs
-LqRR+NxqMGi0gW3DLubo0k00mkW5onuhKWw4Oaq4o2g
--> ssh-ed25519 yg55bA xl59uoVVAsDwAik1iN+aMxAvmX2yBW6Tgngt6nrAy38
-NnAGx9qDQScgbA8eMd6JmOWV14Kp3enpuzMeTpVLSQM
--> *-grease 8-(+ vYaB m6U
-8gdvu5Df7a7QJC+s3/x4OMEp3nGRQo+v6GKMo957cTIofYQrX1zPIscugjB+Ua/R
-mqSUmYM
---- IYRDnT9/tIxleM47lmOA5wp3e5TrJGqn/faxfMTq7po
-Q&¢]ø¥cÓµŽ° Ò·árJ¿Õ« ü±Ï˜šÄzaBd	$Y[•'<27>àßsœ8ûpZ¶ô®
+-> ssh-ed25519 7owkuQ llLFRhDH+x5Igkw1CcsjKwKgmXh67zVuLXjCKpD+bks
+QqR+Iqlqip3t0oRs+RUyJWHK19zGSLEx1jXSrYCW6nw
+-> ssh-ed25519 ks0k0A sZY5SVZt8p+W8lC1q+P57JSUGDgZJZ1OsCe4nvgw1hw
+5iKTgCzIqKEUgKtVS8wNoy0TfPxQsvM5Nk+ErppL/tY
+-> ssh-ed25519 0LL3PQ rKU2Mk4CQIv6QUK0Y40AwLG8WR4iutQ5S0mBt1zcXR8
+aSkny0uNkb4s4YeCo3Gkp7CtZXepeEDEPLJl2ONIK8g
+-> ssh-ed25519 0dJ6Mg Pw6bWIyyLTkGJJoYmy2BrijbLI0rLDFrT5OhIsZfl10
+594tiWAh7VsGXainw2VYMVRmYdymgcVERAAOHnagxxE
+-> g<z||@]-grease =0y{6( N1r\ ZzIw'o|
+Du1hjWuKTnLWu70pnHNqsdgNw5JlsDlzx90YGBmsjHxDTKw7ZRnvZcdNBLXI/fXJ
+ntB6/NbU10RLgPQwPswt01I
+--- +bayuQ0F1wE+Qpx5HNoTiVk8a6HkiOhcvE2U35bo4f0
+‘Y\ªnAq¬"6¬²Q`ë<>z<EFBFBD>ÉàÈ0ØyÁ?	¼<>À|¡l$h–'½çîb K{òpr

nix/secrets/restic_sgbk_pwd.age

@@ -1,14 +1,14 @@
 age-encryption.org/v1
--> ssh-ed25519 0LL3PQ KHSf9ndwbU+gp/EjEqb6BizoDld2P0IUE+NyNq41qRU
-nnjQ6RxRj/oVI4lrmGx3YA9xru2wIkV6tyYnF/Qj4gA
--> ssh-ed25519 0dJ6Mg FoLEamzgj2WZxiEGjWEacLtP+YvwPK4S961Mz4QVo0Q
-LRV7YndQRyZxFWgxjZ8+KhnHY3NmQjtBx9D9SkEfdBk
--> ssh-ed25519 7owkuQ +ERZ/SyjyHNDMUcZftWjPPg/+Y4vNNhY9qcXYJTocEo
-WvRkkgWh+t1O2574vvIRYkDav6XJaZe1H8+bMk6Rt2U
--> ssh-ed25519 yg55bA T1koZe8t1aK3Z8t102m9Q3sTFo68ml8hjbm5oTDxqXg
-OuVwNZFJokgz3ZubnQJbhdmgfYnpKSyt+2f0pfJ0zMM
--> 1I-grease SAO!z + 1
-dor0+AdeMZtvH6XIh/8UOwtKIeqTckMwS64fXpQC15sQN4s01iZ0E2fmfxlOd7sF
-CEjwIjD/c76eWsm4HXnFKPMn
---- PtcipNj2Ol00OQXMJnvGfBPLxAkxB5/JrqUNXWKRqEE
-p°§•3‘•êו‹Ê!‚3`S^'¨”– ð<>ÔToÐ[F‹<46>åÁþ"<22>±ùW¬QñÐFè5™H$þ
+-> ssh-ed25519 7owkuQ hyi5QyY0Nb/tRA5YHqvLGCk57rWJOclsYTSA+M58cXY
+QlI51+l50n5AZoqekc2oVJlGuoWMT521m3/X8lWtJks
+-> ssh-ed25519 ks0k0A jHfzQrfnTCHUnQN5kchnRNcC5jDrH5ZLtmojgwesClI
+nTtQ4pSwVk+shVoSISQXnLuc0eQ4Sn93XcSw56jErzo
+-> ssh-ed25519 0LL3PQ NaZ+jpzvUM5d5FturtNv8T9yq5/AXVAD7jWmdrUK20M
+45SEaLV70W/R5WmRt+cHUk6lC3uBPllwY/djK9VUFww
+-> ssh-ed25519 0dJ6Mg 4AFLZqFmCnRcwgiGLY0WnLonRMGbQxH41u6Qg00zX3c
+2Tz7qnUOFIXNPrMMWdOS7jjcmAcZLe+Zptz5UOLYWx4
+-> }?-grease Rs]
+/IzXx/FD8S/6X6hMWHwFvHLFFiouDjdAIAAb8ZkyRDoqUO4RbqTJ95zk2riKoFF+
+VEk
+--- /YEZAkDcEUTff6GSoh6MfDYZzI6eCsy1apPcQS/mGVQ
+YH˝řĎgj3^ŚĐ‚<C490>aĆ´´Ü]-H„‡TřĂu‚¸«k!•N%đ%áĎ5BÝŢŢw`fź¸

nix/secrets/sgbk_pwd.age

@@ -1,14 +1,14 @@
 age-encryption.org/v1
--> ssh-ed25519 0LL3PQ EaH3FSFURTrKNRQgBzRJHwScLs+0++zx8L5xtiv2Thg
-zb9BAe2Mh3Dnq7xQTsV3FKSLfti6qk1fMuVU3jnkvSE
--> ssh-ed25519 0dJ6Mg wOmgGAMbqQD3agi6iH7ncke5yIuWwI3JK2+Z4Z6LAGQ
-aPyfZ96NlrP7/XIMpKJkgvONfzdgjrm18CFGpE8rWjo
--> ssh-ed25519 7owkuQ Siq/BgJuW1G34eBHL5rUTaR/D1R8AKxo3oWNfKkjNjg
-8/qCD7Z8Pnnpz2fwzcZuRKi/NqU4sOUdEn97JT5sy7U
--> ssh-ed25519 yg55bA JHUJBdwb6/vcw3g2JCZVSs/dm96PE7dhOW1gEi5Nokc
-NiT7i0XArZPVz4UqN4IR+Dc47tjU1jVe8SFUbM17fBo
--> %-grease R
-5njLYJJMaDrRkP6qA1AUGy375lHVqP2WzUlhYX8HLtBL95VysXoW+PTzIEc+PQNs
-UMxNTezEFXnww4E06+rPE5JN/VN+lOtb1uaEFdc
---- TKX4YuCK4DPsLEB0A1XSywqEt2gysGHbYtL59hudEkQ
-|žão³¬K<C2AC>ÆÁÛwîà5õ¶±¦tâUô|ø˜G«Ìg(‹áéf½‰\@‡9Àâ0_¨jÖ
+-> ssh-ed25519 7owkuQ l4cFFHAGF9B6eJUBCReUSeMptRCOvmMbjKGqYjSkVAc
+u3LTp1N/nke8Z45MqfsXFKea/HlGbBIbDOVGrP4c6cM
+-> ssh-ed25519 ks0k0A ZtpZOThwG73Mza6EdPOSfiWbaurdFup0b4UFaLbSk30
+4Io9rkANNH4Auu562OY1idS2yZpy8gwbnVNnecvwoAQ
+-> ssh-ed25519 0LL3PQ La8Eho6itkMJFBE9h1eh5dBDO6xX5W1SXoPEsClK/SM
+tRWc436jOvH5lnLlSSd9DcDAQWj98edZ1WT24EwQ0rg
+-> ssh-ed25519 0dJ6Mg dIQDEi2rsms/r1tO/BT4JMrr5IO48CY+I09vA82kiQg
+Ur6P3I9Kq9iJKHys2T7rHPlek/yypPnrAWQe46NrGfE
+-> pkM5Nxe|-grease AZ 0> 0}5TA &9TD
+J5694/wXDMfpyEVV3jxia/ZTKKJ1rcWWF+PKxid4rg0zh/+fJv7qrEHEbc9LCTzR
+jZWL5knDhzWK
+--- e7fyHg0amnzuMqw7fDntjIMwwiAmg5DU081kFt/Fnz0
+e
t°‚ÆðTs”ŠØmßø2Øu=­Ï¼cÉ ÏqaýoäQ^MªMeA<65>¶ON0)¼

nix/secrets/two_pwd.age

@@ -1,14 +1,15 @@
 age-encryption.org/v1
--> ssh-ed25519 0LL3PQ bOMlgebRdu00Y6AMCMzfMDHz20hmxFZKXZXTV0GxrXI
-h8g+yA6VbtKmSpJQd7jRXbI3XZ4t9onF9HAAFZqGfjo
--> ssh-ed25519 0dJ6Mg re3MAlJT/+Cv3JuX32+DDsCpX2fyjmbf6lHWEPo2cS4
-eoGwzNSWZsz7MraRl+WszHPtV/Js5miEpyPW80qE2Rk
--> ssh-ed25519 7owkuQ jVPzIG/BaqhF0pDsQGyTszSYk9uqxgT+gkI3isFfXjw
-KNYecxPhASdkrX9HksZvd3PklumBxhT56cwuAvrjrCI
--> ssh-ed25519 yg55bA RQqNeR7/CnTikL1PmjuB8wbrbB/ePXDL5Vc68nwglms
-XSdnfZRny11PwqNz2RQXZTJkebgpcIlLPH41anP+bE0
--> Fwm.uTZQ-grease 0 l*:+ KkJHBhG
-+GHIrzesQEN5gofR9foQBAispJYm7Q+ZpcaGA5c
---- BeBZdmPhZssR+92iYgQ/62hlCIiY6SUQaggAZkXTw8I
-˜|Æ.hv‹à"ñëÕŸiÖÇ
-|«p<C2AB>Ú×úû<C3BA>ÖÝw¯4´näÿÿiÒØŸ°ÎW­B<C2AD>ï?l‡üêøê`[2Ò(ú¢á¨¿_i´÷Õü'
+-> ssh-ed25519 7owkuQ ICj2WyiOMlAaoQ80r4rJvXam8JaVBtrpBhG6+FrsaTw
+oAhVMZ/u1ZdVlQqyGzwOUhXHXq7nT4xWNTBEoHwMIko
+-> ssh-ed25519 ks0k0A iVHtaqoMzsof7Gj4sFoL6/twZxeAKaHOycVd45fGfnk
+1XrtZ4nsGTqnqfXX75xT8pfpn2rZxZcMhv5ZKIxeNY0
+-> ssh-ed25519 0LL3PQ pUhnIplLUPX9uSatlr9mocn+iz9SYlNNZZMESi51SUQ
+udOD6vY0B0XmNXIU3Pslmttww8o4dB4n3nE5AZfWRhQ
+-> ssh-ed25519 0dJ6Mg d21p0eOmBQl8XeG7h5x4GQG/QjEDwAoiLYvmr8H0lS4
+SsUWCtuCYS7P1JbunEDXnFdb1LDZMvdfTFMLmwfNtxE
+-> 8V~yC-grease
+WMtDLWBx1Ed/qXRIw8U5ZBek3GtGTi9+2U5is073cLARPsAk8Qgc5H9F68u5QLhK
+FFlie0WlBwYHsCx2McB8kUg0vLEoqBTDYWcD2RImmdXsmddndFVi
+--- JM1EDOAtO8Fztqpteu70vsuOs1o0zmit5Hl9GGPBcVE
+ï¹R}àNµn±š¯ú,¼†
+.Si0¾êuÎú”èf	P­nyƒØ²‘žýK9ä{ì†Ç­œ½<18>Ló¤3vå—¥µÚE<>f