chaos/nixfiles
1
0
Fork 0
Code Issues 2 Releases Activity

move to telegram-desktop

Browse source
This commit is contained in:
Chaos 2023-06-03 18:50:49 +01:00
parent c2d61489ac
commit 91fbfeedac
No known key found for this signature in database
7 changed files with 1256 additions and 1998 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -192,11 +192,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1685803539, "lastModified": 1685810707,
"narHash": "sha256-S/yHjHu4xrcuT9VyVPKWGPjOSYyY8hG9//1X6F8urpI=", "narHash": "sha256-5PrZFSsCT53aR+4ZjpPvXK9ZXwakuU33BX97q2T3BoY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "364559535aae66fbc459d5190b0feb264a619d06", "rev": "7814795910cc42a67ce45588d03e6517c3dc3596",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
home/apps/telegram.nix
View file

@ -1 +1,3 @@
{pkgs, ...}: {home.packages = with pkgs; [kotatogram-desktop];} {pkgs, ...}: {
home.packages = with pkgs; [telegram-desktop];
}

2
modules/nixos/secrets.nix
View file

@ -177,7 +177,7 @@ in {
} }
getGroup() { getGroup() {
stat --format "%U" "$1" 2>/dev/null stat --format "%G" "$1" 2>/dev/null
} }
getPermissions() { getPermissions() {

3190
overlay/piped/frontend/yarn.nix
View file

File diff suppressed because it is too large Load diff

22
overlay/piped/update.sh
View file

@ -16,26 +16,26 @@ json_set() {
# Frontend # Frontend
old_frontend_rev=$(json_get '.frontend.rev') old_frontend_rev=$(json_get '.frontend.rev')
new_frontend_rev=$(curl -L "https://api.github.com/repos/TeamPiped/Piped/commits" 2>/dev/null | jq ".[0].sha" -r) new_frontend_rev=$(curl -L "https://api.github.com/repos/TeamPiped/Piped/commits" 2>/dev/null | jq ".[0].sha" -r)
if [ "$new_frontend_rev" != "$old_frontend_rev" ]; then if [ "$new_frontend_rev" != "$old_frontend_rev" ] || [ "${FORCE_UPDATE-}" != "" ]; then
echo "Frontend is out of date. Updating..." echo "Frontend is out of date. Updating..."
json_set '.frontend.rev' "$new_frontend_rev" json_set '.frontend.rev' "$new_frontend_rev"
#new_frontend_sha256=$(nix-prefetch fetchFromGitHub --owner TeamPiped --repo Piped --rev "$new_frontend_rev") #new_frontend_sha256=$(nix-prefetch fetchFromGitHub --owner TeamPiped --repo Piped --rev "$new_frontend_rev")
#json_set '.frontend.sha256' "$new_frontend_sha256" #json_set '.frontend.sha256' "$new_frontend_sha256"
#TMP=$(mktemp -d) TMP=$(mktemp -d)
#pushd "$TMP" pushd "$TMP"
# git clone https://github.com/TeamPiped/Piped git clone https://github.com/TeamPiped/Piped
# pushd Piped pushd Piped
# git reset --hard "$new_frontend_rev" git reset --hard "$new_frontend_rev"
# yarn2nix > "${BASE_DIR}/frontend/yarn.nix" nix run "github:NixOS/nixpkgs/nixos-unstable#yarn2nix" > "${BASE_DIR}/frontend/yarn.nix"
# popd popd
#popd popd
fi fi
# Backend # Backend
old_backend_rev=$(json_get '.backend.rev') old_backend_rev=$(json_get '.backend.rev')
new_backend_rev=$(curl -L "https://api.github.com/repos/TeamPiped/Piped-Backend/commits" 2>/dev/null | jq ".[0].sha" -r) new_backend_rev=$(curl -L "https://api.github.com/repos/TeamPiped/Piped-Backend/commits" 2>/dev/null | jq ".[0].sha" -r)
if [ "$new_backend_rev" != "$old_backend_rev" ]; then if [ "$new_backend_rev" != "$old_backend_rev" ] || [ "${FORCE_UPDATE-}" != "" ]; then
echo "Backend is out of date. Updating..." echo "Backend is out of date. Updating..."
json_set '.backend.rev' "$new_backend_rev" json_set '.backend.rev' "$new_backend_rev"
#new_backend_sha256=$(nix-prefetch fetchFromGitHub --owner TeamPiped --repo Piped-Backend --rev "$new_backend_rev") #new_backend_sha256=$(nix-prefetch fetchFromGitHub --owner TeamPiped --repo Piped-Backend --rev "$new_backend_rev")
@ -45,7 +45,7 @@ fi
# Proxy # Proxy
old_proxy_rev=$(json_get '.proxy.rev') old_proxy_rev=$(json_get '.proxy.rev')
new_proxy_rev=$(curl -L "https://api.github.com/repos/TeamPiped/piped-proxy/commits" 2>/dev/null | jq ".[0].sha" -r) new_proxy_rev=$(curl -L "https://api.github.com/repos/TeamPiped/piped-proxy/commits" 2>/dev/null | jq ".[0].sha" -r)
if [ "$new_proxy_rev" != "$old_proxy_rev" ]; then if [ "$new_proxy_rev" != "$old_proxy_rev" ] || [ "${FORCE_UPDATE-}" != "" ]; then
echo "Proxy is out of date. Updating..." echo "Proxy is out of date. Updating..."
json_set '.proxy.rev' "$new_proxy_rev" json_set '.proxy.rev' "$new_proxy_rev"
#new_proxy_sha256=$(nix-prefetch fetchFromGitHub --owner TeamPiped --repo piped-proxy --rev "$new_proxy_rev") #new_proxy_sha256=$(nix-prefetch fetchFromGitHub --owner TeamPiped --repo piped-proxy --rev "$new_proxy_rev")

2
profiles/base/nix.nix
View file

@ -18,8 +18,6 @@
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ permittedInsecurePackages = [
# for kotatogram-desktop
"openssl-1.1.1t"
]; ];
}; };
overlays = [ overlays = [

28
profiles/gui/base/default.nix
View file

@ -1 +1,27 @@
{pkgs, ...}: {fonts.fonts = with pkgs; [comic-sans comic-code];} {pkgs, ...}: {
fonts = {
fonts = with pkgs; [comic-sans comic-code];
fontconfig = {
# For Telegram
localConf = ''
<match>
<test name="family"><string>Open Sans</string></test>
<edit name="family" mode="assign" binding="strong">
<string>Comic Sans MS</string>
</edit>
</match>
<match>
<test name="family"><string>Open Sans Semibold</string></test>
<edit name="family" mode="assign" binding="strong">
<string>Comic Sans MS:style=bold</string>
</edit>
</match>
'';
defaultFonts = {
serif = ["Comic Sans MS"];
sansSerif = ["Comic Sans MS"];
monospace = ["Comic Code"];
};
};
};
}