From ad499808474f931776f00a6ec281f075f58cffdb Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 11 Jun 2025 15:51:52 +0200 Subject: [PATCH 1/6] feature(librewolf): add suggestion search for SearXNG --- modules/home/apps/librewolf/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/home/apps/librewolf/default.nix b/modules/home/apps/librewolf/default.nix index 175180c..146da80 100644 --- a/modules/home/apps/librewolf/default.nix +++ b/modules/home/apps/librewolf/default.nix @@ -21,6 +21,8 @@ let "signon.storeWhenAutocompleteOff" = true; "sidebar.verticalTabs" = true; "general.useragent.compatMode.firefox" = true; + "browser.search.suggest.enabled" = true; + "browser.urlbar.suggest.searches" = true; }; defaultExtensions = with inputs.firefox-addons.packages."x86_64-linux"; [ bitwarden @@ -36,7 +38,13 @@ let default = "SearXNG"; engines = { "SearXNG" = { - urls = [ { template = "https://search.stahl.sh/search?q={searchTerms}"; } ]; + urls = [ + { template = "https://search.stahl.sh/search?q={searchTerms}"; } + { + template = "https://search.stahl.sh/autocompleter?q={searchTerms}"; + type = "application/x-suggestions+json"; + } + ]; icon = "https://search.stahl.sh/static/themes/simple/img/favicon.png"; definedAliases = [ "@s" ]; }; From 0451747e3168410dcdedb19ea5711d5a7ac60082 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 11 Jun 2025 15:53:50 +0200 Subject: [PATCH 2/6] feature(cinny): switch cinny services to custom package with notifications and voice calls We use GigiaJ's fork to get notifications on mobile and voice calls into cinny, this is quite buggy still but works mostly and is pretty neat. --- modules/nixos/services/cinny/default.nix | 4 +++- overlays/cinny/default.nix | 28 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 overlays/cinny/default.nix diff --git a/modules/nixos/services/cinny/default.nix b/modules/nixos/services/cinny/default.nix index 53b6569..f8648f6 100644 --- a/modules/nixos/services/cinny/default.nix +++ b/modules/nixos/services/cinny/default.nix @@ -22,7 +22,7 @@ in package = mkOption { description = "The package of Cinny to use."; type = types.package; - default = pkgs.cinny-unwrapped; + default = pkgs.awesome-flake.cinny; }; domain = mkOption { @@ -58,6 +58,8 @@ in rewrite ^/public/(.*)$ /public/$1 break; rewrite ^/assets/(.*)$ /assets/$1 break; + rewrite ^/element-call/dist/(.*)$ /element-call/dist/$1 break; + rewrite ^(.+)$ /index.html break; ''; }; diff --git a/overlays/cinny/default.nix b/overlays/cinny/default.nix new file mode 100644 index 0000000..dc3845f --- /dev/null +++ b/overlays/cinny/default.nix @@ -0,0 +1,28 @@ +{ + channels, + inputs, + ... +}: + +final: prev: { + awesome-flake = (prev.awesome-flake or { }) // { + cinny = prev.cinny-unwrapped.overrideAttrs (_old: rec { + pname = "cinny-unwrapped"; + version = "2025-06-11-15-30"; + + src = final.fetchFromGitHub { + owner = "GigiaJ"; + repo = "cinny"; + rev = "1b281fe37b29e4b4a36d8bc3007a9abf2240ffff"; + hash = "sha256-3DKFOuFR7qYSvWsE/kAnaES/T9CFGNpmmOutE4o6vb4="; + }; + + npmDepsHash = "sha256-Z7GP3aorCnII7KfWajR8L+otiBxYC+uaMSYWcgmnZjw="; + npmDeps = final.fetchNpmDeps { + inherit src; + name = "${pname}-${version}-npm-deps"; + hash = npmDepsHash; + }; + }); + }; +} From a84e3956c332b1453bc68dc062c14fd51e4ce3ff Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 11 Jun 2025 15:54:34 +0200 Subject: [PATCH 3/6] fix(searxng): enable autocomplete for suggestions in librewolf, fixup ip typo --- modules/nixos/services/searxng/default.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/modules/nixos/services/searxng/default.nix b/modules/nixos/services/searxng/default.nix index 5ad29fc..3c3a9e6 100644 --- a/modules/nixos/services/searxng/default.nix +++ b/modules/nixos/services/searxng/default.nix @@ -47,11 +47,17 @@ in services.searx = { enable = true; environmentFile = "/run/secrets/searxng"; - settings.server = { - port = "1340"; - bind_address = "127.0.0.1"; - use_default_settings = true; - secret_key = "@secret_key@"; + settings = { + server = { + port = "1340"; + bind_address = "127.0.0.1"; + use_default_settings = true; + secret_key = "@secret_key@"; + }; + search = { + safe_search = 0; + autocomplete = "google"; + }; }; }; @@ -79,12 +85,12 @@ in "${cfg.domain}" = { forceSSL = true; useACMEHost = "stahl.sh"; - locations."/".proxyPass = "http://127.0.01:1340"; + locations."/".proxyPass = "http://127.0.0.1:1340"; }; "${cfg.redlib.domain}" = mkIf cfg.redlib.enable { forceSSL = true; useACMEHost = "stahl.sh"; - locations."/".proxyPass = "http://127.0.01:1341"; + locations."/".proxyPass = "http://127.0.0.1:1341"; }; }; }; From c39177566b017e9b4238859284967df0568e2753 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 11 Jun 2025 15:55:09 +0200 Subject: [PATCH 4/6] fix(codeberg-themes): switch to static commit hash --- packages/codeberg-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/codeberg-themes/default.nix b/packages/codeberg-themes/default.nix index 7429c16..df92bc3 100644 --- a/packages/codeberg-themes/default.nix +++ b/packages/codeberg-themes/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "Codeberg-Infrastructure"; repo = "forgejo"; - rev = "codeberg-11"; - sha256 = "sha256-Mud0GpnuGOL9Ys4dpL/xVmEHBMQrcuQgSu4NwEaNelE="; + rev = "8fbdf40e3224598b1e724b21e62b2e2f32910113"; + sha256 = "sha256-at+edBFcNr81kQWkH44Fih1IBrCJC72QDE+Spi+kxpc="; }; unpackPhase = '' From 2163293d457ff1800693074a87e3b639d34b8045 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 11 Jun 2025 15:55:43 +0200 Subject: [PATCH 5/6] fix(linkwarden): downgrade to version 2.10.0, 2.10.2 gave us trouble --- packages/linkwarden/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linkwarden/default.nix b/packages/linkwarden/default.nix index 2389e4c..a262381 100644 --- a/packages/linkwarden/default.nix +++ b/packages/linkwarden/default.nix @@ -41,7 +41,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "linkwarden"; - version = "2.10.2"; + version = "2.10.0"; src = fetchFromGitHub { owner = "linkwarden"; From ebbf8dcfb159182df3e7429bc2daed30e4e5f8d4 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 11 Jun 2025 16:03:38 +0200 Subject: [PATCH 6/6] update(flake) --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index c6c0c55..005e592 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1748664200, - "narHash": "sha256-D8sWEVVvxDBJsr8h26AGDfYjp56iKUIHCWaOKucDT2c=", + "lastModified": 1749614614, + "narHash": "sha256-/193T5cui6RiXWn+bqKDwNt4A1zRYjzTI2g1XLrxVRk=", "owner": "rycee", "repo": "nur-expressions", - "rev": "b7d07ac2748936643abe8192065a2156f1a46d6e", + "rev": "78ce8a0ab9e72a4127472e6343a92a33fbd12691", "type": "gitlab" }, "original": { @@ -43,11 +43,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", "type": "github" }, "original": { @@ -118,11 +118,11 @@ ] }, "locked": { - "lastModified": 1748668774, - "narHash": "sha256-fYk/vk4ClmvHIgnGv/5GNRiDLtNCwXo9aLq36L/x+P4=", + "lastModified": 1749628652, + "narHash": "sha256-f8jDF4G9m7pPySeQc6KskqMgtcJq6X1o2CytMx66qAE=", "owner": "nix-community", "repo": "home-manager", - "rev": "60e4624302d956fe94d3f7d96a560d14d70591b9", + "rev": "450f06ec3cd0d86f67db58a7245db8848773e895", "type": "github" }, "original": { @@ -133,11 +133,11 @@ }, "mnw": { "locked": { - "lastModified": 1748278309, - "narHash": "sha256-JCeiMrUhFku44kfKsgiD9Ibzho4MblBD2WmOQYsQyTY=", + "lastModified": 1748710831, + "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", "owner": "Gerg-L", "repo": "mnw", - "rev": "486a17ba1279ab2357cae8ff66b309db622f8831", + "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1748634340, - "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", + "lastModified": 1749195551, + "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", + "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -205,11 +205,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748217807, - "narHash": "sha256-P3u2PXxMlo49PutQLnk2PhI/imC69hFl1yY4aT5Nax8=", + "lastModified": 1749174413, + "narHash": "sha256-urN9UMK5cd1dzhR+Lx0xHeTgBp2MatA5+6g9JaxjuQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3108eaa516ae22c2360928589731a4f1581526ef", + "rev": "6ad174a6dc07c7742fc64005265addf87ad08615", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1748651104, - "narHash": "sha256-GZLiCQlNV8QfAWwGinXeSdiKZS346ZGPv6EKzeY0tAA=", + "lastModified": 1749631819, + "narHash": "sha256-iy7UuA2I0DaKEUMncTQNFg0bYDX7sa5WCRQTrIWqmEU=", "owner": "notashelf", "repo": "nvf", - "rev": "c4cf91d4b531245a02f5b6c196f6279bc87a546f", + "rev": "2a2b5e2790b41eadc42758fd6c4d62b7af64f17c", "type": "github" }, "original": { @@ -358,11 +358,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1749592509, + "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "50754dfaa0e24e313c626900d44ef431f3210138", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "stable": { "locked": { - "lastModified": 1748421225, - "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", + "lastModified": 1749488106, + "narHash": "sha256-b9GIWdF/8jKpCC5JIMgDLZgwe8cEbty2fyTyo1eDFfI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", + "rev": "8fe3e32e7f210522377c3bcff80931a3284ace6a", "type": "github" }, "original": {