From 2d9d93fe6884b2f5a4189f8ffa084a8aafec1274 Mon Sep 17 00:00:00 2001
From: Yan Lin <github@yanlincs.com>
Date: Sat, 14 Feb 2026 16:38:33 +0100
Subject: [PATCH] Add dedicated consume folder

---
 hosts/darwin/home-default.nix   | 5 +++--
 hosts/darwin/system-default.nix | 4 ++--
 hosts/nixos/nfss/home.nix       | 3 ++-
 hosts/nixos/nfss/system.nix     | 2 +-
 hosts/nixos/thinkpad/home.nix   | 1 +
 hosts/nixos/thinkpad/system.nix | 2 +-
 modules/syncthing.nix           | 1 +
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/hosts/darwin/home-default.nix b/hosts/darwin/home-default.nix
index 7d02562..d5658dd 100644
--- a/hosts/darwin/home-default.nix
+++ b/hosts/darwin/home-default.nix
@@ -22,6 +22,7 @@
     Credentials.enable = true;
     Documents.enable = true;
     Media.enable = true;
+    Consume.enable = true;
     Archive.enable = true;
   };
 
@@ -201,7 +202,7 @@
   home.file.".snipaste/config.ini".text = lib.generators.toINI {} {
     General = {
       language = "en";
-      last_save_folder = "/Users/yanlin/Documents/consume/dcim";
+      last_save_folder = "/Users/yanlin/Consume/dcim";
     };
     Hotkey = {
       snip = ''"100663345, 100663314"''; 
@@ -209,7 +210,7 @@
     };
     Output = {
       quick_save_notification = false;
-      quick_save_path = "/Users/yanlin/Documents/consume/dcim/Snipaste_$yyyy-MM-dd_HH-mm-ss$.png";
+      quick_save_path = "/Users/yanlin/Consume/dcim/Snipaste_$yyyy-MM-dd_HH-mm-ss$.png";
     };
     Snip = {
       ask_for_confirm_on_esc = false;
diff --git a/hosts/darwin/system-default.nix b/hosts/darwin/system-default.nix
index 6942529..e85a5fe 100644
--- a/hosts/darwin/system-default.nix
+++ b/hosts/darwin/system-default.nix
@@ -100,8 +100,8 @@
     };
 
     screencapture = {
-      disable-shadow = false;
-      location = "~/Documents/consume/dcim";
+      disable-shadow = true;
+      location = "~/Consume/dcim";
       type = "png";
       show-thumbnail = true;
     };
diff --git a/hosts/nixos/nfss/home.nix b/hosts/nixos/nfss/home.nix
index 772ffb0..51992d9 100644
--- a/hosts/nixos/nfss/home.nix
+++ b/hosts/nixos/nfss/home.nix
@@ -13,6 +13,7 @@
     Documents = { enable = true; maxAgeDays = 30; };
     Media = { enable = true; maxAgeDays = 7; };
     Archive = { enable = true; maxAgeDays = 30; };
+    Consume = { enable = true; maxAgeDays = 7; };
     DCIM = { enable = true; maxAgeDays = 7; path = "/mnt/essd/DCIM"; };
   };
 
@@ -21,7 +22,7 @@
     description = "Move files in dcim consume folder to DCIM";
     interval = "*-*-* *:00/15:00";
     commands = [
-      "photo-move -d /home/yanlin/Documents/consume/dcim /mnt/essd/DCIM"
+      "photo-move -d /home/yanlin/Consume/dcim /mnt/essd/DCIM"
     ];
   };
 
diff --git a/hosts/nixos/nfss/system.nix b/hosts/nixos/nfss/system.nix
index 626e5fd..fb32fce 100644
--- a/hosts/nixos/nfss/system.nix
+++ b/hosts/nixos/nfss/system.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./containers.nix
+    # ./containers.nix
     ./proxy.nix
     ../system-default.nix
     ../../../modules/vpn/tailscale.nix
diff --git a/hosts/nixos/thinkpad/home.nix b/hosts/nixos/thinkpad/home.nix
index 3286362..3aed2df 100644
--- a/hosts/nixos/thinkpad/home.nix
+++ b/hosts/nixos/thinkpad/home.nix
@@ -13,6 +13,7 @@
     Documents = { enable = true; maxAgeDays = 30; };
     Media = { enable = true; maxAgeDays = 7; };
     Archive = { enable = true; maxAgeDays = 30; };
+    Consume = { enable = true; maxAgeDays = 7; };
     DCIM = { enable = true; maxAgeDays = 7; path = "~/DCIM"; };
   };
   
diff --git a/hosts/nixos/thinkpad/system.nix b/hosts/nixos/thinkpad/system.nix
index 35d6f29..b63b0fd 100644
--- a/hosts/nixos/thinkpad/system.nix
+++ b/hosts/nixos/thinkpad/system.nix
@@ -191,7 +191,7 @@
   services.tailscale-custom.exitNode = true;
 
   services.borg-client-custom = {
-    enable = false;
+    enable = true;
     repositoryUrl = "ssh://borg-box/./thinkpad";
     backupPaths = [
       "/home/yanlin/Archive"
diff --git a/modules/syncthing.nix b/modules/syncthing.nix
index 39be8fb..cabe71a 100644
--- a/modules/syncthing.nix
+++ b/modules/syncthing.nix
@@ -43,6 +43,7 @@ in
       Documents = mkFolderOptions "Documents" { devices = pcDevices ++ serverDevices; };
       Media = mkFolderOptions "Media" { devices = lib.filter (d: d != "iphone") allDevices; };
       Archive = mkFolderOptions "Archive" {};
+      Consume = mkFolderOptions "Consume" {};
       DCIM = mkFolderOptions "DCIM" { devices = serverDevices; };
     };
     enableGui = lib.mkOption {