chore(deps): lock file maintenance

flake.lock

@@ -41,11 +41,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722987190,
+        "lastModified": 1722087241,
-        "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=",
+        "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90",
+        "rev": "8c50662509100d53229d4be607f1a3a31157fa12",
         "type": "github"
       },
       "original": {
@@ -57,11 +57,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1723175592,
+        "lastModified": 1722062969,
-        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
+        "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
+        "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
         "type": "github"
       },
       "original": {

home/mail/default.nix

@@ -28,7 +28,7 @@ let
       showSignature = "append";
     };
     aerc = {
-      enable = false;
+      enable = true;
       extraAccounts = {
         pgp-opportunistic-encrypt = true;
         pgp-autosign = true;
@@ -84,7 +84,7 @@ in {
 
   programs.password-store.enable = true;
   programs.aerc = {
-    enable = false;
+    enable = true;
     extraConfig = builtins.readFile ./aerc/aerc.conf;
     /* { */
       /* general = { */

machines/morpheus.nix

@@ -15,7 +15,6 @@ inputs.nixpkgs.lib.nixosSystem {
       nixpkgs.overlays = [ overlay-unstable ];
     })
     (import ./common.nix inputs)
-    (import ./morpheus/btrbk.nix inputs)
     (import ./dev.nix inputs)
     (import ./entertainment.nix inputs)
     (import ./office.nix inputs)

machines/morpheus/btrbk.nix

@@ -1,69 +0,0 @@
-{ ... }: {
-  services.btrbk = {
-    instances = {
-      /*
-      home = {
-        settings = {
-          snapshot_preserve = "24h 14d 4w 12m";
-          snapshot_preserve_min = "latest";
-
-          # don't auto cleanup target
-          target_preserve_min = "all";
-
-          volume."/" = {
-            snapshot_dir = ".btrbk";
-            subvolume = {
-              home = {
-                snapshot_create = "always";
-              };
-            };
-            target = "/run/media/me/backup/morpheus";
-          };
-        };
-      };
-      */
-
-      # local snapshots:
-      # - create hourly
-      # - keep hourly for 4 days and daily forever
-      home_local = {
-        onCalendar = "hourly";
-        settings = {
-          snapshot_preserve = "96h *d";
-          snapshot_preserve_min = "latest";
-          volume."/" = {
-            snapshot_dir = "/home/.btrbk";
-            subvolume.home = {
-              snapshot_create = "always";
-            };
-          };
-        };
-      };
-
-      # backup snapshots to backup drive
-      # - keep all hourly and the last 14 days of daily snapshots on the local disk
-      # - keep 14 daily, 8 weekly and all monthly snapshots on the backup drive
-      # - don't create new snapshots
-      # - TODO: trigger on mount
-      home_external = {
-        # disable systemd timer
-        onCalendar = null;
-        settings = {
-          snapshot_preserve = "*h 14d";
-          snapshot_preserve_min = "latest";
-
-          target_preserve = "14d 8w *m";
-          #target_preserve_min = "all";
-
-          volume."/" = {
-            snapshot_dir = "/home/.btrbk";
-            subvolume.home = {
-              snapshot_create = "no";
-            };
-            target = "/run/media/me/backup/morpheus";
-          };
-        };
-      };
-    };
-  };
-}