1
1
Fork 0

Add intake-sources

This commit is contained in:
Jaculabilis 2023-06-20 21:34:14 +00:00
parent cd4cf9107c
commit f134165737
3 changed files with 33 additions and 5 deletions

View File

@ -42,11 +42,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1687221640, "lastModified": 1687296400,
"narHash": "sha256-JzREQQZPT+sEb7sHafJ4gXgyCImcZPhGBWhKwW0dgg0=", "narHash": "sha256-XY/piTamXRf3UxCmgZgLoUYWMFSV3W3dGEhr9VdSMEs=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "760781d6d95eb78b3ecf1256e4fa860848d5decb", "rev": "c5778513e2d19421d29291692f5a9d13a9dc1550",
"revCount": 60, "revCount": 64,
"type": "git", "type": "git",
"url": "ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git" "url": "ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git"
}, },
@ -55,6 +55,26 @@
"url": "ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git" "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": { "nixos-shell": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -136,6 +156,7 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"intake": "intake", "intake": "intake",
"intake-sources": "intake-sources",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-next": "nixpkgs-next" "nixpkgs-next": "nixpkgs-next"

View File

@ -16,6 +16,10 @@
inputs.nixpkgs.follows = "nixpkgs-next"; inputs.nixpkgs.follows = "nixpkgs-next";
inputs.flake-compat.follows = "flake-compat"; 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 = { outputs = {
@ -25,6 +29,7 @@
flake-compat, flake-compat,
nixos-wsl, nixos-wsl,
intake, intake,
intake-sources,
}: { }: {
nixosConfigurations = { nixosConfigurations = {
catacomb = nixpkgs.lib.nixosSystem { catacomb = nixpkgs.lib.nixosSystem {
@ -34,7 +39,8 @@
empyrean = nixpkgs-next.lib.nixosSystem { empyrean = nixpkgs-next.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
intake.nixosModules.intake intake.nixosModules.default
intake-sources.nixosModules.default
./machine/empyrean ./machine/empyrean
]; ];
}; };

View File

@ -146,6 +146,7 @@
services.intake = { services.intake = {
listen = { addr = "10.22.20.1"; port = 5234; }; listen = { addr = "10.22.20.1"; port = 5234; };
users.tvb.enable = true; users.tvb.enable = true;
users.tvb.packages = [ pkgs.intakeSources ];
}; };
networking.firewall = { networking.firewall = {