Merge pull request 'Switch to btrfs for tungsten' (#10) from tungsten-btrfs into mistress

Reviewed-on: https://codeberg.org/leana8959/.files/pulls/10

nix/configurations/tungsten.nix

@@ -74,7 +74,7 @@ in
       # Extern modules
       #
       (sources.disko + "/module.nix")
-      ../disko/tungsten
+      ../disko/tungsten/btrfs.nix
 
       (sources.agenix + "/modules/age.nix")
 

nix/disko/tungsten/btrfs.nix

@@ -0,0 +1,92 @@
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = "/dev/sda";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "500M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = ["umask=0077"];
+              };
+            };
+
+            # Use LUKS for disk encryption
+            luks = {
+              size = "100%";
+              content = {
+                type = "luks";
+                name = "crypted";
+                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 = "4G";
+            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" = {
+                  mountpoint = "/";
+                };
+
+                "/home" = {
+                  mountOptions = ["compress=zstd"];
+                  mountpoint = "/home";
+                };
+
+                "/nix" = {
+                  mountOptions = ["compress=zstd" "noatime"];
+                  mountpoint = "/nix";
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}

nix/secrets/restic_backblaze_pwd.age

@@ -1,11 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 7owkuQ 3IZ8Pl8OOFOPVdRPlP3vgiGHEpM5ZReIWYoK7YzN9xw
+-> ssh-ed25519 7owkuQ iEJtE3z0nGG2hCkxoYRUi9I0adksFDHABg2qUfqJTw8
-0iGWjX1bVYLSyDljWV0SaaQP96mDT8p0tQ6NZ0hKxqQ
+siubhJoVhnEQgeX9HIGNELezKMC9BXfLm5FmorVSvzc
--> ssh-ed25519 5dpZEQ EJ2NiC+az55qO2Klc0XnkyHx4FrwZFkcwXNVhASz+Es
+-> ssh-ed25519 5dpZEQ BaH0AcJwiuL8L29OfOPIhFUKvfX0yYP0VbqUX1b1RW0
-+/95dR3c1qPTUeW4lltMiwtO/Ypa/bno3yyLu4GbEX4
+8bwuCBIE8fn8dNDtsk9H2PyyqD+WwSj1zZYUxfKv7P8
--> ssh-ed25519 RijO+g VEREDiFYxzSJcM36HnO6muEj8TsNkjCOi9WbJL9yC0E
+-> ssh-ed25519 gFLKzg xOtk08hOGTcz2Wy+xLoAwGtjDmXsr2y1S8ip0cN54Sg
-nOfyrrCOlCJI1k3005ifIs+d3+lv9CfvDuH8UFoAJ3c
+hSEkbjTABJdf0PVC0Uwx6MONixdGzzNuO7ttRm0GLDo
--> ssh-ed25519 5q7r0A r4K/X3z2EUZEr4GTHHvTEsyAd8Pjkx45ghZzaFVe9HI
+-> ssh-ed25519 zp0Cfw ucFZS7YOVx2qNl+hOXYxSQwKC8oLW4KM+KKaNFbR/Ac
-M/FvN8EMmCnKPJA6xaVe8Tk4PiYaouve+IJy/D6d0Xw
+h6OF7M8dTs6OeKjFVh2hV17YjGezBVGSeIQ7yLfDoJ8
---- X5SP01Ug0LAjr/m7GiSfyvhqFRO/l8Gzogqo6UDlak0
+--- i+nAXKPWhe61AaNj+vSGQ0yXaBsM7ObUE3Xwafg+lr4
-®Z«¢Š8z•fžeBÙ¹üìÄ>SL#WÒgOЗV”YðâycðcQ“MÃ… ùU<C3B9>÷ÃQ\¼e†’é.§^v\
+Z8g×püBÎLs<Ïr°¶ž,±²59èý¢Re\sð÷Iƒð{Ò‰ÃOFÀÎýüÁËDÐÄSÛ¿ì+åîæ O[´

nix/secrets/restic_backblaze_repo.age

@@ -1,13 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 7owkuQ ZKlQfVDmBnL3eRL+uHAWWuhBmxj4Rr9iNg2o4TdackM
+-> ssh-ed25519 7owkuQ 7xYeY51Eo1FMmanLvwDhbLRLHfFCfu6T37VaAwAMcCA
-6UcEQIAZMhiO4vHdjgsQUvXs86KspOKIEvL+/VxQz/w
+idjwxWgm3MVon2XUwKhC1ZS9k2sCaEk5/Syisy5A9Kg
--> ssh-ed25519 5dpZEQ AtHxx6Qv73b8Ga0FZ17uDKsa+vI0bxPXsGG2GjdixGI
+-> ssh-ed25519 5dpZEQ Df3kq0CxZoZCfeP5P0kJiv/t18toHjevPUxDpKG1GyQ
-byg6HzPerJjbNhsVCHcYeOain9JTN+kJksXm5od3Bu0
+aUXrq0vHSXPOx3k1vZR7SyJELNEsKNa3fugMVG5n2Bk
--> ssh-ed25519 RijO+g nNsNoBt6rM/BohMlQSNAdaBUHrnfaHG2BlV9dPja6F8
+-> ssh-ed25519 gFLKzg eAcqNJUr7RpzPJmKzNSgrvaYEusjbbT5gqJUYgURUE4
-bgJ03WpW1H7KGonOsC9YKWu6/yb8RHkvF/Z708uak3Y
+JKJ0zoRbNzh2cGxgynEb6cRJTQ9DELIX12oNcBqJIGU
--> ssh-ed25519 5q7r0A QNd6GpL74Qgu59D2fZXXGyLUINmq1N5ylpjv1eiZ9R4
+-> ssh-ed25519 zp0Cfw KIQuFRbsQ51xyNmeiKnJsDQerNl1G+QsGH8XGOkbuXE
-CXwgjrAxETgBlfe9OD+yfIyeWB07TJlQErt/CTQ9FcQ
+tMFsLXcNv8QEwrbEBMwc+fU4FNlsqDZPm+g8XsmRwzc
---- PyUyRJZOptFpR3YcTzFdU0eiSbL7hzPzQmVrxAH/hJY
+--- 132mcjb5oUsywuv9jJuH5BdTFuMsJGdV1/IztoyV/r4
-Ii;Ë1µ
+<EFBFBD>C­Ã“×À?íŽÛ<C5BD>	!&Zá£|W×D‘eÁXÏNßÔY/O‚A)	{àšp?<#Ö(%;+_W!-5$)þ&T -‰FÞÚ¸D7²oŽXå<0C>‡/²k£aï!<21>Êþr9Ê
-Î8 ›ã±Ï¸*´¸µuAÏK<C38F>M´6’Àá­7«ƒrä	ò2BÀéwЛ)¨í7rÿ°éü-EZfA¨¨-Š[’qÌŠ`
-´ú`îÇÕÐñv媰C(8¾ö

nix/secrets/restic_four_pwd.age

@@ -1,12 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 7owkuQ D+2JgOUTD/jUlvA+STsuWUbs1k/88WqtaH2XcuEHQxs
+-> ssh-ed25519 7owkuQ JmcIImKWc73PYFj3mtckN6YE/ZGqmWw3/pfGJnL2hmk
-UEYk1dbJ7Mr2WO/qq2yoQu7TL2nniH5miIznwvj2ffc
+uLkl4Hma4mFHMeGldD1AKZPUz9OaAMaEF1icFtzzLpU
--> ssh-ed25519 5dpZEQ e9wNl24ruPkGl/MJxUfmorkN1/aS2H6AfjI0g1yOoRw
+-> ssh-ed25519 5dpZEQ 8cUoY+KBb08rv85d/PaGAA3RcT/PijGWoLWj53JJESM
-i7+A3qxr1J/lFP7xQJod7Mw/wTULat6sN7uYcLWjWvQ
+/jS5n0CZ2KKp9d97Ety9nmWuBp2155tfA0fw9FH4s6k
--> ssh-ed25519 RijO+g JCOb13fHKxtdSx492K+JZMGFliVZLhTyAZqY26g6Ij0
+-> ssh-ed25519 gFLKzg SoABIosMZTVfJDc/UX/BrTwOR2auXEfMdR+GlVpbWHE
-jw/bhfOqp3OwtoRVT5jdqu1dcDPN/3iCTR7CpIBtqHU
+7OxRs7recbO/SS3MMa9ZQM5TK0NoI7piQ6ErxZPRWqc
--> ssh-ed25519 5q7r0A DIBLUu+NPxlZi20jpFMoa/CvRpUGWKUatvZ798mxTFI
+-> ssh-ed25519 zp0Cfw xLL6WiM0KeYWV5eCkQ5dAQxty0O2Jv+37/8ovgb3DFA
-rNUvprC5DASYxcZdib5ie9M4eQax+sZoWbThNCQXkWg
+Es02nivP5uRm1/UiVBPZjHegmPcYTKnmWL/2dbIV81g
---- gQeryuxiMl59tPk7wiqHlakpk4IYFJ1gTjQy+P0ufgU
+--- q/0wLvbKVsCKDI7FlP2u6LA11SzX6ViDCDQFxbcXpaA
-1ݳ¼Å®hæ@×¾)l<>/ßÜé°à
^Ò2\¸
6áàÃ@#ÁõZ_€¸O
++‡âU…¢<E280A6>ŽøFÈWs/
ëô“5_`oE7&>M…¡|Ùõ¶Xdözcñ'¯iGàqr.ç
-óøO„vö%

nix/secrets/restic_sgbk_pwd.age

@@ -1,11 +1,12 @@
 age-encryption.org/v1
--> ssh-ed25519 7owkuQ 5lpERo6g65LULUbzT57B5PIScT41nCmIrWYidsGHkQ8
+-> ssh-ed25519 7owkuQ EfQT1yelq5hGWJZPfTnPe37XkHK3QWQGbgikAWgHfzA
-TqHEUev6Z3btn5XNCLOU4cfqLZIdgr3l+RVj0B/Cihs
+EL5PU9cOtM5k/qqlSX3qvRiXePQaK1LPMWpdLJjRrtE
--> ssh-ed25519 5dpZEQ cCZQifqsmbiJWa1SdhZsUlVa9qqipoIJC6ar9L56kSM
+-> ssh-ed25519 5dpZEQ vp12U8UgGlg5tPaGTOX7iV/b8RlDm+xghtKPRLL7O0U
-niJ9kf0QAGHliz5fU+cCeHYeLFoxEmLwCqgTXIncqww
+CtwTletRUklN5uFmP8Tbj2jh6n2MqMRRn7fAzLbwQxk
--> ssh-ed25519 RijO+g XjQvEy7UXkgfthRwIXoyeIOsb8e4aZZLRoQManwVtCE
+-> ssh-ed25519 gFLKzg ovHOZXxgPZbNjlNLE/AbMKZ83p/sUuTbNUm1tnmelTk
-p7RPPb9AxTPSbMJ88kODh2/5elv6Gx1/m2hU0z+jJHE
+bBVUeW2TvLT9/qu9h+TiPIgh/YOFMGDmY7QVFgwAeXg
--> ssh-ed25519 5q7r0A bwdUX9WuLELK+PLfXcoXkjejLFyBHMadmHxcmi5uBwg
+-> ssh-ed25519 zp0Cfw ZWtsg42NwwuoAblnNBAwFdfSxnh8+RQGs9LdlphY5k4
-7k2dqilitAPLDTikdD0+4GXWKshlC1z7Kdc14RPmp7U
+87WANVnbHAobOx8fMKyoufxwJZwbNvVkjLqt6mFpYPU
---- pWCkAVZywKKAaxJ32d9NEShnbvK3kPv3QpLnoXEqClo
+--- 0z1pPXT+1ToLe4BfKCTGMycPKVJRZ13DMpHJb7gM0O8
-<EFBFBD>¥ËtyôvFXjçqÑ“þ½­ÊŸË—ÙëÞ~ŸT4¤ÕÎü9l¡Ÿ©<C5B8>`Pþ9¢òU<C3B2>
+Uj*†s'M„PÊ#h‚tt‹ûˆÎwŠ
rÆc¦Jpg¾ÌÄ
+'8ðìé1"J*H•

nix/secrets/secrets.nix

@@ -5,8 +5,8 @@ let
   ];
 
   tungsten = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEl6jmLz1dA39faUCJKWxORd/yU1vJ5WItbneXHpYUHq leana@tungsten"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDKTWVdXIZZuxw1FbBBaskExFmYfUWR1MboP/GnC1eCo leana@tungsten"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF4J27Og7tNLTC3+YnOny8v2tI+Ga63TqmHsj7iXozZP root@tungsten"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBkeH6KvULmx4XxgdbUoL8ZC0rAGTAOlYRWQRP0pKrzx root@tungsten"
   ];
 
   all =

nix/secrets/sgbk_pwd.age

@@ -1,12 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 7owkuQ nSWkK8XN7AOyA3cfphrwOxO9QemoxBMqAM3UB3Fc5Es
+-> ssh-ed25519 7owkuQ MVzZvxcL29ripa3xJN1i+99KfR1Y+eME5Ec0XssG0mU
-TR/6DlWvpiSCOXxj6UM1mk3j5oW2y2hypMVE8qwDhUw
+HYaaqHne8D46RPz46Y4BP7clSea/i0cwRNqEDM5nf38
--> ssh-ed25519 5dpZEQ vzMk3zQSMwHPyw+aGtm7n917AeqPj206rUm5aTN3Hiw
+-> ssh-ed25519 5dpZEQ WEQ9Eln/C/n1FX7dzwzLEU9STcTxfFJ4SjQbJevH5i4
-Wwowx2ofjUkV5cr3nnY/Vi6bN0fu7gNZYiZZbt04LBM
+tOJ0vc9yEJfmrSrI/wKryzLWQmeyTJcs7N4vwHg58DY
--> ssh-ed25519 RijO+g z2aW6tg6SR3qJXGOaH6Qh6Yhbjgpdkd4wdMj9IC/BSI
+-> ssh-ed25519 gFLKzg FFemREWoTrmz4q2ikdv6ncsqGdQE6Xgm8J4JyzxtK0c
-ne4ijY0NZSOyKIZAnwzGqzCdz0WJQ9NZzZ8dXzCxnb4
+aJsOa2Fhoo8JEuP2oOQ5MOKIigDDXzpFK6WpDhz/yLw
--> ssh-ed25519 5q7r0A xNek3qM9DNUX0J8jbhwNAzHeATrVJqR7V7uwyM2dIRg
+-> ssh-ed25519 zp0Cfw 8/FOJ3lzjbUxM+wWjvuJoaPy7bTbX+jh2CnW2VxG2Uw
-8dvpFDO86Acqi4YDijY65/VA5rFnqkRuUdqzboNpzxM
++DbH6UQzQ87cwnQPpYZ+jg5tIAF1e6Sdo+zERbJPb9U
---- sx9ZBhU0NGqKjrXThkFml5IwZo1mLqPsFbKXTM0aKHI
+--- UylIHe7jjfuTbrTFl7gA3NTryboK4MDEbeMjIy03UmQ
- kCòëü+Â¶õ9ßþ~
+<EFBFBD>\<5C>B'G‘|`{×›>§ºÈëÛ ÔSC¼¢,­š4Iû¶£7w6GËÂ\-ñgËFÓÒ:
-Ê–»4ÀŒ2s¤BP¶ÿÄÎ6#À4*9>HJ­ºô<C2BA>^]*

nix/secrets/wpa_password.age

@@ -1,13 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 7owkuQ SxYcsQ9ofIJPI+NegpUPRP9Fp/FsumYJvdH4AupD3QE
+-> ssh-ed25519 7owkuQ BzumCTV2qAMv8WuCZOEsV/LoDHkai/3qUlgAcCyo8DY
-Lr9LzcVVizgAQFLjk4GubIdGlfkPSz4VVL4Xc8MlLyE
+KP1mwaAEDkAZmsR0bsrHZEqm1VodUWw+RvGSsYNF4lc
--> ssh-ed25519 5dpZEQ UdmEfeNZynlQqCKEJH+ah5ktFZnXt32TNavYQHKz4U0
+-> ssh-ed25519 5dpZEQ Nl0g/lcPFg+yr2glYmi+LAP2usLHNtCz+kJkUB8f8Sg
-CmFW11cmtwor8P0IE1f8H99IZIzTH/7ZCvk9CxBbbK8
+BM19SfXeagbsVZtyfCWKisMp/wV0XvihjAimbrhkkaU
--> ssh-ed25519 RijO+g mGlskggvFD32VhTv/fEbQp3FLe+8lyMckLDQqqKi0n0
+-> ssh-ed25519 gFLKzg 6Dhz8r2OWsFv3PHCXCInu6+FiJCo4epC1bEZX3HpRV0
-I24m1rWyKDIZCO7UFbQbYIxUg+avtBCL2VMJ7js7EQY
+0NhLjYJuJ+iG41HdriSUI+lTGk4jpi+VyojjVQtoPk8
--> ssh-ed25519 5q7r0A +HPW7Po4ETQsmiU68IdD/jHjr+//5ZpxhC+C9TNA2yY
+-> ssh-ed25519 zp0Cfw pZKYOx2n6K6MnSZ5jNAWff8tssUejUAsGW3JMXD64kg
-WiUjQmD/dBNfkBquyHUzgO1gEKrnbB3/Wc01VWRmZU0
+eZgZaXqkFCIqUnBgWCj+aHiUSykKg+XrzUXXq+fGWvE
---- bglYiFBEogi481lhCyec0UlQqLCNJ+/76emlT9Kh22w
+--- 7l6Pr9G+Ke+ic5l1T3nmNufFaL1opY9BAMf73B4DEYw
-
+!Í‹ÿ<E280B9>Ñ
˜³Ü<C2B3>\žq¿b˜ý’³îµ“2>luÏ£ÛÛØÔáà*¹šÅÇž óþ3P$ÖŽ$xéùl¢þVVº[»Å/À«-©ŒÓ2жDJ(ùyºÔ¸çßÖaP¬ýïF
E6§ïÏÏ{³é™™ Ó\ë:5Þ
L<>³¯Ÿ1r
“
-ËQ;r„&Ë:Å<=–7¤<™¿JÖÑÄ<>B½á\1·awB7–ÿÑ<~D¤üt¶;´&·LÛÐŒsyMÏxj`“Û7£ž977Dë‚·<E2809A>´D<C2B4>ÛÜ7³æ+yÊÓòJòl‹ô#±Þæ<SøGPÈ_´‡*®è1âFI6
-‘óÃ|38