Merge pull request #41 from cnsta/btrfsboote

im back with btrfs and lanzaboote
2024-08-29 08:43:34 +02:00
parent 4c81077480 01a46eb1fe
commit 03599a2b35
7 changed files with 170 additions and 154 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -61,11 +61,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724273991,
-        "narHash": "sha256-+aUSOXKGpS5CRm1oTitgNAr05ThQNbKIXalZHl3nC6Y=",
+        "lastModified": 1724781866,
+        "narHash": "sha256-ItgACCJCwn8Rx7p8hJBpnU9eCtrdmkg4AbqMZL/rXlY=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "9a3161ad4c78dc420d1cbb3aae638222608c7de4",
+        "rev": "7cc3d3179c06caf3769afb3eb0c69aa55676c96a",
        "type": "github"
      },
      "original": {
@@ -102,12 +102,12 @@
        "yafas": "yafas"
      },
      "locked": {
-        "lastModified": 1724260845,
-        "narHash": "sha256-ufNcCna8sact/lkKNWNl8HwNMrKq42KN+izK/vPvxhk=",
-        "rev": "62ad1fce12be4bca6133c14a376cb36a3323fc85",
-        "revCount": 1357,
+        "lastModified": 1724848807,
+        "narHash": "sha256-vnqqX1XTwiPL4lV/xUa9wbDVw3zgT3FjpHYaNqRiCi0=",
+        "rev": "82ab7e98b75a39df40658f66272aa159cfb49400",
+        "revCount": 1374,
        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1357%2Brev-62ad1fce12be4bca6133c14a376cb36a3323fc85/019175f5-2559-705a-b10b-daf05c7b63ed/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1374%2Brev-82ab7e98b75a39df40658f66272aa159cfb49400/01919927-80d2-70c0-afbc-95bfe6a3f8f7/source.tar.gz?rev=82ab7e98b75a39df40658f66272aa159cfb49400&revCount=1374"
      },
      "original": {
        "type": "tarball",
@@ -179,11 +179,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1724221791,
-        "narHash": "sha256-mKX67QPnUybOopVph/LhOV1G/H4EvPxDIfSmbufrVdA=",
+        "lastModified": 1724826636,
+        "narHash": "sha256-hz8Szf5J9oQg6EeMhHE/eKuexoHPiDbmOZTPvijYwyM=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "e88b38a5a3834e039d413a88f8150a75ef6453ef",
+        "rev": "3454a665ff4dd29cf618e6a2e53065370876297f",
        "type": "github"
      },
      "original": {
@@ -200,11 +200,11 @@
        "rust-analyzer-src": "rust-analyzer-src_2"
      },
      "locked": {
-        "lastModified": 1724308100,
-        "narHash": "sha256-1lP786QhspMdDNJGv2qep27BM9Dnce+7scwp1e49rKs=",
+        "lastModified": 1724826636,
+        "narHash": "sha256-hz8Szf5J9oQg6EeMhHE/eKuexoHPiDbmOZTPvijYwyM=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "37d8c6b53394b9ac18af2e045bb92aaf6e412881",
+        "rev": "3454a665ff4dd29cf618e6a2e53065370876297f",
        "type": "github"
      },
      "original": {
@@ -222,11 +222,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1724299409,
-        "narHash": "sha256-vIT4dmFC+1l0pSEguFofHSQjY8FtCGjBmzI1L7xbySg=",
+        "lastModified": 1724904198,
+        "narHash": "sha256-KVK7fRmpD4RcAH1wzq4gXqLzr2eHzkDrRc0aAyKTyt8=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "6a0ca5c9fe527fed0893929db30bc74ce08d3871",
+        "rev": "9e63f0ed86c157ce26b3fd56ee908a726713dfed",
        "type": "gitlab"
      },
      "original": {
@@ -247,11 +247,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724329769,
-        "narHash": "sha256-5jFePUMjH81aeArOFgVlmSLoRJKhR+cCHPrtWnlSGAU=",
+        "lastModified": 1724899320,
+        "narHash": "sha256-C7x+GwFa9FGUlnVjNYSIrvj0aFaqnbg6KmzDT8hNbQw=",
        "owner": "nix-community",
        "repo": "flake-firefox-nightly",
-        "rev": "23950b539a22d75b15e4b10ef316a04f8787cf2b",
+        "rev": "9cb29975e9142471489c582b99cba9db9c01432a",
        "type": "github"
      },
      "original": {
@@ -505,11 +505,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724227338,
-        "narHash": "sha256-TuSaYdhOxeaaE9885mFO1lZHHax33GD5A9dczJrGUjw=",
+        "lastModified": 1724857454,
+        "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "6cedaa7c1b4f82a266e5d30f212273e60d62cb0d",
+        "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
        "type": "github"
      },
      "original": {
@@ -564,11 +564,11 @@
    },
    "hardware": {
      "locked": {
-        "lastModified": 1724067415,
-        "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=",
+        "lastModified": 1724878143,
+        "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2",
+        "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef",
        "type": "github"
      },
      "original": {
@@ -609,11 +609,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723986931,
-        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
+        "lastModified": 1724435763,
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
        "type": "github"
      },
      "original": {
@@ -630,11 +630,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723986931,
-        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
+        "lastModified": 1724435763,
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
        "type": "github"
      },
      "original": {
@@ -651,11 +651,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723986931,
-        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
+        "lastModified": 1724435763,
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
        "type": "github"
      },
      "original": {
@@ -705,11 +705,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1724329681,
-        "narHash": "sha256-cwYetPD6aAnER0KTLw3l6SvNuprLcPC5AsZBIcOCELY=",
+        "lastModified": 1724874889,
+        "narHash": "sha256-Zb+IQjUMSE+6LPMg9HuxVvHHJsamU5VB13tD7XmBugY=",
        "ref": "refs/heads/main",
-        "rev": "f634b9e61af7dae0ca70379bd207eea45bb417d1",
-        "revCount": 5127,
+        "rev": "b9b8e6220f55af34e862b541a5a4b30ae6d8f15f",
+        "revCount": 5155,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@@ -889,11 +889,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724128906,
-        "narHash": "sha256-junn8oz6yG1akc5R5b8LjcAl1epKJkAzwPlG57bB3E0=",
+        "lastModified": 1724837759,
+        "narHash": "sha256-gt1mCTlqnirTHAG8Q90IWEs91fRsTSjBqXhb6bQboe8=",
        "owner": "Jovian-Experiments",
        "repo": "Jovian-NixOS",
-        "rev": "d9947d55383ece6ac396820112d34734cf47e2bb",
+        "rev": "a679e3a0ef9d3d43639f7ba894069c43e2d39c2c",
        "type": "github"
      },
      "original": {
@@ -931,11 +931,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1723983147,
-        "narHash": "sha256-SMCz4/S1/r+5ONMbxWrLiasPNd1J5FBM6HbNe00OBnw=",
+        "lastModified": 1724587851,
+        "narHash": "sha256-+tnTRvR9TzXQDl5OynS+tKBZyPB6viT99zs4fXI0lfk=",
        "owner": "nix-community",
        "repo": "lib-aggregate",
-        "rev": "abccaf0cb3f013739df2a89f19a33f912195384c",
+        "rev": "eda1cdaddc64064f53e65ae614e061010e5fb92f",
        "type": "github"
      },
      "original": {
@@ -986,11 +986,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724299755,
-        "narHash": "sha256-P5zMA17kD9tqiqMuNXwupkM7buM3gMNtoZ1VuJTRDE4=",
+        "lastModified": 1724561770,
+        "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "a8968d88e5a537b0491f68ce910749cd870bdbef",
+        "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
        "type": "github"
      },
      "original": {
@@ -1010,11 +1010,11 @@
        "umu": "umu"
      },
      "locked": {
-        "lastModified": 1724203387,
-        "narHash": "sha256-nm54uFppQFRYM+2v1BLpmlxB6Jv5n0zzwjU+aZShZlE=",
+        "lastModified": 1724549799,
+        "narHash": "sha256-F4lN1qmMJpJALwZ2ENb6MDSXG40om7ktZyAt7yh/DS8=",
        "owner": "fufexan",
        "repo": "nix-gaming",
-        "rev": "ad4e195c8fd545944273f633fd6ec9b993e088ed",
+        "rev": "963803d3be8ed721b21326804513dec884e9d494",
        "type": "github"
      },
      "original": {
@@ -1057,11 +1057,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724293504,
-        "narHash": "sha256-93+lM/1jmJ/S5F8Xn8eK+so6Cf4cL8/h+SzntqPbv88=",
+        "lastModified": 1724898170,
+        "narHash": "sha256-/QslnBDv9+dnBCkAd4tto7sZck2CUeCIHtnpzRmZ+Lo=",
        "owner": "nixpak",
        "repo": "nixpak",
-        "rev": "853b2f4471bb6f2763d5f45ce3343ca51b9e8e9c",
+        "rev": "02d04e4ac37fd71f117aaaf367d5c41fad14d29b",
        "type": "github"
      },
      "original": {
@@ -1088,11 +1088,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1723942470,
-        "narHash": "sha256-QdSArN0xKESEOTcv+3kE6yu4B4WX9lupZ4+Htx3RXGg=",
+        "lastModified": 1724547350,
+        "narHash": "sha256-WKkGeNpenNMKD1gOF0Xuqi3VsKX/QCAiwz9qe5PDvzA=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "531a2e8416a6d8200a53eddfbdb8f2c8dc4a1251",
+        "rev": "b741d900fecd2f0c32d90f853b24be9f5f098b7d",
        "type": "github"
      },
      "original": {
@@ -1103,11 +1103,11 @@
    },
    "nixpkgs-small": {
      "locked": {
-        "lastModified": 1724306539,
-        "narHash": "sha256-9jF5qr44cnvWoXhE0cr114GHT5Adav3q/DKJ6n9tor8=",
+        "lastModified": 1724870369,
+        "narHash": "sha256-dGHUOi1tBiVOsVdT9QNEuk+FuSMtQxkyx+9CN/34kkk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6c31eb9b990446880000e3297f69f4fdee5b69d7",
+        "rev": "215ea7473ff80eb6cb157ee07223920cc53f4b09",
        "type": "github"
      },
      "original": {
@@ -1151,11 +1151,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1723991338,
-        "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
+        "lastModified": 1724479785,
+        "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "8a3354191c0d7144db9756a74755672387b702ba",
+        "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
        "type": "github"
      },
      "original": {
@@ -1214,11 +1214,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1724224976,
-        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
+        "lastModified": 1724819573,
+        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
        "type": "github"
      },
      "original": {
@@ -1230,11 +1230,11 @@
    },
    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1724224976,
-        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
+        "lastModified": 1724819573,
+        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
        "type": "github"
      },
      "original": {
@@ -1257,11 +1257,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1724337827,
-        "narHash": "sha256-z5Y3svnMT9I17ifReo4eQLgqD4W67fs7h2E/xU6Yb/4=",
+        "lastModified": 1724910392,
+        "narHash": "sha256-+eAf/UTXPvjMqBXCHaYgJ1SnTsv5w4dE3etga4RBiWw=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "b470800240926a6b5262fc9030477b7e8fc17453",
+        "rev": "bc7f4166f475bf16b8dac90dc660730ba502c024",
        "type": "github"
      },
      "original": {
@@ -1279,11 +1279,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723969429,
-        "narHash": "sha256-BuewfNEXEf11MIkJY+uvWsdLu1dIvgJqntWChvNdALg=",
+        "lastModified": 1724584782,
+        "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "a05d1805f2a2bc47d230e5e92aecbf69f784f3d0",
+        "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087",
        "type": "github"
      },
      "original": {
@@ -1349,11 +1349,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1724153119,
-        "narHash": "sha256-WxpvDJDttkINkXmUA/W5o11lwLPYhATAgu0QUAacZ2g=",
+        "lastModified": 1724761543,
+        "narHash": "sha256-G4z3E2PbuAIJ4CSss6Fxs0HMSpnaxMMUFCdyVahAppg=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "3723e5910c14f0ffbd13de474b8a8fcc74db04ce",
+        "rev": "8db40df2a3c1c3b18402c4844643d2fb6dce87d6",
        "type": "github"
      },
      "original": {
@@ -1366,11 +1366,11 @@
    "rust-analyzer-src_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1724153119,
-        "narHash": "sha256-WxpvDJDttkINkXmUA/W5o11lwLPYhATAgu0QUAacZ2g=",
+        "lastModified": 1724761543,
+        "narHash": "sha256-G4z3E2PbuAIJ4CSss6Fxs0HMSpnaxMMUFCdyVahAppg=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "3723e5910c14f0ffbd13de474b8a8fcc74db04ce",
+        "rev": "8db40df2a3c1c3b18402c4844643d2fb6dce87d6",
        "type": "github"
      },
      "original": {
@@ -1535,11 +1535,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723808491,
-        "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=",
+        "lastModified": 1724833132,
+        "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a",
+        "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
        "type": "github"
      },
      "original": {
@@ -1557,20 +1557,20 @@
      },
      "locked": {
        "dir": "packaging/nix",
-        "lastModified": 1723697867,
-        "narHash": "sha256-LTfbJXR8x35oZ8Mo3R0WTVEp9toWpVfzD21xCSr64IM=",
+        "lastModified": 1724179424,
+        "narHash": "sha256-2r2y1p9YQuaWCxuFj45MVRqJ/uWglhzY5O9BW1jRXcg=",
        "ref": "refs/heads/main",
-        "rev": "c71a45ad53036f4c668bcbe1be7a49f9d3460151",
-        "revCount": 699,
+        "rev": "dd3105e4ceef83bdc9d7437139f9475325e2a66d",
+        "revCount": 700,
        "submodules": true,
        "type": "git",
-        "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
+        "url": "https://github.com/Open-Wine-Components/umu-launcher/"
      },
      "original": {
        "dir": "packaging/nix",
        "submodules": true,
        "type": "git",
-        "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
+        "url": "https://github.com/Open-Wine-Components/umu-launcher/"
      }
    },
    "xdph": {
--- a/home/modules/devtools/nixvim/plugins/conform.nix
+++ b/home/modules/devtools/nixvim/plugins/conform.nix
@@ -13,24 +13,22 @@ in {
  config = mkIf cfg.enable {
    programs.nixvim.plugins.conform-nvim = {
      enable = true;
-      formatOnSave = {
-        lspFallback = true;
-        timeoutMs = 500;
-      };
-      notifyOnError = true;
-      formattersByFt = {
-        liquidsoap = ["liquidsoap-prettier"];
-        html = [["prettierd" "prettier"]];
-        css = [["prettierd" "prettier"]];
-        javascript = [["prettierd" "prettier"]];
-        javascriptreact = [["prettierd" "prettier"]];
-        typescript = [["prettierd" "prettier"]];
-        typescriptreact = [["prettierd" "prettier"]];
-        python = ["black"];
-        lua = ["stylua"];
-        nix = ["alejandra"];
-        markdown = [["prettierd" "prettier"]];
-        yaml = ["yamllint" "yamlfmt"];
+      settings = {
+        notify_on_error = true;
+        formatters_by_ft = {
+          liquidsoap = ["liquidsoap-prettier"];
+          html = [["prettierd" "prettier"]];
+          css = [["prettierd" "prettier"]];
+          javascript = [["prettierd" "prettier"]];
+          javascriptreact = [["prettierd" "prettier"]];
+          typescript = [["prettierd" "prettier"]];
+          typescriptreact = [["prettierd" "prettier"]];
+          python = ["black"];
+          lua = ["stylua"];
+          nix = ["alejandra"];
+          markdown = [["prettierd" "prettier"]];
+          yaml = ["yamllint" "yamlfmt"];
+        };
      };
    };
  };
--- a/home/users/cnst/modules.nix
+++ b/home/users/cnst/modules.nix
@@ -46,8 +46,8 @@
    };
    userd = {
      sops = {
-        enable = true;
-        cnst.enable = true;
+        enable = false;
+        cnst.enable = false;
      };
      copyq.enable = true;
      mako.enable = true;
--- a/hosts/cnix/export-system-modules.nix
+++ b/hosts/cnix/export-system-modules.nix
@@ -1,4 +0,0 @@
-let
-  modules = import ./modules.nix;
-in
-  builtins.toJSON modules
--- a/hosts/cnix/hardware-configuration.nix
+++ b/hosts/cnix/hardware-configuration.nix
@@ -1,47 +1,68 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  modulesPath,
-  ...
+{ config
+, lib
+, modulesPath
+, ...
 }: {
-  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
  boot = {
    initrd = {
-      availableKernelModules = [
-        "nvme"
-        "xhci_pci"
-        "ahci"
-        "usbhid"
-        "usb_storage"
-        "sd_mod"
-      ];
-      kernelModules = ["amdgpu"];
+      availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+      kernelModules = [ ];
+      luks.devices."enc".device = "/dev/disk/by-uuid/1bda09f1-5b2c-4040-ab71-cee54a6df910";
+      postDeviceCommands = lib.mkAfter ''
+        mkdir /mnt
+        mount -t btrfs /dev/mapper/enc /mnt
+        btrfs subvolume delete /mnt/root
+        btrfs subvolume snapshot /mnt/root-blank /mnt/root
+      '';
+    };
+    kernelModules = [ "kvm-amd" ];
+    extraModulePackages = [ ];
+    supportedFilesystems = [ "btrfs" ];
+  };
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
+      fsType = "btrfs";
+      options = [ "subvol=root" "compress=zstd" ];
    };

-    kernelModules = ["kvm-amd"];
-    extraModulePackages = [];
+    "/home" = {
+      device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
+      fsType = "btrfs";
+      options = [ "subvol=home" "compress=zstd" ];
+    };
+
+    "/nix" = {
+      device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
+      fsType = "btrfs";
+      options = [ "subvol=nix" "compress=zstd" "noatime" ];
+    };
+
+    "/persist" = {
+      device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
+      fsType = "btrfs";
+      options = [ "subvol=persist" "compress=zstd" ];
+    };
+
+    "/var/log" = {
+      device = "/dev/disk/by-uuid/529700f1-0da2-4e1e-91bc-617c267df1dd";
+      fsType = "btrfs";
+      options = [ "subvol=log" "compress=zstd" ];
+      neededForBoot = true;
+    };
+
+    "/boot" = {
+      device = "/dev/disk/by-uuid/12CE-A600";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" "umask=0077" ];
+    };
  };

-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/de372c64-89a2-4bbe-ad57-926cdd98e97d";
-    fsType = "ext4";
-  };
-
-  boot.initrd.luks.devices."luks-60ba815c-481b-4932-94d2-b8d29465d3eb".device = "/dev/disk/by-uuid/60ba815c-481b-4932-94d2-b8d29465d3eb";
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/0954-2370";
-    fsType = "vfat";
-    options = [
-      "fmask=0022"
-      "dmask=0022"
-    ];
-  };
-
-  swapDevices = [];
+  swapDevices = [ ];

  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
  # (the default) this is the recommended approach. When using systemd-networkd it's
--- a/hosts/cnix/modules.nix
+++ b/hosts/cnix/modules.nix
@@ -51,8 +51,8 @@
      powerd.enable = true;
      samba.enable = false;
      sops = {
-        enable = true;
-        cnix.enable = true;
+        enable = false;
+        cnix.enable = false;
      };
      ssh.enable = true;
      udisks.enable = true;
--- a/system/boot/default.nix
+++ b/system/boot/default.nix
@@ -1,6 +1,7 @@
 {
  boot.loader = {
    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = true;
+    systemd-boot.graceful = true;
+    efi.canTouchEfiVariables = false;
  };
 }