Compare commits
6 Commits
0dd8e27fcb
...
7d1ca1d174
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7d1ca1d174 | ||
|
|
3fcf02646a | ||
|
|
485a554e10 | ||
|
|
f02686b687 | ||
|
|
070695fa4d | ||
|
|
951d03e0b7 |
@@ -48,6 +48,7 @@
|
|||||||
./system-modules/postgres.nix
|
./system-modules/postgres.nix
|
||||||
./system-modules/nx2site/proxy.nix
|
./system-modules/nx2site/proxy.nix
|
||||||
./system-modules/nx2site/audiobookshelf.nix
|
./system-modules/nx2site/audiobookshelf.nix
|
||||||
|
# ./system-modules/nx2site/baikal.nix
|
||||||
./system-modules/nx2site/copyparty.nix
|
./system-modules/nx2site/copyparty.nix
|
||||||
./system-modules/nx2site/gitea.nix
|
./system-modules/nx2site/gitea.nix
|
||||||
./system-modules/nx2site/open-web-calendar.nix
|
./system-modules/nx2site/open-web-calendar.nix
|
||||||
|
|||||||
44
flake.lock
generated
44
flake.lock
generated
@@ -39,11 +39,11 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769711301,
|
"lastModified": 1769889994,
|
||||||
"narHash": "sha256-s7Vev+N5tH7Tzu/bAI4VKBTxy10XMJ5eLQlpSwvxUdo=",
|
"narHash": "sha256-uEn3WcpPHe3sMJMgIJ0XW3f4/+TRzZpNgv4vu5/gjmA=",
|
||||||
"owner": "9001",
|
"owner": "9001",
|
||||||
"repo": "copyparty",
|
"repo": "copyparty",
|
||||||
"rev": "22cdc0f8c98e6be3ef5573a273b78c0def853192",
|
"rev": "9b436eb52e5cfe7a0a8e59dd9f1a37351f3a2abd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -330,11 +330,11 @@
|
|||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769694617,
|
"lastModified": 1769965155,
|
||||||
"narHash": "sha256-sBndsTEWfHREb1bKdEy0RI0qShcVMgOVXguEdLMR7KA=",
|
"narHash": "sha256-SNj94JmMJ0duRNaZqThIky1bVcT3EJqwGFvYN7ZI+g0=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "c92fb5e85f4a5fd3a0f5ffb5892f6a61cfe1be2b",
|
"rev": "a0ec2e4daf8e508761f6bc53fc163fbb92ac7aa1",
|
||||||
"revCount": 6845,
|
"revCount": 6857,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland"
|
"url": "https://github.com/hyprwm/Hyprland"
|
||||||
@@ -720,11 +720,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-latest": {
|
"nixpkgs-latest": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769771309,
|
"lastModified": 1769978241,
|
||||||
"narHash": "sha256-idfbOonod6ZDmJ+Opfw5RKQDhqACvGw0AeQJ+QjpShU=",
|
"narHash": "sha256-VSbH5Ot7yuZxy/LOvbLo52+i2xnDl01tmMqfjTQM07I=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "35d85fc35d79b82a12497beb6027d5ae7e6372fd",
|
"rev": "149597f1631fffdeb1ff8fe3b6822615821ee562",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -752,11 +752,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769461804,
|
"lastModified": 1769789167,
|
||||||
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
"narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
|
"rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -831,11 +831,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769598131,
|
"lastModified": 1769900590,
|
||||||
"narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=",
|
"narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211",
|
"rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1046,11 +1046,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769469829,
|
"lastModified": 1769921679,
|
||||||
"narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=",
|
"narHash": "sha256-twBMKGQvaztZQxFxbZnkg7y/50BW9yjtCBWwdjtOZew=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff",
|
"rev": "1e89149dcfc229e7e2ae24a8030f124a31e4f24f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1137,11 +1137,11 @@
|
|||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769739141,
|
"lastModified": 1769971982,
|
||||||
"narHash": "sha256-lb0gPHeF82vPIrB5ksvf4MVEo0d4gLrsbTUKcPg/EMM=",
|
"narHash": "sha256-dc8lG9CxtrIk+tOsQx8TJKULQBG27Hoio4O4M/6CxFM=",
|
||||||
"owner": "sxyazi",
|
"owner": "sxyazi",
|
||||||
"repo": "yazi",
|
"repo": "yazi",
|
||||||
"rev": "dfdb235d74e096902f496b4300d4ad134e775ac7",
|
"rev": "6757fed5aa82bfdcd5ecd52e8f374dc286220cc0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -36,6 +36,6 @@
|
|||||||
tldr
|
tldr
|
||||||
w3m
|
w3m
|
||||||
which
|
which
|
||||||
yt-dlp
|
unstable.yt-dlp
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
22
system-modules/nx2site/baikal.nix
Normal file
22
system-modules/nx2site/baikal.nix
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
{ pkgs, ... }@all: with all; {
|
||||||
|
services.baikal = {
|
||||||
|
enable = true;
|
||||||
|
# pool =
|
||||||
|
user = "baikal";
|
||||||
|
group = "baikal";
|
||||||
|
package = pkgs.php.buildComposerProject2 (finalAttrs: {
|
||||||
|
pname = "baikal";
|
||||||
|
version = "0.10.1";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "sabre-io";
|
||||||
|
repo = "Baikal";
|
||||||
|
tag = "0.10.1";
|
||||||
|
hash = "sha256-YQQwTdwfHQZdUhO5HbScj/Bl8ype7TtPI3lHjvz2k04=";
|
||||||
|
};
|
||||||
|
# It doesn't provide a composer.lock file, we have to generate manually.
|
||||||
|
composerLock = ./composer.lock;
|
||||||
|
vendorHash = "sha256-dYg7cULL4gquR5EenA0lD9ZC9Ge4qNwFFDNhELKgSso=";
|
||||||
|
});
|
||||||
|
virtualHost = "baikal.${hyper.domain}";
|
||||||
|
};
|
||||||
|
}
|
||||||
3208
system-modules/nx2site/composer.lock
generated
Normal file
3208
system-modules/nx2site/composer.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -192,6 +192,10 @@
|
|||||||
# proxyWebsockets = true;
|
# proxyWebsockets = true;
|
||||||
# }; };
|
# }; };
|
||||||
# };
|
# };
|
||||||
|
# "baikal.${hyper.domain}" = {
|
||||||
|
# forceSSL = true;
|
||||||
|
# enableACME = true;
|
||||||
|
# };
|
||||||
"file.${hyper.domain}" = { # copyparty
|
"file.${hyper.domain}" = { # copyparty
|
||||||
listen = dl;
|
listen = dl;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
{ pkgs, ... }@all: with all;
|
|
||||||
{
|
|
||||||
environment.systemPackages = [
|
|
||||||
(pkgs.mkYarnPackage {
|
|
||||||
name = "rallly";
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "lukevella";
|
|
||||||
repo = "rallly";
|
|
||||||
rev = "v3.11.2";
|
|
||||||
hash = "sha256-ej6Y0ouiheoH6dSBWsSIW6qt9UvsLh9ODDQA5Fqt3zs=";
|
|
||||||
};
|
|
||||||
packageJson = ./package.json;
|
|
||||||
yarnLock = ./yarn.lock;
|
|
||||||
yarnNix = ./yarn.nix;
|
|
||||||
# patchPhase = /* shell */ ''
|
|
||||||
# cp ........ ?
|
|
||||||
# '';
|
|
||||||
})
|
|
||||||
];
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user