summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chaski/services/headscale.nix38
-rw-r--r--flora/services/nginx.nix12
-rw-r--r--home/newsboat-public.nix2
-rw-r--r--home/packages.nix2
-rw-r--r--npins/sources.json56
-rw-r--r--pkgs/akkoma/default.nix6
6 files changed, 69 insertions, 47 deletions
diff --git a/chaski/services/headscale.nix b/chaski/services/headscale.nix
index 8240d93..80153e4 100644
--- a/chaski/services/headscale.nix
+++ b/chaski/services/headscale.nix
@@ -1,27 +1,27 @@
{ config, lib, pkgs, ... }:
{
- services.headscale = {
- enable = true;
- settings = {
- server_url = "https://headscale.noms.ing";
- listen_addr = "127.0.0.1:8323";
+ # services.headscale = {
+ # enable = true;
+ # settings = {
+ # server_url = "https://headscale.noms.ing";
+ # listen_addr = "127.0.0.1:8323";
- # oidc = {
- # only_start_if_oidc_is_available = true;
- # issuer = "https://idm.cuties.network/oauth2/openid/headscale";
- # client_id = "headscale";
- # client_secret_path = "/run/secrets/headscale_oidc_secret";
- # strip_email_domain = true;
- # };
+ # # oidc = {
+ # # only_start_if_oidc_is_available = true;
+ # # issuer = "https://idm.cuties.network/oauth2/openid/headscale";
+ # # client_id = "headscale";
+ # # client_secret_path = "/run/secrets/headscale_oidc_secret";
+ # # strip_email_domain = true;
+ # # };
- dns_config.magic_dns = true;
- dns_config.domains = [ "nodes.headscale.noms.ing" ];
- # dns_config.base_domain = "ts.cuties.network";
- };
- };
+ # # dns_config.magic_dns = true;
+ # # dns_config.domains = [ "nodes.headscale.noms.ing" ];
+ # # dns_config.base_domain = "ts.cuties.network";
+ # };
+ # };
- users.users.headscale.extraGroups = [ config.users.groups.keys.name ];
+ # users.users.headscale.extraGroups = [ config.users.groups.keys.name ];
# sops.secrets.headscale_oidc_secret = {
# owner = config.users.users.headscale.name;
# sopsFile = ./headscale.sops.yaml;
@@ -36,5 +36,5 @@
};
};
- services.tailscale.enable = true;
+ # services.tailscale.enable = true;
}
diff --git a/flora/services/nginx.nix b/flora/services/nginx.nix
index 4a9bf33..c5aa45b 100644
--- a/flora/services/nginx.nix
+++ b/flora/services/nginx.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
{
networking.firewall.allowedTCPPorts = [ 80 443 ];
@@ -14,11 +14,17 @@
enableACME = true;
forceSSL = true;
locations."/".root = ../../pkgs/nomsing;
+ extraConfig = ''
+ include ${inputs."ai.robots.txt"}/nginx-block-ai-bots.conf;
+ '';
};
virtualHosts."meow.noms.ing" = {
enableACME = true;
forceSSL = true;
locations."/".root = ../../pkgs/nomsing;
+ extraConfig = ''
+ include ${inputs."ai.robots.txt"}/nginx-block-ai-bots.conf;
+ '';
};
virtualHosts."webring.noms.ing" = {
enableACME = true;
@@ -29,7 +35,11 @@
fastcgi_param SCRIPT_FILENAME ${lib.getExe pkgs.nomsring};
fastcgi_param PATH_INFO $1;
'';
+ extraConfig = ''
+ include ${inputs."ai.robots.txt"}/nginx-block-ai-bots.conf;
+ '';
};
+
};
services.fcgiwrap.instances.nomsing = {
diff --git a/home/newsboat-public.nix b/home/newsboat-public.nix
index 0302c04..7d94c32 100644
--- a/home/newsboat-public.nix
+++ b/home/newsboat-public.nix
@@ -79,7 +79,7 @@ with import ./newsboat-lib.nix;
(btag "https://www.haskellforall.com/feeds/posts/default" "comp")
(btag "http://conal.net/blog/feed" "comp")
(btag "https://michael.stapelberg.ch/posts/tags/distri/feed.xml" "comp")
- (btag "https://mattermost.com/blog/category/releases/rss" "security")
+ (btag "https://mattermost.com/blog/category/releases/feed/" "security")
(btag "https://mattermost.com/security-updates/feed/" "security")
(btag "https://ionathan.ch/feed.xml" "comp")
(btag "https://wingolog.org/feed/atom" "comp")
diff --git a/home/packages.nix b/home/packages.nix
index 7f910bb..30d129d 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -5,7 +5,7 @@ let
in
{
home.packages = with pkgs; [
- emacs
+ emacs-pgtk
emacs-all-the-icons-fonts nerdfonts
# internet apps & clients
diff --git a/npins/sources.json b/npins/sources.json
index 3cf167d..63abbab 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -1,5 +1,17 @@
{
"pins": {
+ "ai.robots.txt": {
+ "type": "Git",
+ "repository": {
+ "type": "GitHub",
+ "owner": "ai-robots-txt",
+ "repo": "ai.robots.txt"
+ },
+ "branch": "main",
+ "revision": "5b8650b99b35ff2aa1aa9ae26183b312edc48d45",
+ "url": "https://github.com/ai-robots-txt/ai.robots.txt/archive/5b8650b99b35ff2aa1aa9ae26183b312edc48d45.tar.gz",
+ "hash": "1259mjps1f8nkcjzgcvin8d7firbn5q96k1mmcdhv67s6w4ilqfy"
+ },
"almanac": {
"type": "Git",
"repository": {
@@ -78,9 +90,9 @@
"repo": "home-manager"
},
"branch": "release-24.11",
- "revision": "f6af7280a3390e65c2ad8fd059cdc303426cbd59",
- "url": "https://github.com/nix-community/home-manager/archive/f6af7280a3390e65c2ad8fd059cdc303426cbd59.tar.gz",
- "hash": "13mmmf5apnd6ima3a1zzybax5nyxfw0kaljk8znyrr7zqz7gllnc"
+ "revision": "15c5f9d04fabd176f30286c8f52bbdb2c853a146",
+ "url": "https://github.com/nix-community/home-manager/archive/15c5f9d04fabd176f30286c8f52bbdb2c853a146.tar.gz",
+ "hash": "0snr7vyr4z3d09mvn7pirvl30xc034x82kbzcwmbcrcr1cs7g0yv"
},
"isabelle-utils": {
"type": "Git",
@@ -100,9 +112,9 @@
"url": "git+ssh://git@git.lix.systems/lix-project/lix"
},
"branch": "main",
- "revision": "175091efb55cae0d7629fe0b5947fc52b5969805",
+ "revision": "d169c092fc28838a253be136d17fe7de1292c728",
"url": null,
- "hash": "1gv6pzr37slxjqca3zv5dq6fywrx18d0zgzwzals81cvdh0pn9n6"
+ "hash": "0mzihk29bljgip0fin5zzl38wb2vasw2awqsf5p7m2q603fc1hw2"
},
"lix-nixos-module": {
"type": "Git",
@@ -111,9 +123,9 @@
"url": "git+ssh://git@git.lix.systems/lix-project/nixos-module"
},
"branch": "main",
- "revision": "a6da43f8193d9e329bba1795c42590c27966082e",
+ "revision": "fa69ae26cc32dda178117b46487c2165c0e08316",
"url": null,
- "hash": "09vglsb2n67xfc1g9dpmr0ka56dk4r1b8sw5jq3ka4jv68sg8l6q"
+ "hash": "13x2dca4s049m8fa2y4b45kgqnpk3cf26j0j0yascah32zzxn7rh"
},
"nixos-mailserver": {
"type": "Git",
@@ -123,9 +135,9 @@
"server": "https://gitlab.com/"
},
"branch": "master",
- "revision": "90539a1a993a7ec16563139e82fa66f1c439ba0f",
- "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=90539a1a993a7ec16563139e82fa66f1c439ba0f",
- "hash": "056nxpz9691f3mv0llcxsfnx440sqq7j9zy47vff82j7naza7wsp"
+ "revision": "b4fbffe79c00f19be94b86b4144ff67541613659",
+ "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=b4fbffe79c00f19be94b86b4144ff67541613659",
+ "hash": "0r8c0mkj7cn2cz0r6m45h51w5qwf2cyiiv956bz75p3fcps4qj1n"
},
"nixpkgs": {
"type": "Git",
@@ -135,9 +147,9 @@
"repo": "nixpkgs"
},
"branch": "nixos-24.11",
- "revision": "a1185f4064c18a5db37c5c84e5638c78b46e3341",
- "url": "https://github.com/NixOS/nixpkgs/archive/a1185f4064c18a5db37c5c84e5638c78b46e3341.tar.gz",
- "hash": "0ipjb56fdhfvhgnrw0rvp89g0mplpyhjil29fqdcpmv4ablbadqc"
+ "revision": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c",
+ "url": "https://github.com/NixOS/nixpkgs/archive/7ffe0edc685f14b8c635e3d6591b0bbb97365e6c.tar.gz",
+ "hash": "08pwvljh8qskw8ajggfpx4x2jc1x69jc9vqkqzx68aj66vb2rsmh"
},
"nixpkgs-unstable": {
"type": "Git",
@@ -147,9 +159,9 @@
"repo": "nixpkgs"
},
"branch": "nixpkgs-unstable",
- "revision": "5d9b5431f967007b3952c057fc92af49a4c5f3b2",
- "url": "https://github.com/NixOS/nixpkgs/archive/5d9b5431f967007b3952c057fc92af49a4c5f3b2.tar.gz",
- "hash": "0wkr3liw6fhl1jp2sgn3qakrykphbs03sxhan5f2kb5xvc8zchcy"
+ "revision": "63158b9cbb6ec93d26255871c447b0f01da81619",
+ "url": "https://github.com/NixOS/nixpkgs/archive/63158b9cbb6ec93d26255871c447b0f01da81619.tar.gz",
+ "hash": "1bv5qavwa865kc2il9pl3k8k3w41mxypjxfxjl6a24n4d33crshn"
},
"ntfy-matrix-bot": {
"type": "Git",
@@ -181,9 +193,9 @@
"repo": "rust-overlay"
},
"branch": "master",
- "revision": "954582a766a50ebef5695a9616c93b5386418c08",
- "url": "https://github.com/oxalica/rust-overlay/archive/954582a766a50ebef5695a9616c93b5386418c08.tar.gz",
- "hash": "0g3wvgplicyjhzmh6fj9cypl2ihld372bzyxc548njq3v8qjfsjb"
+ "revision": "011de3c895927300651d9c2cb8e062adf17aa665",
+ "url": "https://github.com/oxalica/rust-overlay/archive/011de3c895927300651d9c2cb8e062adf17aa665.tar.gz",
+ "hash": "11qwgyxjf08sfncm2469jgqha95m52iirg0a6903sk5zxl9hs5rq"
},
"showrt": {
"type": "Git",
@@ -216,9 +228,9 @@
"repo": "sops-nix"
},
"branch": "master",
- "revision": "b33837ae3cfa012b65810891bebbee71fa4c0658",
- "url": "https://github.com/Mic92/sops-nix/archive/b33837ae3cfa012b65810891bebbee71fa4c0658.tar.gz",
- "hash": "00r497l5izngy8j0j255q3y5spip9dyflx01ga01j6n1wdngbgz3"
+ "revision": "8e873886bbfc32163fe027b8676c75637b7da114",
+ "url": "https://github.com/Mic92/sops-nix/archive/8e873886bbfc32163fe027b8676c75637b7da114.tar.gz",
+ "hash": "0nncgbakcvn9jkj2ql17l3cmx1p8x6hqv1flkxkcx73d2fid87sk"
},
"traveltext": {
"type": "Git",
diff --git a/pkgs/akkoma/default.nix b/pkgs/akkoma/default.nix
index 2e577f0..32d85a9 100644
--- a/pkgs/akkoma/default.nix
+++ b/pkgs/akkoma/default.nix
@@ -11,12 +11,12 @@
}:
beamPackages.mixRelease rec {
pname = "akkoma";
- version = "3.15.1";
+ version = "3.15.2";
src = fetchgit {
url = "https://akkoma.dev/AkkomaGang/akkoma.git";
- rev = "refs/tags/v3.15.1";
- hash = "sha256-6qsqTguEVu9t6dW8c+VAE5Z7D3FbQ0S2ZfAN5qy7Xak=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-GW86OyO/XPIrCS+cPKQ8LG8PdhhfA2rNH1FXFiuL6vM=";
};
postPatch = ''
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-02 08:20:31 +0000