diff --git a/esphomes/.esphome/esphome.json b/esphomes/.esphome/esphome.json deleted file mode 100644 index 7d5f004e..00000000 --- a/esphomes/.esphome/esphome.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "storage_version": 1, - "cookie_secret": "01549d59c31ba18263ed0136121dafffb05a163935286f08a145ae33238cc4fbc2b7b123e65af03de968683ee133707f87ffdf750299417375c26b87ec00f1ef", - "last_update_check": null, - "remote_version": null -} diff --git a/nixos/systems/koishi.nix b/nixos/systems/koishi.nix index c156502d..d5edf1be 100644 --- a/nixos/systems/koishi.nix +++ b/nixos/systems/koishi.nix @@ -12,7 +12,7 @@ config = { programs.ssh.extraConfig = '' Host daiyousei-build - HostName daiyousei.inskip.me + HostName ${meta.tailnet.daiyousei.ipv4} Port 62954 User root ''; diff --git a/outputs.nix b/outputs.nix index 7410ae73..8813606c 100644 --- a/outputs.nix +++ b/outputs.nix @@ -4,18 +4,14 @@ bootstrapPkgs = import ./overlays { inherit inputs system; }; inherit (pkgs) lib; - patchedInputs = inputs // { + patchedInputs = inputs /*// { nixpkgs = bootstrapPkgs.applyPatches { name = "nixpkgs"; src = inputs.nixpkgs; - patches = [ (bootstrapPkgs.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/180469.patch"; - sha256 = "sha256-uxgx5fLB5450EgqP7OxETD5SKDd4l5qhTFzU/6azPZA="; - }) - + patches = [ ]; }; - } // { darwin = bootstrapPkgs.applyPatches { + }*/ // { darwin = bootstrapPkgs.applyPatches { name = "darwin"; src = inputs.darwin; patches = [ (bootstrapPkgs.fetchpatch { diff --git a/tf b/tf index 4b5bebfd..8677c775 160000 --- a/tf +++ b/tf @@ -1 +1 @@ -Subproject commit 4b5bebfd4f658e7e0722cd7e623103b44ec8b5b5 +Subproject commit 8677c775dad6c88703793030281502c755cfff3b