diff --git a/flakes/opencode/flake.lock b/flakes/opencode/flake.lock
new file mode 100644
index 00000000..dca188cb
--- /dev/null
+++ b/flakes/opencode/flake.lock
@@ -0,0 +1,45 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1767364772,
+        "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "opencode": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1767823467,
+        "narHash": "sha256-RLTgTjLdPpekYWaNxXRQPBS3phnfBK1LvjSgieKcrfs=",
+        "owner": "sst",
+        "repo": "opencode",
+        "rev": "361a96267334fcfc524cc5377dbbfd7d92254f62",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sst",
+        "repo": "opencode",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "opencode": "opencode"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flakes/opencode/flake.nix b/flakes/opencode/flake.nix
new file mode 100644
index 00000000..7801ba2c
--- /dev/null
+++ b/flakes/opencode/flake.nix
@@ -0,0 +1,27 @@
+{
+  inputs = {
+    opencode.url = "github:sst/opencode";
+  };
+
+  outputs =
+    { opencode, ... }:
+    {
+      nixosModules = {
+        default =
+          {
+            pkgs,
+            ...
+          }:
+          {
+            environment.systemPackages = [
+              opencode.packages.${pkgs.system}.default
+            ];
+
+            environment.shellAliases = {
+              "oc" = "all_proxy='' http_proxy='' https_proxy='' opencode";
+              "occ" = "oc -c";
+            };
+          };
+      };
+    };
+}
diff --git a/hosts/juni/flake.nix b/hosts/juni/flake.nix
index d7648dd3..69359306 100644
--- a/hosts/juni/flake.nix
+++ b/hosts/juni/flake.nix
@@ -323,11 +323,6 @@
                         #!/usr/bin/env bash
                         set -euo pipefail
 
-                        if ! ${pkgs.iputils}/bin/ping -c1 -W2 1.1.1.1 &>/dev/null; then
-                          echo "No network access, skipping atuin login"
-                          exit 0
-                        fi
-
                         secret="/run/secrets/atuin-key-josh"
                         if [ ! -s "$secret" ]; then
                           echo "Missing atuin secret at $secret" >&2
diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock
index 36d11979..a060cc35 100644
--- a/hosts/lio/flake.lock
+++ b/hosts/lio/flake.lock
@@ -31,11 +31,11 @@
       },
       "locked": {
         "dir": "flakes/beszel",
-        "lastModified": 1767999509,
-        "narHash": "sha256-01YDV5RSAOQQnbV24wKAYsp/unUhMkbIIe3slBVmZvI=",
+        "lastModified": 1767740224,
+        "narHash": "sha256-7yUQUw/7IMTBHy2EtuDggE8+NwUN3vDH5fwiTQDIrsI=",
         "ref": "refs/heads/master",
-        "rev": "ef64efbb6e7d735d859830065a59374aa0496b70",
-        "revCount": 1113,
+        "rev": "4bc645061b8c3108fdb3ee92a61dbe3e98ecdaea",
+        "revCount": 1082,
         "type": "git",
         "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
       },
@@ -117,11 +117,11 @@
       },
       "locked": {
         "dir": "flakes/de_plasma",
-        "lastModified": 1767999509,
-        "narHash": "sha256-01YDV5RSAOQQnbV24wKAYsp/unUhMkbIIe3slBVmZvI=",
+        "lastModified": 1767740224,
+        "narHash": "sha256-7yUQUw/7IMTBHy2EtuDggE8+NwUN3vDH5fwiTQDIrsI=",
         "ref": "refs/heads/master",
-        "rev": "ef64efbb6e7d735d859830065a59374aa0496b70",
-        "revCount": 1113,
+        "rev": "4bc645061b8c3108fdb3ee92a61dbe3e98ecdaea",
+        "revCount": 1082,
         "type": "git",
         "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
       },
@@ -155,11 +155,11 @@
       },
       "locked": {
         "dir": "flakes/flatpaks",
-        "lastModified": 1767999509,
-        "narHash": "sha256-01YDV5RSAOQQnbV24wKAYsp/unUhMkbIIe3slBVmZvI=",
+        "lastModified": 1767740224,
+        "narHash": "sha256-7yUQUw/7IMTBHy2EtuDggE8+NwUN3vDH5fwiTQDIrsI=",
         "ref": "refs/heads/master",
-        "rev": "ef64efbb6e7d735d859830065a59374aa0496b70",
-        "revCount": 1113,
+        "rev": "4bc645061b8c3108fdb3ee92a61dbe3e98ecdaea",
+        "revCount": 1082,
         "type": "git",
         "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
       },
