Compare commits
No commits in common. "b34231217adbf699f0ee7300721b246ce3903ec3" and "a39395a027f32096b4fa2767e0f67277ef753c6a" have entirely different histories.
b34231217a
...
a39395a027
4 changed files with 6 additions and 23 deletions
15
flake.nix
15
flake.nix
|
@ -61,21 +61,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemd.services.watcharr = {
|
|
||||||
description = "Watcharr";
|
|
||||||
after = [ "network.target" ];
|
|
||||||
environment = {
|
|
||||||
PORT = "3005";
|
|
||||||
WATCHARR_DATA = "/var/lib/watcharr";
|
|
||||||
};
|
|
||||||
serviceConfig = {
|
|
||||||
DynamicUser = true;
|
|
||||||
StateDirectory = "watcharr";
|
|
||||||
ExecStart = "${self.packages.x86_64-linux.watcharr}/bin/Watcharr";
|
|
||||||
PrivateTmp = true;
|
|
||||||
};
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
./systems/LoutreOS/configuration.nix
|
./systems/LoutreOS/configuration.nix
|
||||||
];
|
];
|
||||||
|
|
|
@ -11,18 +11,18 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "1.41.0";
|
version = "1.39.0";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sbondCo";
|
owner = "sbondCo";
|
||||||
repo = "Watcharr";
|
repo = "Watcharr";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-ZvCxgfZZ9pbp+NvH+IhWphJWnAwgAH0x/REPd/XxJ70=";
|
sha256 = "sha256-40XLYc1ub2Qzf8r9g+Ay8Y8CAHYU+P9CI60heLAuQkE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
frontend = buildNpmPackage {
|
frontend = buildNpmPackage {
|
||||||
pname = "watcharr-ui";
|
pname = "watcharr-ui";
|
||||||
inherit version src;
|
inherit version src;
|
||||||
npmDepsHash = "sha256-73paI0y4QyzkEnU99f1HeLD/hW8GP3F9N8tGGQnloH8=";
|
npmDepsHash = "sha256-sigkeK1bLbZfOU8756yLt5avqnOJWC4t4TnV6EvFTPY=";
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
cp -r build $out
|
cp -r build $out
|
||||||
|
@ -37,15 +37,14 @@ buildGoModule {
|
||||||
|
|
||||||
src = src + "/server";
|
src = src + "/server";
|
||||||
|
|
||||||
vendorHash = "sha256-86pFpS8ZSj+c7vwn0QCwzXlvVYJIf3SBj4X81zlwBWQ=";
|
vendorHash = "sha256-vmroCetQc1Ix65B2Br33lyWt0FwGeQXMoD5fLinQg28=";
|
||||||
|
|
||||||
# Inject frontend assets into go embed
|
# Inject frontend assets into go embed
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
# rm -rf ui
|
# rm -rf ui
|
||||||
# ln -s ${frontend} ui
|
# ln -s ${frontend} ui
|
||||||
substituteInPlace watcharr.go \
|
substituteInPlace watcharr.go \
|
||||||
--replace-fail ui/index.js ${frontend}/index.js \
|
--replace-fail ui/index.js ${frontend}/index.js
|
||||||
--replace-fail \"127.0.0.1:3000\" "\"127.0.0.1:\"+os.Getenv(\"PORT\")"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ pkgs.makeWrapper ];
|
buildInputs = [ pkgs.makeWrapper ];
|
||||||
|
|
|
@ -352,7 +352,6 @@ in
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
};
|
};
|
||||||
"watcharr.nyanlout.re" = simpleReverse 3080;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@
|
||||||
fzf
|
fzf
|
||||||
file
|
file
|
||||||
ncdu
|
ncdu
|
||||||
yt-dlp
|
youtube-dl
|
||||||
tldr
|
tldr
|
||||||
starship
|
starship
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue