muon/flake
1
0
Fork 0
mirror of https://codeberg.org/muon/home.git synced 2026-03-08 03:25:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

54
flake.lock generated
View file

@ -233,11 +233,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770586272, "lastModified": 1771188132,
"narHash": "sha256-Ucci8mu8QfxwzyfER2DQDbvW9t1BnTUJhBmY7ybralo=", "narHash": "sha256-qLXxN/tPrZtnekaLBQuVtxQfvqqs5cT5WbyH4zZaTGI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b1f916ba052341edc1f80d4b2399f1092a4873ca", "rev": "ae8003d8b61d0d373e7ca3da1a48f9c870d15df9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -275,11 +275,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769872935, "lastModified": 1771102945,
"narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,11 +350,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1768904356, "lastModified": 1771150922,
"narHash": "sha256-TIG8J+Or8nOydy8TztvtIshnprlf1q6XDIJnopLtMlA=", "narHash": "sha256-+oQJun4CFDlOQRocbZpqQDj7agoy56/4ZjT1oUR7NOs=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "d95b25a4dd6da2a1dfeaaf66163d0a281a8270e9", "rev": "96045e886ba0dd45b27590e7c0c6e77bbb54033d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -387,11 +387,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765267181, "lastModified": 1771130777,
"narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "rev": "efec7aaad8d43f8e5194df46a007456093c40f88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +438,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1768305791, "lastModified": 1771008912,
"narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -470,11 +470,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1770562336, "lastModified": 1771008912,
"narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -573,11 +573,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770526836, "lastModified": 1771166946,
"narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=", "narHash": "sha256-UFc4lfGBr+wJmwgDGJDn1cVD6DTr0/8TdronNUiyXlU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d", "rev": "2d0cf89b4404529778bc82de7e42b5754e0fe4fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -626,11 +626,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1770587906, "lastModified": 1770914701,
"narHash": "sha256-N9ZTG3ia7l4iQO+9JlOj+sX4yu6gl7a3aozrlhSIJwQ=", "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "72e6483a88d51471a6c55e1d43e7ed2bc47a76a4", "rev": "db03fed72e5ca02be34e1d24789345a943329738",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -794,11 +794,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770568363, "lastModified": 1771222275,
"narHash": "sha256-RJ/C24wN7LyuMmBgvIutA/PqXXceZtJtUCuZSaTjF/4=", "narHash": "sha256-df+Un2QnDj95MQxmsnopCtSy/meWO2RDHuMGAqq3nlc=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "2ada8a826ea88512387a5a17ee96f16369bcdd80", "rev": "a20f5d0c6454b5b24a497afb280427c9af33a0be",
"type": "github" "type": "github"
}, },
"original": { "original": {

19
modules/home/terminal/hr/hr.sh
View file

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

31
modules/nixos/server/search.nix
View file

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