many changes

capibara.nix

@@ -23,6 +23,20 @@ in {
       neededForBoot = true;
     };
 
+    "/logs" = {
+      device = "/dev/mapper/root";
+      fsType = "btrfs";
+      options = [ "subvol=logs" "compress=zstd" ];
+      neededForBoot = true;
+    };
+
+    "/data" = {
+      device = "/dev/mapper/root";
+      fsType = "btrfs";
+      options = [ "subvol=data" "compress=zstd" ];
+      neededForBoot = true;
+    };
+
     "/nix" = {
       device = "/dev/mapper/root";
       fsType = "btrfs";

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1653153149,
-        "narHash": "sha256-8B/tWWZziFq4DqnAm9uO7M4Z4PNfllYg5+teX1e5yDQ=",
+        "lastModified": 1653340164,
+        "narHash": "sha256-t6BPApyasx6FOv2cEVyFBXvkEDrknyUe7bngMbNSBkA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "94780dd888881bf35165dfdd334a57ef6b14ead8",
+        "rev": "e66f0ff69a6c0698b35034b842c4b68814440778",
         "type": "github"
       },
       "original": {

home/neovim/common.nix

@@ -1,7 +1,14 @@
 { config, pkgs, ... }:
 
 {
-  home.packages = with pkgs; [ black jq sqlfluff nixfmt shfmt hlint ];
+  home.packages = with pkgs; [
+    black
+    jq
+    # sqlfluff
+    nixfmt
+    shfmt
+    hlint
+  ];
   programs.neovim = {
     enable = true;
     viAlias = true;

home/nixos-common.nix

@@ -42,7 +42,27 @@
     ./zsh
   ];
 
-  home.persistence."/persist/${config.home.homeDirectory}" = {
+  home.persistence = {
+    "/data/${config.home.homeDirectory}" = {
+      directories = [
+        "Audio"
+        "Calendars"
+        "Contacts"
+        "Documents"
+        "Downloads"
+        "Images"
+        "Maildir"
+        "Monero"
+        "Nextcloud"
+        "code"
+        "configs"
+        "misc"
+        "workspace"
+      ];
+      allowOther = true;
+    };
+
+    "/persist/${config.home.homeDirectory}" = {
       directories = [
         ".Slic3r"
         ".abook"
@@ -75,19 +95,6 @@
         ".vdirsyncer"
         ".walletwasabi"
         ".wine"
-      "Audio"
-      "Calendars"
-      "Contacts"
-      "Documents"
-      "Downloads"
-      "Images"
-      "Maildir"
-      "Monero"
-      "Nextcloud"
-      "code"
-      "configs"
-      "misc"
-      "workspace"
       ];
       files = [
         ".gnupg/pubring.kbx"
@@ -99,6 +106,7 @@
       ];
       allowOther = true;
     };
+  };
 
   home.sessionVariables = {
     EDITOR = "${pkgs.neovim}/bin/nvim";

nixos/common.nix

@@ -230,12 +230,12 @@
       fsType = "tmpfs";
       options = [ "defaults" "size=2G" "mode=755" ];
     };
-
   };
 
   swapDevices = [{ device = "/swap/swapfile"; }];
 
-  environment.persistence."/persist" = {
+  environment.persistence = {
+    "/persist" = {
       directories = [
         "/etc/NetworkManager/system-connections"
         "/etc/nixos"
@@ -244,7 +244,6 @@
         "/var/lib/docker"
         "/var/lib/libvirt"
         "/var/lib/systemd/coredump"
-      "/var/log"
       ];
       files = [
         "/etc/machine-id"
@@ -255,6 +254,9 @@
       ];
     };
 
+    "/logs" = { directories = [ "/var/log" ]; };
+  };
+
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   #