Merge branch 'main' of codeberg.org:muon/home

This commit is contained in:
muon 2026-02-26 09:54:02 +00:00
commit 8d9231608c
3 changed files with 63 additions and 41 deletions

View file

@ -10,6 +10,7 @@ _hr_usage() {
echo " call Call a Cloud Run service route"
echo " cf Call a Cloud Function"
echo " init py Initialize a python devenv environment (git-ignored)"
echo " init go Initialize a go devenv environment (git-ignored)"
echo " freeze Freeze dependencies to requirements.txt"
}
@ -52,7 +53,7 @@ _hr_add_ignores() {
_hr_py_files() {
cat <<EOF >devenv.nix
{pkgs, ...}: {
packages = [ pkgs.google-cloud-sdk ];
packages = [ pkgs.google-cloud-sdk pkgs.libpq ];
languages.python = {
enable = true;
@ -137,6 +138,16 @@ in {
EOF
}
_hr_go_files() {
cat <<EOF >devenv.nix
{pkgs, ...}: {
languages.go = {
enable = true;
};
}
EOF
}
_hr_init_base() {
local name="$1"
local func="$2"
@ -186,6 +197,10 @@ _hr_init_cpp() {
cp compile_commands.json ..
}
_hr_init_go() {
_hr_init_base "Go" _hr_go_files
}
_hr_freeze() {
local extra_index_url="https://europe-west1-python.pkg.dev/mk2-prod/python-packages/simple/"
@ -376,6 +391,8 @@ hr() {
_hr_init_py
elif [ "$1" = "init" ] && [ "$2" = "rs" ]; then
_hr_init_rs
elif [ "$1" = "init" ] && [ "$2" = "go" ]; then
_hr_init_go
elif [ "$1" = "init" ] && [ "$2" = "cpp" ]; then
_hr_init_cpp
elif [ "$1" = "freeze" ]; then

View file

@ -1,5 +1,9 @@
{ pkgs, lib, config, ... }:
let
{
pkgs,
lib,
config,
...
}: let
inherit (lib) types mkOption mkEnableOption;
cfg = config.mods.server.search;
port = config.mods.server.nginx.ports.search;
@ -20,22 +24,23 @@ in {
server.bind_address = "0.0.0.0";
server.secret_key = "temporary-before-sops";
enabled_plugins = [ "Hostnames plugin" "Tracker URL remover" ];
hostnames.remove = [ "(.*.)?facebook.com$" ];
enabled_plugins = ["Hostnames plugin" "Tracker URL remover"];
hostnames.remove = ["(.*.)?facebook.com$"];
hostnames.replace = {
# Self-hosted
"(.*.)?reddit.com$" = "reddit.muon.host";
# "(.*.)?reddit.com$" = "reddit.muon.host";
# "(.*.)?youtube.com$" = "videos.muon.host"; # TODO not working
# External
"(.*.)?youtube.com$" = "invidious.nerdvpn.de";
"(.*.)?imdb.com$" = "libremdb.iket.me";
"(.*.)?imgur.com$" = "rimgo.privacyredirect.com";
"(.*.)?twitch.com$" = "safetwitch.privacyredirect.com";
"(.*.)?wikipedia.com$" = "wikiless.privacyredirect.com";
"(.*.)?medium.com$" = "scribe.privacyredirect.com";
"(.*.)?stackoverflow.com$" = "anonymousoverflow.privacyredirect.com";
"(.*.)?github.com$" = "gothub.privacyredirect.com";
"(.*.)?reddit.com$" = "old.reddit.com";
# "(.*.)?youtube.com$" = "invidious.nerdvpn.de";
# "(.*.)?imdb.com$" = "libremdb.iket.me";
# "(.*.)?imgur.com$" = "rimgo.privacyredirect.com";
# "(.*.)?twitch.com$" = "safetwitch.privacyredirect.com";
# "(.*.)?wikipedia.com$" = "wikiless.privacyredirect.com";
# "(.*.)?medium.com$" = "scribe.privacyredirect.com";
# "(.*.)?stackoverflow.com$" = "anonymousoverflow.privacyredirect.com";
# "(.*.)?github.com$" = "gothub.privacyredirect.com";
};
};
};