From 7fcf89e88550bc1346dcb581bd320bc5a1d96dd9 Mon Sep 17 00:00:00 2001 From: 4DBug <4DBug@github.com> Date: Mon, 9 Feb 2026 22:03:42 -0600 Subject: [PATCH] push --- flake.lock | 66 +++++++++++++++++++------------------- home.nix | 4 +-- main.nix | 2 +- modules/cloudflared.nix | 8 ++--- modules/config/searxng.yml | 2 +- modules/fedi/invidious.nix | 50 ++++++----------------------- modules/firefox.nix | 13 +++++++- modules/invidious.nix | 7 ++-- modules/packages.nix | 12 ++++--- modules/pihole.nix | 0 modules/searxng.nix | 6 ++-- 11 files changed, 77 insertions(+), 93 deletions(-) delete mode 100644 modules/pihole.nix diff --git a/flake.lock b/flake.lock index 351ef87..fb19844 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1770165565, - "narHash": "sha256-MplBxmxr8RGSr5lo/bbVcFR52i0b/IagZ1OVDiSzCQA=", + "lastModified": 1770626770, + "narHash": "sha256-uthunhCGLWxxB6tzAajS+MP3dz3TXMK8MyLpzUMlDp0=", "owner": "9001", "repo": "copyparty", - "rev": "16403d8c6c6f768cc69e3366e1c2c648b43b921e", + "rev": "e8609b87af6785603a7971585d34bb06279ef33c", "type": "github" }, "original": { @@ -145,11 +145,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -268,11 +268,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1770164260, - "narHash": "sha256-mQgOAYWlVJyuyXjZN6yxqXWyODvQI5P/UZUCU7IOuYo=", + "lastModified": 1770642890, + "narHash": "sha256-XWWHZEy5ZYMOx5hVuz+oeKtKDfv7syl7dwKCBx0LqzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "4fda26500b4539e0a1e3afba9f0e1616bdad4f85", + "rev": "13a1beb7c9962e0d2ba35a4d5c87546509b89b7d", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1770238404, - "narHash": "sha256-/ajGYszaZxjboxwNsMaw/EBn+BEp1YIe6geFthy/M6A=", + "lastModified": 1770408363, + "narHash": "sha256-ocMI5t0EBxao7dRRnQi7Aa9jpBvtSZmOpPbXx8fbOjw=", "owner": "JPyke3", "repo": "hytale-launcher-nix", - "rev": "bfb52bff72c572f71f621ea7654ea760bc848118", + "rev": "89db7a709e20525f145ea8ba729f32f8c6b43ac6", "type": "github" }, "original": { @@ -330,11 +330,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1769914377, - "narHash": "sha256-8wH3ZYNs36V0A3f/ikraqdoVE++BfnXg9Ql8nAuUkHw=", + "lastModified": 1770631245, + "narHash": "sha256-SGPUP0Pe199/Dh3jaEOuFG6K6C0kLGkneKIitmkqTkM=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "f7d17740ed90663b11ae907d33b3fed9fc9e15a9", + "rev": "9a2002d01130ba91987a32654a2680fb5cbb0262", "type": "github" }, "original": { @@ -402,11 +402,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "rev": "72716169fe93074c333e8d0173151350670b824c", "type": "github" }, "original": { @@ -433,11 +433,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -449,11 +449,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1770115704, - "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -481,11 +481,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1769740369, - "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=", + "lastModified": 1770537093, + "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a", + "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", "type": "github" }, "original": { @@ -513,11 +513,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1770181073, - "narHash": "sha256-ksTL7P9QC1WfZasNlaAdLOzqD8x5EPyods69YBqxSfk=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bf922a59c5c9998a6584645f7d0de689512e444c", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -622,11 +622,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769978605, - "narHash": "sha256-Vjniae6HHJCb9xZLeUOP15aRQXSZuKeeaZFM+gRDCgo=", + "lastModified": 1770587906, + "narHash": "sha256-N9ZTG3ia7l4iQO+9JlOj+sX4yu6gl7a3aozrlhSIJwQ=", "owner": "nix-community", "repo": "stylix", - "rev": "ce22070ec5ce6169a6841da31baea33ce930ed38", + "rev": "72e6483a88d51471a6c55e1d43e7ed2bc47a76a4", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index cb12ee6..19980c7 100644 --- a/home.nix +++ b/home.nix @@ -7,7 +7,7 @@ ] else [ ./modules/stylix.nix - #./modules/firefox.nix + ./modules/firefox.nix ]); home = { @@ -36,5 +36,5 @@ nixpkgs.config.allowUnfree = true; - programs.home-manager.enable = true; + #programs.home-manager.enable = true; } \ No newline at end of file diff --git a/main.nix b/main.nix index 6eab266..bdf55ba 100644 --- a/main.nix +++ b/main.nix @@ -29,7 +29,7 @@ ./modules/audio.nix ./modules/swap.nix ./modules/virtualisation.nix - + #./modules/firefox.nix ]) ++ (if device == "laptop" then [ ./modules/mpd.nix diff --git a/modules/cloudflared.nix b/modules/cloudflared.nix index 9e34f8e..bb3bda6 100644 --- a/modules/cloudflared.nix +++ b/modules/cloudflared.nix @@ -16,10 +16,10 @@ in default = "http_status:404"; ingress = { - #"tv.bug.tools" = "http://127.0.0.1:8080"; - #"search.bug.tools" = "http://127.0.0.1:3000"; - "files.bug.tools" = "http://127.0.0.1:3210"; - "tube.bug.tools" = "http://127.0.0.1:3030"; + "tvtun.bug.tools" = "http://127.0.0.1:3001"; + "search.bug.tools" = "http://127.0.0.1:8888"; + "files.bug.tools" = "http://127.0.0.1:3210"; + "tube.bug.tools" = "http://127.0.0.1:3030"; }; }; }; diff --git a/modules/config/searxng.yml b/modules/config/searxng.yml index 874215a..cbeac08 100644 --- a/modules/config/searxng.yml +++ b/modules/config/searxng.yml @@ -2,7 +2,7 @@ general: # Debug mode, only for development. Is overwritten by ${SEARXNG_DEBUG} debug: false # displayed name - instance_name: "SearXNG" + instance_name: "search.bug.tools" # For example: https://example.com/privacy privacypolicy_url: false # use true to use your own donation page written in searx/info/en/donate.md diff --git a/modules/fedi/invidious.nix b/modules/fedi/invidious.nix index 6652a37..9218b73 100755 --- a/modules/fedi/invidious.nix +++ b/modules/fedi/invidious.nix @@ -1,36 +1,24 @@ { config, lib, pkgs, ... }: { - options.nixos = { - server.fediverse.invidious = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - example = true; - description = "Enable Invidious."; - }; - }; - }; - - config = lib.mkIf config.nixos.server.fediverse.invidious.enable { - services.invidious = { + services.invidious = { enable = true; # sig helper is deprecated -> waiting for nixos pkg update to Invidious companion (see: https://docs.invidious.io/installation/#hardware-requirements) - #sig-helper = { - # enable = true; - # listenAddress = "127.0.0.1:2999"; - #}; - port = 3000; - domain = "invidious.${config.nixos.server.network.nginx.domain}"; + sig-helper = { + enable = true; + listenAddress = "127.0.0.1:2999"; + }; + port = 3030; + domain = "tube.bug.tools"; settings = { - #signature_server = "127.0.0.1:2999"; + signature_server = "127.0.0.1:2999"; https_only = true; hsts = true; external_port = 443; popular_enabled = true; statistics_enabled = true; registration_enabled = false; - login_enabled = false; + login_enabled = true; captcha_enabled = false; enable_user_notifications = false; channel_threads = 2; @@ -81,24 +69,4 @@ }; }; }; - - services.nginx = { - virtualHosts = { - "invidious.${config.nixos.server.network.nginx.domain}" = { - forceSSL = true; - enableACME = true; - acmeRoot = null; - kTLS = true; - http2 = false; - locations."/" = { - proxyPass = "http://localhost:3000"; - }; - }; - }; - }; - - services.ddclient.domains = [ - "invidious.${config.nixos.server.network.nginx.domain}" - ]; - }; } diff --git a/modules/firefox.nix b/modules/firefox.nix index e45c4b0..789302c 100644 --- a/modules/firefox.nix +++ b/modules/firefox.nix @@ -5,6 +5,15 @@ enable = true; package = pkgs.librewolf; + profiles = { + "bug" = { + id = 0; + name = "bug"; + isDefault = true; + + }; + }; + policies = { DisableTelemetry = true; DisableFirefoxStudies = true; @@ -25,6 +34,7 @@ "webgl.disabled" = false; }; + /* ExtensionSettings = { # catppuccin no borders https://addons.mozilla.org/en-US/firefox/addon/catppuccin-mocha-no-borders/ "catppuccin-mocha-no-borders@skyrpex" = { @@ -74,6 +84,7 @@ install_url = "https://addons.mozilla.org/firefox/downloads/latest/btroblox/latest.xpi"; }; }; + */ }; }; -} \ No newline at end of file +} diff --git a/modules/invidious.nix b/modules/invidious.nix index 4e5575f..5519520 100644 --- a/modules/invidious.nix +++ b/modules/invidious.nix @@ -1,3 +1,4 @@ + { config, pkgs, ... }: { @@ -14,14 +15,14 @@ https_only = true; external_port = 443; - registration_enabled = true; + registration_enabled = false; login_enabled = true; popular_enabled = true; - + default_user_preferences = { local = true; }; }; }; -} \ No newline at end of file +} diff --git a/modules/packages.nix b/modules/packages.nix index b493ef3..15e64ae 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -195,6 +195,8 @@ in baobab psmisc + + firefox-bin ] ++ (if (device == "desktop") then [ #(nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.star-citizen.override { # tricks = [ "arial" "vcrun2019" "win10" "sound=alsa" ]; @@ -300,11 +302,11 @@ in binfmt = true; }; - firefox = { - enable = true; - - package = pkgs.firefox-bin; - }; + #firefox = { + # enable = true; + + # package = pkgs.firefox-bin; + #}; steam = { enable = true; diff --git a/modules/pihole.nix b/modules/pihole.nix deleted file mode 100644 index e69de29..0000000 diff --git a/modules/searxng.nix b/modules/searxng.nix index 9ed2291..57c72f8 100755 --- a/modules/searxng.nix +++ b/modules/searxng.nix @@ -4,7 +4,7 @@ systemd.services.searx-init.serviceConfig.EnvironmentFile = [ "/home/bug/.searxng.env" ]; - + services.searx = { enable = true; redisCreateLocally = false; @@ -13,7 +13,9 @@ environmentFile = "/home/bug/.searxng.env"; settings = { - server.port = 1025; + general.instance_name = "search.bug.tools"; + + server.port = 8888; server.bind_address = "0.0.0.0"; server.secret_key = "$SEARX_SECRET_KEY"; };