From 4d2be6ff7455a5b94e62334eb863ad4059dfdf3d Mon Sep 17 00:00:00 2001 From: muon Date: Fri, 13 Feb 2026 13:36:05 +0000 Subject: [PATCH 1/4] Remove alt frontends from search --- modules/nixos/server/search.nix | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/modules/nixos/server/search.nix b/modules/nixos/server/search.nix index 1a1a94c..5089449 100644 --- a/modules/nixos/server/search.nix +++ b/modules/nixos/server/search.nix @@ -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"; }; }; }; From b581f85d44ac89baf52bc4aa5da535475dc6d524 Mon Sep 17 00:00:00 2001 From: Sage Date: Mon, 16 Feb 2026 11:36:40 +0000 Subject: [PATCH 2/4] Update nix --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 1fec7f0..8c98f54 100644 --- a/flake.lock +++ b/flake.lock @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1770586272, - "narHash": "sha256-Ucci8mu8QfxwzyfER2DQDbvW9t1BnTUJhBmY7ybralo=", + "lastModified": 1771188132, + "narHash": "sha256-qLXxN/tPrZtnekaLBQuVtxQfvqqs5cT5WbyH4zZaTGI=", "owner": "nix-community", "repo": "home-manager", - "rev": "b1f916ba052341edc1f80d4b2399f1092a4873ca", + "rev": "ae8003d8b61d0d373e7ca3da1a48f9c870d15df9", "type": "github" }, "original": { @@ -275,11 +275,11 @@ ] }, "locked": { - "lastModified": 1769872935, - "narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", + "lastModified": 1771102945, + "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=", "owner": "nix-community", "repo": "home-manager", - "rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", + "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399", "type": "github" }, "original": { @@ -350,11 +350,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1768904356, - "narHash": "sha256-TIG8J+Or8nOydy8TztvtIshnprlf1q6XDIJnopLtMlA=", + "lastModified": 1771150922, + "narHash": "sha256-+oQJun4CFDlOQRocbZpqQDj7agoy56/4ZjT1oUR7NOs=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "d95b25a4dd6da2a1dfeaaf66163d0a281a8270e9", + "rev": "96045e886ba0dd45b27590e7c0c6e77bbb54033d", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1771130777, + "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "efec7aaad8d43f8e5194df46a007456093c40f88", "type": "github" }, "original": { @@ -438,11 +438,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1768305791, - "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -470,11 +470,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1770562336, - "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -573,11 +573,11 @@ ] }, "locked": { - "lastModified": 1770526836, - "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=", + "lastModified": 1771166946, + "narHash": "sha256-UFc4lfGBr+wJmwgDGJDn1cVD6DTr0/8TdronNUiyXlU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d", + "rev": "2d0cf89b4404529778bc82de7e42b5754e0fe4fa", "type": "github" }, "original": { @@ -626,11 +626,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1770587906, - "narHash": "sha256-N9ZTG3ia7l4iQO+9JlOj+sX4yu6gl7a3aozrlhSIJwQ=", + "lastModified": 1770914701, + "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=", "owner": "danth", "repo": "stylix", - "rev": "72e6483a88d51471a6c55e1d43e7ed2bc47a76a4", + "rev": "db03fed72e5ca02be34e1d24789345a943329738", "type": "github" }, "original": { @@ -794,11 +794,11 @@ ] }, "locked": { - "lastModified": 1770568363, - "narHash": "sha256-RJ/C24wN7LyuMmBgvIutA/PqXXceZtJtUCuZSaTjF/4=", + "lastModified": 1771222275, + "narHash": "sha256-df+Un2QnDj95MQxmsnopCtSy/meWO2RDHuMGAqq3nlc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "2ada8a826ea88512387a5a17ee96f16369bcdd80", + "rev": "a20f5d0c6454b5b24a497afb280427c9af33a0be", "type": "github" }, "original": { From a3bd6990b5a0bf2e72c74155da599e3d70a522a6 Mon Sep 17 00:00:00 2001 From: Sage Date: Wed, 18 Feb 2026 13:30:36 +0000 Subject: [PATCH 3/4] Add libpq --- modules/home/terminal/hr/hr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/terminal/hr/hr.sh b/modules/home/terminal/hr/hr.sh index 1d6aaca..c6ab1b7 100644 --- a/modules/home/terminal/hr/hr.sh +++ b/modules/home/terminal/hr/hr.sh @@ -52,7 +52,7 @@ _hr_add_ignores() { _hr_py_files() { cat <devenv.nix {pkgs, ...}: { - packages = [ pkgs.google-cloud-sdk ]; + packages = [ pkgs.google-cloud-sdk pkgs.libpq ]; languages.python = { enable = true; From 2fa75b084bc4710ce6dc9e002302396cf93195c3 Mon Sep 17 00:00:00 2001 From: Sage Date: Wed, 18 Feb 2026 13:36:59 +0000 Subject: [PATCH 4/4] Add hr init go --- modules/home/terminal/hr/hr.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/home/terminal/hr/hr.sh b/modules/home/terminal/hr/hr.sh index c6ab1b7..4104be9 100644 --- a/modules/home/terminal/hr/hr.sh +++ b/modules/home/terminal/hr/hr.sh @@ -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" } @@ -137,6 +138,16 @@ in { EOF } +_hr_go_files() { + cat <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