From f134165737a3ab039854a42d0a6135d6adb80a8b Mon Sep 17 00:00:00 2001 From: Jaculabilis Date: Tue, 20 Jun 2023 21:34:14 +0000 Subject: [PATCH] Add intake-sources --- flake.lock | 29 +++++++++++++++++++++++++---- flake.nix | 8 +++++++- machine/empyrean/default.nix | 1 + 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 51b89fa..33a3e3a 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1687221640, - "narHash": "sha256-JzREQQZPT+sEb7sHafJ4gXgyCImcZPhGBWhKwW0dgg0=", + "lastModified": 1687296400, + "narHash": "sha256-XY/piTamXRf3UxCmgZgLoUYWMFSV3W3dGEhr9VdSMEs=", "ref": "refs/heads/master", - "rev": "760781d6d95eb78b3ecf1256e4fa860848d5decb", - "revCount": 60, + "rev": "c5778513e2d19421d29291692f5a9d13a9dc1550", + "revCount": 64, "type": "git", "url": "ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git" }, @@ -55,6 +55,26 @@ "url": "ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git" } }, + "intake-sources": { + "inputs": { + "nixpkgs": [ + "nixpkgs-next" + ] + }, + "locked": { + "lastModified": 1687286801, + "narHash": "sha256-QoazlG8YZGaOdswfyy9mlllYzhILPLPrnDD2UorN9Dg=", + "ref": "refs/heads/master", + "rev": "a4883480ae278c874a9a16782bf233bf70b87243", + "revCount": 14, + "type": "git", + "url": "ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake-sources.git" + }, + "original": { + "type": "git", + "url": "ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake-sources.git" + } + }, "nixos-shell": { "inputs": { "nixpkgs": [ @@ -136,6 +156,7 @@ "inputs": { "flake-compat": "flake-compat", "intake": "intake", + "intake-sources": "intake-sources", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", "nixpkgs-next": "nixpkgs-next" diff --git a/flake.nix b/flake.nix index 8d27ba2..f1242a3 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,10 @@ inputs.nixpkgs.follows = "nixpkgs-next"; inputs.flake-compat.follows = "flake-compat"; }; + intake-sources = { + url = "git+ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake-sources.git"; + inputs.nixpkgs.follows = "nixpkgs-next"; + }; }; outputs = { @@ -25,6 +29,7 @@ flake-compat, nixos-wsl, intake, + intake-sources, }: { nixosConfigurations = { catacomb = nixpkgs.lib.nixosSystem { @@ -34,7 +39,8 @@ empyrean = nixpkgs-next.lib.nixosSystem { system = "x86_64-linux"; modules = [ - intake.nixosModules.intake + intake.nixosModules.default + intake-sources.nixosModules.default ./machine/empyrean ]; }; diff --git a/machine/empyrean/default.nix b/machine/empyrean/default.nix index deadc42..b44c825 100644 --- a/machine/empyrean/default.nix +++ b/machine/empyrean/default.nix @@ -146,6 +146,7 @@ services.intake = { listen = { addr = "10.22.20.1"; port = 5234; }; users.tvb.enable = true; + users.tvb.packages = [ pkgs.intakeSources ]; }; networking.firewall = {