@@ -196,11 +196,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1767910483,
-        "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=",
+        "lastModified": 1767619900,
+        "narHash": "sha256-KpoCBPvwHz3gAQtIUkohE2InRBFK3r0/FM6z5SPWfvM=",
         "owner": "rycee",
         "repo": "home-manager",
-        "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c",
+        "rev": "6bd04da47cfb48dfd15eabf08364b78ad894f5b2",
         "type": "github"
       },
       "original": {
@@ -267,11 +267,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1767892417,
-        "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=",
+        "lastModified": 1767640445,
+        "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
         "type": "github"
       },
       "original": {
@@ -283,11 +283,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1767799921,
-        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
+        "lastModified": 1767325753,
+        "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
+        "rev": "64049ca74d63e971b627b5f3178d95642e61cedd",
         "type": "github"
       },
       "original": {
@@ -299,11 +299,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1767799921,
-        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
+        "lastModified": 1767480499,
+        "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
+        "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
         "type": "github"
       },
       "original": {
@@ -1226,15 +1226,35 @@
       }
     },
     "opencode": {
+      "inputs": {
+        "opencode": "opencode_2"
+      },
+      "locked": {
+        "dir": "flakes/opencode",
+        "lastModified": 1767824427,
+        "narHash": "sha256-DIe2X3sIuH3KJThL6xQ6sW3+c11DbvMMiCueM/8K7nU=",
+        "ref": "refs/heads/master",
+        "rev": "bcf5891fc4aaaa249af532124683f9bdb0d6cd10",
+        "revCount": 1107,
+        "type": "git",
+        "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
+      },
+      "original": {
+        "dir": "flakes/opencode",
+        "type": "git",
+        "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
+      }
+    },
+    "opencode_2": {
       "inputs": {
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1767994684,
-        "narHash": "sha256-UIijTI9ndnvhRC4tJDiSc19iMxeZZbDjkYTnfCbJpV8=",
+        "lastModified": 1767823467,
+        "narHash": "sha256-RLTgTjLdPpekYWaNxXRQPBS3phnfBK1LvjSgieKcrfs=",
         "owner": "sst",
         "repo": "opencode",
-        "rev": "563b4c33f2bace782403de88e60de4f9167a3c93",
+        "rev": "361a96267334fcfc524cc5377dbbfd7d92254f62",
         "type": "github"
       },
       "original": {
@@ -1421,11 +1441,11 @@
       },
       "locked": {
         "dir": "flakes/secrets",
-        "lastModified": 1767999509,
-        "narHash": "sha256-01YDV5RSAOQQnbV24wKAYsp/unUhMkbIIe3slBVmZvI=",
+        "lastModified": 1767740224,
+        "narHash": "sha256-7yUQUw/7IMTBHy2EtuDggE8+NwUN3vDH5fwiTQDIrsI=",
         "ref": "refs/heads/master",
-        "rev": "ef64efbb6e7d735d859830065a59374aa0496b70",
-        "revCount": 1113,
+        "rev": "4bc645061b8c3108fdb3ee92a61dbe3e98ecdaea",
+        "revCount": 1082,
         "type": "git",
         "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
       },
diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix
index ef10c580..b2ae02fc 100644
--- a/hosts/lio/flake.nix
+++ b/hosts/lio/flake.nix
@@ -18,8 +18,9 @@
     beszel.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/beszel";
     # de_plasma.url = "path:../../flakes/de_plasma";
     de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma";
+    # opencode.url = "path:../../flakes/opencode";
+    opencode.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/opencode";
 
-    opencode.url = "github:sst/opencode";
     ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
   };
 
@@ -33,6 +34,7 @@
       beszel,
       ros_neovim,
       nixpkgs-unstable,
+      opencode,
       ...
     }@inputs:
     let
@@ -74,6 +76,7 @@
               ({
                 ringofstorms-nvim.includeAllRuntimeDependencies = true;
               })
+              inputs.opencode.nixosModules.default
               flatpaks.nixosModules.default
 
               common.nixosModules.essentials
@@ -95,18 +98,6 @@
               common.nixosModules.more_filesystems
 
               inputs.secrets-bao.nixosModules.default
-              (
-                { pkgs, ... }:
-                {
-                  environment.systemPackages = [
-                    inputs.opencode.packages.${pkgs.system}.default
-                  ];
-                  environment.shellAliases = {
-                    "oc" = "all_proxy='' http_proxy='' https_proxy='' opencode";
-                    "occ" = "oc -c";
-                  };
-                }
-              )
               (
                 { inputs, lib, ... }:
                 let