From 0494fb336fe58d1ef102331a7ffb3f21ce8b59cf Mon Sep 17 00:00:00 2001 From: tuxcoder Date: Thu, 14 Dec 2023 22:51:47 +0100 Subject: [PATCH] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-utils': 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12) → 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5e4c2ada4fcd54b99d56d7bd62f384511a7e2593' (2023-10-11) → 'github:NixOS/nixpkgs/cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7' (2023-12-12) • Updated input 'tuxpkgs': 'git+ssh://git@git.o-g.at/nixpkg/tuxpkgs.git?ref=refs/heads/master&rev=a25f5792a256beaed2a9f944fccdea8ea7a8d44b' (2023-10-07) → 'git+ssh://git@git.o-g.at/nixpkg/tuxpkgs.git?ref=refs/heads/master&rev=b77ada84c29fc587b24b4ca838a0280272e654da' (2023-12-10) --- flake.lock | 22 +++++++++++----------- flake.nix | 8 ++++++-- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 228a66f..7dcd434 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -52,16 +52,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697059129, - "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", + "lastModified": 1702346276, + "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", + "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "nixos-23.11", "type": "indirect" } }, @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1696700871, - "narHash": "sha256-9VFEJEfnfnCS1+kLznxd+OiDYdMnLP00+XR53iPfnK4=", + "lastModified": 1702224561, + "narHash": "sha256-kA++rUce3EHqvW3SqLf4RdaP/guKD4/un5vjlr2rZCI=", "ref": "refs/heads/master", - "rev": "a25f5792a256beaed2a9f944fccdea8ea7a8d44b", - "revCount": 6, + "rev": "b77ada84c29fc587b24b4ca838a0280272e654da", + "revCount": 8, "type": "git", "url": "ssh://git@git.o-g.at/nixpkg/tuxpkgs.git" }, diff --git a/flake.nix b/flake.nix index a7077fd..a48e9b4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Lenticular cloud interface"; inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs.url = "nixpkgs/nixos-23.11"; flake-utils.url = "github:numtide/flake-utils"; flake-compat = { # for shell.nix url = "github:edolstra/flake-compat"; @@ -52,12 +52,16 @@ services.lenticular-cloud = { enable = true; domain = "example.com"; + service_domain = "account.example.com"; }; services.ory-hydra = { enable = true; admin_domain = "admin-hydra.local"; + public_domain = "public-hydra.local"; + }; + networking.hosts = { + "::1" = [ "admin-hydra.local" "public-hydra.local" "account.example.com" ]; }; - networking.hosts = {"::1" = [ "admin-hydra.local" ]; }; services.getty.autologinUser = "root"; virtualisation.qemu.options = ["-vga none"]; })