diff --git a/flake.lock b/flake.lock index cfd08356..85f0929f 100644 --- a/flake.lock +++ b/flake.lock @@ -452,18 +452,16 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1730834904, - "narHash": "sha256-qr4KU1WMp3i1tH5oc4aGwufT0H24rTu8WGlgoW8VQ9M=", - "owner": "daeuniverse", - "repo": "flake.nix", - "rev": "fa0fbca1f3aa36bbc60c544eddda0bb9121f91b6", - "type": "github" + "dirtyRev": "659d11907d8397ad6fe958c3a72deac36ea57058-dirty", + "dirtyShortRev": "659d119-dirty", + "lastModified": 1730911664, + "narHash": "sha256-bI+Z8ymtusJoeUJdEPi3YFLGHNVzzARuzAQT705Wncg=", + "type": "git", + "url": "file:///home/elen/Src/flake.nix" }, "original": { - "owner": "daeuniverse", - "ref": "dev", - "repo": "flake.nix", - "type": "github" + "type": "git", + "url": "file:///home/elen/Src/flake.nix" } }, "devenv": { @@ -647,11 +645,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -2218,11 +2216,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723372011, - "narHash": "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=", + "lastModified": 1730389079, + "narHash": "sha256-g/CJ/KKe5MGsVx1oCBl0F9aCdcNSDeOw8H7e5QDGa2c=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "8802412b8747633e9d80639897e4d58fa6290909", + "rev": "7f9159a16584ee86eed077c8a73e845690b7d513", "type": "github" }, "original": { @@ -2645,7 +2643,7 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1730645705, + "lastModified": 1730504152, "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "type": "tarball", "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" @@ -3057,11 +3055,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -3713,11 +3711,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1724159077, - "narHash": "sha256-AddE0u6WbA5R7uxumw1Ka0oG5dv3cTtN0ppO/M/e0cg=", + "lastModified": 1730302582, + "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "1064a45e81a4e19cda98741b71219d9f4f136900", + "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bf2289d2..8f7b489d 100755 --- a/flake.nix +++ b/flake.nix @@ -200,7 +200,8 @@ url = "github:tadfisher/android-nixpkgs"; }; # path:/home/riro/Src/flake.nix - dae.url = "github:daeuniverse/flake.nix/dev"; + # dae.url = "github:daeuniverse/flake.nix/dev"; + dae.url = "/home/elen/Src/flake.nix"; nixyDomains.url = "github:oluceps/nixyDomains"; nixyDomains.flake = false; nuenv.url = "github:DeterminateSystems/nuenv"; diff --git a/hosts/kaambl/default.nix b/hosts/kaambl/default.nix index a4a98aeb..cb5c5120 100644 --- a/hosts/kaambl/default.nix +++ b/hosts/kaambl/default.nix @@ -27,7 +27,7 @@ withSystem "x86_64-linux" ( "self" "fenix" "nuenv" - + "dae" "berberman" ]); }; diff --git a/hosts/kaambl/spec.nix b/hosts/kaambl/spec.nix index cfd1ac05..44f7406d 100644 --- a/hosts/kaambl/spec.nix +++ b/hosts/kaambl/spec.nix @@ -69,6 +69,7 @@ "--edns-addr=211.140.13.188" "-l" "127.0.0.1" + "--ipv6-disabled" "--quic-port=853" "--https-port=843" "--http3" @@ -124,10 +125,10 @@ configFile = config.vaultix.secrets.hyst-us-cli.path; enable = true; }; - abhoth = { - enable = true; - configFile = config.vaultix.secrets.hyst-la-cli.path; - }; + # abhoth = { + # enable = true; + # configFile = config.vaultix.secrets.hyst-la-cli.path; + # }; yidhra = { enable = true; configFile = config.vaultix.secrets.hyst-hk-cli.path; diff --git a/repack/dae.nix b/repack/dae.nix index 2fc86951..714b2697 100644 --- a/repack/dae.nix +++ b/repack/dae.nix @@ -10,7 +10,7 @@ reIf { enable = true; disableTxChecksumIpGeneric = false; configFile = config.vaultix.secrets.dae.path; - # package = pkgs.dae-unstable; + package = pkgs.dae-unstable; assetsPath = toString ( pkgs.symlinkJoin { name = "dae-assets-nixy"; diff --git a/sec/dae.age b/sec/dae.age index d2ba020b..381e84c4 100644 Binary files a/sec/dae.age and b/sec/dae.age differ diff --git a/sec/rekeyed/eihort/b067232104ceacc8fb452ce27bbf6cee89eacbe6e732687087845b56efec8fef b/sec/rekeyed/eihort/b067232104ceacc8fb452ce27bbf6cee89eacbe6e732687087845b56efec8fef new file mode 100644 index 00000000..c5e09574 Binary files /dev/null and b/sec/rekeyed/eihort/b067232104ceacc8fb452ce27bbf6cee89eacbe6e732687087845b56efec8fef differ diff --git a/sec/rekeyed/eihort/d11508d9bd0ea23941b3d3983a12fe78c1d4540fc4db975b8f0bd27f625d6139 b/sec/rekeyed/eihort/d11508d9bd0ea23941b3d3983a12fe78c1d4540fc4db975b8f0bd27f625d6139 deleted file mode 100644 index ba32bd04..00000000 Binary files a/sec/rekeyed/eihort/d11508d9bd0ea23941b3d3983a12fe78c1d4540fc4db975b8f0bd27f625d6139 and /dev/null differ diff --git a/sec/rekeyed/hastur/23d2fb02af89951c2ff71a546149faf3697ceb1cb4895ee9d7dd08d453b518a2 b/sec/rekeyed/hastur/23d2fb02af89951c2ff71a546149faf3697ceb1cb4895ee9d7dd08d453b518a2 new file mode 100644 index 00000000..35c2394f Binary files /dev/null and b/sec/rekeyed/hastur/23d2fb02af89951c2ff71a546149faf3697ceb1cb4895ee9d7dd08d453b518a2 differ diff --git a/sec/rekeyed/hastur/71d539fec6392d60cca61f4be66415754db6776dc0274d5fdde6892fe50bc855 b/sec/rekeyed/hastur/71d539fec6392d60cca61f4be66415754db6776dc0274d5fdde6892fe50bc855 deleted file mode 100644 index 3346ac35..00000000 Binary files a/sec/rekeyed/hastur/71d539fec6392d60cca61f4be66415754db6776dc0274d5fdde6892fe50bc855 and /dev/null differ diff --git a/sec/rekeyed/kaambl/40e124a9eccb40512fd11588c273725b09fef67ecac3309f348ad1575efe933c b/sec/rekeyed/kaambl/40e124a9eccb40512fd11588c273725b09fef67ecac3309f348ad1575efe933c deleted file mode 100644 index f9c8940c..00000000 Binary files a/sec/rekeyed/kaambl/40e124a9eccb40512fd11588c273725b09fef67ecac3309f348ad1575efe933c and /dev/null differ diff --git a/sec/rekeyed/kaambl/ee3bf9077fad69bc5c5e0e6ab89f91b5fd177806a12b5be9a26229eb313bea74 b/sec/rekeyed/kaambl/ee3bf9077fad69bc5c5e0e6ab89f91b5fd177806a12b5be9a26229eb313bea74 new file mode 100644 index 00000000..2a5d0761 Binary files /dev/null and b/sec/rekeyed/kaambl/ee3bf9077fad69bc5c5e0e6ab89f91b5fd177806a12b5be9a26229eb313bea74 differ