diff --git a/config/claude/default.nix b/config/claude/default.nix
index 916859f3c..55a812ca0 100644
--- a/config/claude/default.nix
+++ b/config/claude/default.nix
@@ -2,30 +2,36 @@
 {
   home.file.".claude/settings.json" = {
     source = ./settings.json;
+    force = true;
   };
 
   home.file.".claude/pushover.sh" = {
     source = ./pushover.sh;
     executable = true;
+    force = true;
   };
 
   home.file.".claude/notify.sh" = {
     source = ./notify.sh;
     executable = true;
+    force = true;
   };
 
   home.file.".claude/security.sh" = {
     source = ./security.sh;
     executable = true;
+    force = true;
   };
 
   home.file.".claude/statusline-git.sh" = {
     source = ./statusline-git.sh;
     executable = true;
+    force = true;
   };
 
   home.file.".claude/install-skills.sh" = {
     source = ./install-skills.sh;
     executable = true;
+    force = true;
   };
 }
diff --git a/config/cliproxyapi/default.nix b/config/cliproxyapi/default.nix
index 0a27d911d..76511e697 100644
--- a/config/cliproxyapi/default.nix
+++ b/config/cliproxyapi/default.nix
@@ -3,9 +3,11 @@
   # Template config - the service wrapper injects secrets and writes to config.yaml
   home.file.".cli-proxy-api/config.template.yaml" = {
     source = config.lib.file.mkOutOfStoreSymlink ./config.yaml;
+    force = true;
   };
   # Example config - required by cliproxyapi's object-backed config bootstrap
   home.file.".cli-proxy-api/config.example.yaml" = {
     source = config.lib.file.mkOutOfStoreSymlink ./config.yaml;
+    force = true;
   };
 }
diff --git a/config/crush/default.nix b/config/crush/default.nix
index 6a55d293c..e1dc303a7 100644
--- a/config/crush/default.nix
+++ b/config/crush/default.nix
@@ -2,5 +2,6 @@
 {
   home.file.".config/crush/crush.json" = {
     source = config.lib.file.mkOutOfStoreSymlink ./crush.json;
+    force = true;
   };
 }
diff --git a/config/direnv/default.nix b/config/direnv/default.nix
index 8928076af..b1966dabe 100644
--- a/config/direnv/default.nix
+++ b/config/direnv/default.nix
@@ -2,5 +2,6 @@
 {
   home.file.".config/direnv/direnvrc" = {
     source = config.lib.file.mkOutOfStoreSymlink ./direnvrc;
+    force = true;
   };
 }
diff --git a/config/factory/default.nix b/config/factory/default.nix
index 21d67e666..4d7aeacfd 100644
--- a/config/factory/default.nix
+++ b/config/factory/default.nix
@@ -2,5 +2,6 @@
 {
   home.file.".factory/config.json" = {
     source = config.lib.file.mkOutOfStoreSymlink ./config.json;
+    force = true;
   };
 }
diff --git a/config/hammerspoon/default.nix b/config/hammerspoon/default.nix
index c1188e92e..1461d8789 100644
--- a/config/hammerspoon/default.nix
+++ b/config/hammerspoon/default.nix
@@ -2,5 +2,6 @@
 {
   home.file.".hammerspoon/init.lua" = {
     source = config.lib.file.mkOutOfStoreSymlink ./init.lua;
+    force = true;
   };
 }
diff --git a/config/k3s/default.nix b/config/k3s/default.nix
index c16be96ff..c5fc15d81 100644
--- a/config/k3s/default.nix
+++ b/config/k3s/default.nix
@@ -8,6 +8,7 @@
   # k3s config file stored in home directory
   home.file.".config/k3s/config.yaml" = lib.mkIf pkgs.stdenv.isLinux {
     source = config.lib.file.mkOutOfStoreSymlink ./config.yaml;
+    force = true;
   };
 
   # Activation script to sync config to /etc/rancher/k3s/
diff --git a/config/karabiner/default.nix b/config/karabiner/default.nix
index 98af5ee00..78e7faa1e 100644
--- a/config/karabiner/default.nix
+++ b/config/karabiner/default.nix
@@ -2,5 +2,6 @@
 {
   home.file.".config/karabiner/karabiner.json" = {
     source = ./karabiner.json;
+    force = true;
   };
 }
diff --git a/config/opencode/default.nix b/config/opencode/default.nix
index 37c9761df..ed6d46d74 100644
--- a/config/opencode/default.nix
+++ b/config/opencode/default.nix
@@ -2,5 +2,6 @@
 {
   home.file.".config/opencode/opencode.jsonc" = {
     source = config.lib.file.mkOutOfStoreSymlink ./opencode.jsonc;
+    force = true;
   };
 }
diff --git a/config/serena/default.nix b/config/serena/default.nix
index ec503511c..c7f021f0a 100644
--- a/config/serena/default.nix
+++ b/config/serena/default.nix
@@ -2,5 +2,6 @@
 {
   home.file.".serena/serena_config.yml" = {
     source = config.lib.file.mkOutOfStoreSymlink ./serena_config.yml;
+    force = true;
   };
 }
diff --git a/config/starship/default.nix b/config/starship/default.nix
index 3e975fb34..91aa9fd8f 100644
--- a/config/starship/default.nix
+++ b/config/starship/default.nix
@@ -2,5 +2,6 @@
 {
   home.file.".config/starship.toml" = {
     source = config.lib.file.mkOutOfStoreSymlink ./starship.toml;
+    force = true;
   };
 }
diff --git a/home-manager/modules/tailscale/default.nix b/home-manager/modules/tailscale/default.nix
index 0bd379291..13002f503 100644
--- a/home-manager/modules/tailscale/default.nix
+++ b/home-manager/modules/tailscale/default.nix
@@ -139,8 +139,10 @@ in
     home.packages = [ cfg.tailscaled.package ];
 
     # Declare directories and files for home-manager
-    home.file.".local/share/tailscale/tailscaled.state".source =
-      config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.local/state/tailscale/tailscaled.state";
+    home.file.".local/share/tailscale/tailscaled.state" = {
+      source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.local/state/tailscale/tailscaled.state";
+      force = true;
+    };
 
     # Tailscaled service
     systemd.user.services.tailscaled = mkIf configEnabled {
diff --git a/home-manager/programs/ssh/default.nix b/home-manager/programs/ssh/default.nix
index 912eec47b..a825f1eb0 100644
--- a/home-manager/programs/ssh/default.nix
+++ b/home-manager/programs/ssh/default.nix
@@ -2,6 +2,7 @@
 {
   home.file.".ssh/rc" = {
     source = config.lib.file.mkOutOfStoreSymlink ./rc;
+    force = true;
   };
   programs.ssh = {
     enable = true;