summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--chaski/configuration.nix3
-rw-r--r--chaski/services/tracktrain.nix145
-rw-r--r--flora/services/cgit.nix8
-rw-r--r--home/home.nix4
-rw-r--r--home/newsboat-public.nix4
-rw-r--r--ilex/configuration.nix2
-rw-r--r--inputs.nix2
-rw-r--r--npins/sources.json85
-rw-r--r--pkgs/default.nix11
-rw-r--r--pkgs/hikari.nix31
-rw-r--r--pkgs/overlay.nix26
-rw-r--r--secrets/chaski.yaml15
12 files changed, 245 insertions, 91 deletions
diff --git a/chaski/configuration.nix b/chaski/configuration.nix
index 0271e0f..94b89df 100644
--- a/chaski/configuration.nix
+++ b/chaski/configuration.nix
@@ -12,7 +12,8 @@
./services/chat.nix
./services/bahnhof-name.nix
./services/conduit.nix
- ./services/headscale.nix
+ # ./services/headscale.nix
+ ./services/tracktrain.nix
];
sops.defaultSopsFile = ../secrets/chaski.yaml;
diff --git a/chaski/services/tracktrain.nix b/chaski/services/tracktrain.nix
new file mode 100644
index 0000000..77a1ab7
--- /dev/null
+++ b/chaski/services/tracktrain.nix
@@ -0,0 +1,145 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+ tracktrain-config = ''
+ dbstring: "dbname=tracktrain user=tracktrain"
+ gtfs: ${pkgs.copyPathToStore ./gtfs.zip}
+ assets: ${pkgs.tracktrain}/assets
+
+ warp:
+ port: 4000
+ '';
+in
+{
+ sops.secrets = {
+ "tracktrain/env" = {};
+ "nginx/tracktrain-auth" = {
+ owner = "nginx";
+ };
+ };
+
+ services.nginx.recommendedProxySettings = true;
+ services.nginx.virtualHosts."tracktrain.stuebinm.eu" = {
+ serverAliases = [ "tracktrain.ilztalbahn.eu" "ilztalbahn.infra4future.de" ];
+ locations."/" = {
+ proxyPass = "http://192.168.42.41:4000";
+ proxyWebsockets = true;
+ basicAuthFile = "/run/secrets/nginx/tracktrain-auth";
+ };
+ locations."/api" = {
+ proxyPass = "http://192.168.42.41:4000";
+ proxyWebsockets = true;
+ extraConfig = ''
+ add_header 'Access-Control-Allow-Origin' '*' always;
+ '';
+ };
+ locations."/metrics/" = {
+ proxyPass = "http://localhost:2342";
+ proxyWebsockets = true;
+ extraConfig = ''
+ rewrite ^/metrics/(.*) /$1 break;
+ '';
+ };
+ enableACME = true;
+ forceSSL = true;
+ };
+
+
+ # services.prometheus = {
+ # enable = true;
+ # port = 9001;
+ # scrapeConfigs = [ {
+ # job_name = "tracktrain";
+ # static_configs = [{
+ # targets = [ "192.168.42.41:4000" ];
+ # }];
+ # } ];
+ # };
+
+ # services.grafana = {
+ # enable = true;
+ # settings.server = {
+ # serve_from_sub_path = true;
+ # domain = "tracktrain.ilztalbahn.eu";
+ # root_url = "%(protocol)s://%(domain)s:/metrics/";
+ # http_port = 2342;
+ # http_addr = "0.0.0.0";
+ # };
+
+ # provision = {
+ # enable = true;
+ # datasources.settings.datasources = [ {
+ # url = "http://localhost:9001";
+ # type = "prometheus";
+ # name = "prometheus";
+ # } ];
+ # };
+ # };
+
+ networking.firewall.allowedTCPPorts = [ 443 ];
+
+ containers.tracktrain = {
+ autoStart = true;
+ privateNetwork = true;
+ hostAddress6 = "fd00::42:40";
+ localAddress6 = "fd00::42:41";
+ hostAddress = "192.168.42.40";
+ localAddress = "192.168.42.41";
+
+ config = { config, ... }: {
+
+ systemd.services.tracktrain = {
+ enable = true;
+
+ description = "tracks trains, hopefully";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+ serviceConfig = {
+ Type = "simple";
+ # EnvironmentFile = "/secrets/env";
+ DynamicUser = true;
+ };
+ path = [ pkgs.wget pkgs.ntfy-sh ];
+ script = ''
+ cd /tmp
+ ln -sf ${pkgs.writeText "config.yaml" tracktrain-config} "config.yaml"
+ sleep 3
+ ${pkgs.tracktrain}/bin/tracktrain +RTS -T
+ '';
+ };
+
+ systemd.services.postgresql.wantedBy = [ "tracktrain.service" ];
+
+ services.postgresql = {
+ enable = true;
+ ensureDatabases = [ "tracktrain" ];
+ ensureUsers = [ {
+ name = "tracktrain";
+ ensureDBOwnership = true;
+ } ];
+ authentication = ''
+ local all all trust
+ '';
+ };
+
+ networking.firewall.enable = false;
+ system.stateVersion = "25.11";
+
+ services.coredns = {
+ enable = true;
+ config = ''
+ .:53 {
+ forward . 1.1.1.1
+ }
+ '';
+ };
+ };
+ };
+
+ networking.nat = {
+ enable = true;
+ internalInterfaces = [ "ve-tracktrain" ];
+ externalInterface = "ens3";
+ };
+
+}
diff --git a/flora/services/cgit.nix b/flora/services/cgit.nix
index b846ad4..5ee8103 100644
--- a/flora/services/cgit.nix
+++ b/flora/services/cgit.nix
@@ -2,7 +2,13 @@
let
cgitconf = ''
- source-filter=${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py
+ source-filter=${pkgs.writeScript ''highlighter'' ''
+ if [[ $1 == *.thy ]]; then
+ ${pkgs.isabelle-utils}/bin/isabelle2unicode | ${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py "$1"
+ else
+ ${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py "$1"
+ fi
+ ''}
about-filter=${pkgs.cgit}/lib/cgit/filters/about-formatting.sh
cache-size=1000
logo=/git/cgit.png
diff --git a/home/home.nix b/home/home.nix
index 15df8de..580d57b 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -355,6 +355,10 @@
user = "root";
identityFile = keydir + "/id_ed25519";
};
+ "regiolis" = {
+ hostname = "regiolis.erpu.eu";
+ user = "terru";
+ };
};
};
diff --git a/home/newsboat-public.nix b/home/newsboat-public.nix
index 7da942b..362d9db 100644
--- a/home/newsboat-public.nix
+++ b/home/newsboat-public.nix
@@ -14,7 +14,6 @@ with import ./newsboat-lib.nix;
(ntag "https://ctxt.es/es/?tpl=87" "es")
(ntag "https://warnung.bund.de/api31/mowas/rss/092620000000.rss" "bund")
(jtag "https://madeinchinajournal.com/feed/" "pol")
- (jtag "https://decorrespondent.nl/feed/v1/publications" "pol")
(jtag "https://solar.lowtechmagazine.com/feeds/all-en.atom.xml" "tech")
(btag "https://www.omgubuntu.co.uk/feed" "tech")
(ntag "https://liputenpo.org/feed" "tok")
@@ -223,6 +222,7 @@ with import ./newsboat-lib.nix;
(btag "https://blog.aada.cat/index.xml" "friends")
(btag "https://jonworth.eu/feed/" "trains")
(btag "https://vulpinecitrus.info/blog/atom.xml" "comp")
+ (btag "https://www.jonmsterling.com/019X/atom.xml" "maths")
# paper
(btag "http://arxiv.org/rss/cs.PL" "paper")
@@ -299,12 +299,12 @@ with import ./newsboat-lib.nix;
(podcast "https://feeds.soundcloud.com/users/soundcloud:users:237055046/sounds.rss")
(podcast "https://fernostwaerts.de/feed/mp3/")
(podcast "https://allesgesagt.podigee.io/feed/mp3")
- (podcast "https://logbuch-netzpolitik.de/feed")
(podcast "https://feeds.feedburner.com/SrslyWrong")
(podcast "https://efforg.libsyn.com/rss")
(podcast "https://feed.podbean.com/lingfieldnotes/feed.xml")
(podcast "https://dasklima.podigee.io/feed/mp3")
(podcast "https://www.haecksen.org/podcast/rss")
+ (podcast "https://aboutlogic.podigee.io/feed/mp3")
(music "https://feeds.soundcloud.com/users/soundcloud%3Ausers%3A39508706/sounds.rss")
diff --git a/ilex/configuration.nix b/ilex/configuration.nix
index d648adc..d640f54 100644
--- a/ilex/configuration.nix
+++ b/ilex/configuration.nix
@@ -92,4 +92,6 @@
USB_EXCLUDE_AUDIO = 1;
};
};
+
+ security.pam.services.swaylock = {};
}
diff --git a/inputs.nix b/inputs.nix
index 4d38903..4d01e99 100644
--- a/inputs.nix
+++ b/inputs.nix
@@ -28,7 +28,7 @@ let
inherit system;
overlays = [
(import sources.rust-overlay)
- deploy-rs.overlay
+ deploy-rs.overlays.default
(import ./pkgs/overlay.nix { inherit inputs; })
lix-overlay
];
diff --git a/npins/sources.json b/npins/sources.json
index 3a74c0a..17e7e94 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -9,9 +9,9 @@
},
"branch": "main",
"submodules": false,
- "revision": "aa8519ec107d7cfa29b03005c9176708e1269965",
- "url": "https://github.com/ai-robots-txt/ai.robots.txt/archive/aa8519ec107d7cfa29b03005c9176708e1269965.tar.gz",
- "hash": "01injirgqzzhd7sqarhlf54b994b70c7f8g88xrkqsy4gs0vzx9v"
+ "revision": "198653b59a888d8c580b8566d305a44e184f5b33",
+ "url": "https://github.com/ai-robots-txt/ai.robots.txt/archive/198653b59a888d8c580b8566d305a44e184f5b33.tar.gz",
+ "hash": "0pc31az81782g9msh58y3187alb0bsbxis73nm6z4f2g66z2mx47"
},
"almanac": {
"type": "Git",
@@ -33,9 +33,9 @@
},
"branch": "rnv",
"submodules": false,
- "revision": "83031c010be0ed73f45ba5975d16cb05a1638ff1",
+ "revision": "7f690b4f530c368ec0074bb6fc4b1c35155a7615",
"url": null,
- "hash": "19kfjrndg5xvspwqljgsiyadi4fjnq99zfpr9k6bnx3z2g2m1rk8"
+ "hash": "10zmb0dhr124ad8ssrg9h017hp459diyp7xl015l2hs6r15y6si4"
},
"blog": {
"type": "Git",
@@ -52,14 +52,15 @@
"deploy-rs": {
"type": "Git",
"repository": {
- "type": "Git",
- "url": "https://stuebinm.eu/git/forks/deploy-rs"
+ "type": "GitHub",
+ "owner": "serokell",
+ "repo": "deploy-rs"
},
- "branch": "nom-flag",
+ "branch": "master",
"submodules": false,
- "revision": "9001480e03ab8c957716e2bf164bbde605472399",
- "url": null,
- "hash": "1iiplqa731ldha728xk2fi36n87p20hnzf35g21jli1dlknw388f"
+ "revision": "77c906c0ba56aabdbc72041bf9111b565cdd6171",
+ "url": "https://github.com/serokell/deploy-rs/archive/77c906c0ba56aabdbc72041bf9111b565cdd6171.tar.gz",
+ "hash": "0mh86igciasvqnmm7lvdp937yi6x8n4lalss6l4rvjyv7601h2w7"
},
"flake-compat": {
"type": "GitRelease",
@@ -114,9 +115,9 @@
},
"branch": "release-25.11",
"submodules": false,
- "revision": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
- "url": "https://github.com/nix-community/home-manager/archive/0d782ee42c86b196acff08acfbf41bb7d13eed5b.tar.gz",
- "hash": "1kqxy6r4ahnbazmpa4pncdp62najdikdaw8hvrv8nl6qxvbmf9fy"
+ "revision": "7afd8cebb99e25a64a745765920e663478eb8830",
+ "url": "https://github.com/nix-community/home-manager/archive/7afd8cebb99e25a64a745765920e663478eb8830.tar.gz",
+ "hash": "08ls04dhzda3wcmd5250kvany5wc2mcqhcshb9fsymbgcr72bxjq"
},
"isabelle-utils": {
"type": "Git",
@@ -138,9 +139,9 @@
},
"branch": "main",
"submodules": false,
- "revision": "95ac829cf361035d8d8ee46eb3540d21f7bac842",
+ "revision": "d0190cff6f2314cc1c727ff113aea20e086f4bcc",
"url": null,
- "hash": "0ncnlyyhbrk24xvjzv3wlab50qx3pqqfsrp06a5088rq355kpilc"
+ "hash": "0gym67yfpxb2fjzdhgy4vlhvca6zkl47zcgnf42xaaar52bh8b99"
},
"lix-nixos-module": {
"type": "Git",
@@ -150,9 +151,9 @@
},
"branch": "main",
"submodules": false,
- "revision": "1688100bba140492658d597f6b307c327f35c780",
+ "revision": "5e56f5a973e24292b125dca9e9d506b0a91d6903",
"url": null,
- "hash": "0pyzj0rdq62fz2i06ldwf9ridp195p6vvsp8yb1pii8h2q81v9lp"
+ "hash": "1ckmm82bdhbmy146v2kcmg92179k5n8flhy49dbvpxgwyzfh5nfb"
},
"mirage-opam-overlays": {
"type": "Git",
@@ -176,9 +177,9 @@
},
"branch": "nixos-25.11",
"submodules": false,
- "revision": "23f0a53ca6e58e61e1ea2b86791c69b79c91656d",
- "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=23f0a53ca6e58e61e1ea2b86791c69b79c91656d",
- "hash": "0pqc7bay9v360x2b7irqaz4ly63gp4z859cgg5c04imknv0pwjqw"
+ "revision": "25e6dbb8fca3b6e779c5a46fd03bd760b2165bb5",
+ "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=25e6dbb8fca3b6e779c5a46fd03bd760b2165bb5",
+ "hash": "0f1mq2gdmx9wd0k89f6w61sbfzpd1wwz857l2xvyp1x0msmd2z20"
},
"nixpkgs": {
"type": "Git",
@@ -189,9 +190,9 @@
},
"branch": "nixos-25.11",
"submodules": false,
- "revision": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
- "url": "https://github.com/NixOS/nixpkgs/archive/23d72dabcb3b12469f57b37170fcbc1789bd7457.tar.gz",
- "hash": "0dhpsdghgajfkbq8d00p9x4nbnzgl4wmkz7h77zvgc3h40ylk4yg"
+ "revision": "1073dad219cb244572b74da2b20c7fe39cb3fa9e",
+ "url": "https://github.com/NixOS/nixpkgs/archive/1073dad219cb244572b74da2b20c7fe39cb3fa9e.tar.gz",
+ "hash": "0xgsq0cfjnl2axbzzw579jrjq9g8mhbgjgfippl3qx03im636p5l"
},
"nixpkgs-unstable": {
"type": "Git",
@@ -202,9 +203,9 @@
},
"branch": "nixpkgs-unstable",
"submodules": false,
- "revision": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51",
- "url": "https://github.com/NixOS/nixpkgs/archive/fef9403a3e4d31b0a23f0bacebbec52c248fbb51.tar.gz",
- "hash": "1fzknmnvbfj8bxkw7bqcyjvxy3v2vz11vkp3r8nwihmrf6wnlpd4"
+ "revision": "b63fe7f000adcfa269967eeff72c64cafecbbebe",
+ "url": "https://github.com/NixOS/nixpkgs/archive/b63fe7f000adcfa269967eeff72c64cafecbbebe.tar.gz",
+ "hash": "095ivddf22pgq7g4fqgp88hnzi5h97p87yf51cr0ajql0ghbz108"
},
"ntfy-matrix-bot": {
"type": "Git",
@@ -242,9 +243,9 @@
},
"branch": "main",
"submodules": false,
- "revision": "1f373ef8c4cc1237a74c681b47bbdbdf7ab185a6",
- "url": "https://github.com/tweag/opam-nix/archive/1f373ef8c4cc1237a74c681b47bbdbdf7ab185a6.tar.gz",
- "hash": "1n1xzxrzypxr7wr3ij0yf13fsrx6xac9jd3m06pk4d2icpq0lmrv"
+ "revision": "2e20bbbe8130d1880338291446fd4e710a4db9a1",
+ "url": "https://github.com/tweag/opam-nix/archive/2e20bbbe8130d1880338291446fd4e710a4db9a1.tar.gz",
+ "hash": "150swry9dsix1w727rg89r6yv4vh6xx51nxvg2xbyxi409skqb2x"
},
"opam-overlays": {
"type": "Git",
@@ -312,9 +313,9 @@
},
"branch": "master",
"submodules": false,
- "revision": "11a396520bf911e4ed01e78e11633d3fc63b350e",
- "url": "https://github.com/oxalica/rust-overlay/archive/11a396520bf911e4ed01e78e11633d3fc63b350e.tar.gz",
- "hash": "1wxy14xdw29z144vmp90iai8k5zq3ppq5p1bvbvnnbbg9kx5z4mf"
+ "revision": "d9f52b51548e76ab8b6e7d647763047ebdec835c",
+ "url": "https://github.com/oxalica/rust-overlay/archive/d9f52b51548e76ab8b6e7d647763047ebdec835c.tar.gz",
+ "hash": "1vx5dnxa0jlmhvkcrm33afg5rknjkhy14cmmc1822f5k2acbis6w"
},
"showrt": {
"type": "Git",
@@ -337,9 +338,21 @@
},
"branch": "master",
"submodules": false,
- "revision": "d6e0e666048a5395d6ea4283143b7c9ac704720d",
- "url": "https://github.com/Mic92/sops-nix/archive/d6e0e666048a5395d6ea4283143b7c9ac704720d.tar.gz",
- "hash": "0f2l5w6af84skfmy051s5727n2wc3bq2fvdjf34jkliyi7jdgfy5"
+ "revision": "8adb84861fe70e131d44e1e33c426a51e2e0bfa5",
+ "url": "https://github.com/Mic92/sops-nix/archive/8adb84861fe70e131d44e1e33c426a51e2e0bfa5.tar.gz",
+ "hash": "1dk6y6khmx8kqf382qvvksb9kvppp200hmj9sbfd95a7035n1sqg"
+ },
+ "tracktrain": {
+ "type": "Git",
+ "repository": {
+ "type": "Git",
+ "url": "https://stuebinm.eu/git/tracktrain"
+ },
+ "branch": "main",
+ "submodules": false,
+ "revision": "3cd83d99fe477e78639c795a6b8ff4c844eb34a1",
+ "url": null,
+ "hash": "143ijhqir43a054abaagsjngxlc9j6vm0wfqw3gfwkhm5m9nic2c"
},
"traveltext": {
"type": "Git",
diff --git a/pkgs/default.nix b/pkgs/default.nix
index ce35fc2..5563b52 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -2,12 +2,11 @@
{
inherit (nixpkgs)
- galmon-core galmon-full almanac rustex
- kijetesantakaluotokieni showrt isabelle-utils isabat
- travelynx crs-tracker crs-php bahnhof-name matrix-to
- hikari_unstable heartwood radicle-interface radicle-tui
- inweb nomsring bookwyrm mollysocket git-annex-remote-remarkable2
- ntfy-matrix-bot transport_validator mergiraf git-who plover plover-dev;
+ galmon-core galmon-full almanac rustex kijetesantakaluotokieni showrt
+ isabelle-utils isabat travelynx crs-tracker crs-php bahnhof-name matrix-to
+ hikari heartwood radicle-interface radicle-tui inweb nomsring bookwyrm
+ mollysocket git-annex-remote-remarkable2 ntfy-matrix-bot transport_validator
+ mergiraf git-who plover plover-dev tracktrain;
pkgs = nixpkgs;
}
diff --git a/pkgs/hikari.nix b/pkgs/hikari.nix
index afbc335..e096b5a 100644
--- a/pkgs/hikari.nix
+++ b/pkgs/hikari.nix
@@ -1,8 +1,8 @@
-{ lib, stdenv, fetchzip
-, pkg-config, bmake
+{ lib, stdenv, fetchgit
+, pkg-config
, cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman
, libucl, wayland, wayland-protocols, wayland-scanner, wlroots, mesa
-, libdrm, libgbm
+, libdrm, libgbm, ninja, libxcb-wm, meson
, features ? {
gammacontrol = true;
layershell = true;
@@ -13,14 +13,15 @@
stdenv.mkDerivation rec {
pname = "hikari";
- version = "2.3.3";
+ version = "3.0.0";
- src = fetchzip {
- url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz";
- sha256 = "sha256-5Ug0U3ESC5F/gj7bahnLYkeY/weSCj0QASwdFuWwdMI=";
+ src = fetchgit {
+ url = "https://codeberg.org/thomasadam/hikari";
+ rev = version;
+ hash = "sha256-gcD0VYIqGoArvRcDpS0BYGDwuxVJZYQpuvv0is6dozM=";
};
- nativeBuildInputs = [ pkg-config bmake ];
+ nativeBuildInputs = [ pkg-config meson ninja ];
buildInputs = [
cairo
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
libevdev
libinput
libxkbcommon
+ libxcb-wm
libdrm
libgbm
linux-pam
@@ -41,22 +43,9 @@ stdenv.mkDerivation rec {
wlroots
];
- patches = [ ./patches/hikari-gtk4.patch ];
-
enableParallelBuilding = true;
- makeFlags = with lib; [ "PREFIX=$(out)" "DEBUG=YES" ]
- ++ optional stdenv.isLinux "WITH_POSIX_C_SOURCE=YES"
- ++ mapAttrsToList (feat: enabled:
- optionalString enabled "WITH_${toUpper feat}=YES"
- ) features;
-
postPatch = ''
- # Can't suid in nix store
- # Run hikari as root (it will drop privileges as early as possible), or create
- # a systemd unit to give it the necessary permissions/capabilities.
- substituteInPlace Makefile --replace '4555' '555'
-
sed -i 's@<drm_fourcc.h>@<libdrm/drm_fourcc.h>@' src/*.c
'';
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index f76496e..abd3da2 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -180,6 +180,10 @@ in
'';
};
+ tracktrain = self.callPackage inputs.tracktrain {
+ compiler = "default";
+ };
+
bahnhof-name =
let
haskellPkgs = self.haskellPackages.override (old: {
@@ -234,9 +238,9 @@ in
}) {};
};
});
- pkg = { mkDerivation, base, bytestring, cassava, containers
+ pkg = { mkDerivation, base, bytestring, cassava, containers, dns
, fuzzyfind, fuzzyset, http-client, http-client-rustls, http-types
- , lib, stm, text, time, vector, wai, wai-extra, warp
+ , lib, network, stm, text, time, vector, wai, wai-extra, warp
}:
mkDerivation {
pname = "bahnhof-name";
@@ -245,10 +249,11 @@ in
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base bytestring cassava containers fuzzyfind fuzzyset http-client
- http-client-rustls http-types stm text time vector wai wai-extra
- warp
+ base bytestring cassava containers dns fuzzyfind fuzzyset
+ http-client http-client-rustls http-types network stm text time
+ vector wai wai-extra warp
];
+ description = "Serve information on German railway stations";
jailbreak = true;
mainProgram = "bahnhof-name";
license = lib.licenses.eupl12;
@@ -265,13 +270,6 @@ in
#### sporadically maintained / updated ####
- hikari_unstable = (unstable.hikari.overrideAttrs (old: {
- src = /home/stuebinm/clones/hikari;
- buildInputs = old.buildInputs ++ [ self.pandoc self.xorg.xcbutilwm.dev ]; #self.libdrm self.libdrm.dev ];
- makeFlags = with self.lib;
- [ "PREFIX=$(out)" "WITH_POSIX_C_SOURCE=YES"
- "WITH_GAMMACONTROL=YES" "WITH_LAYERSHELL=YES" "WITH_SCREENCOPY=YES" ];
- })).override { wlroots = unstable.wlroots_0_16; stdenv = self.clangStdenv; };
twelf = super.twelf.overrideAttrs (old: {
src = self.fetchFromGitHub {
owner = "k4rtik";
@@ -305,9 +303,7 @@ in
};
- hikari = self.callPackage ./hikari.nix { wlroots = self.wlroots_0_15; };
-
- wlroots_0_15 = self.callPackage ./wlroots_0_15.nix {};
+ hikari = self.callPackage ./hikari.nix { };
travelynx = self.callPackage ./travelynx.nix {};
diff --git a/secrets/chaski.yaml b/secrets/chaski.yaml
index 7f07b2c..31c18b3 100644
--- a/secrets/chaski.yaml
+++ b/secrets/chaski.yaml
@@ -1,10 +1,10 @@
ntfy-matrix-bot:
env: ENC[AES256_GCM,data:mk/7fcdfsq+BOB8QK7LzVhYMDmMLw0cB0qq3p2IGWQAJtodqlqQMJukVF0jpoJLB/9GMcCweloVikus9K23/lcUPMZFHCdpMRR94puGROub8RF+v6XvegC741utlsLWGnS+Z/U8atHoI2rptdh4OV9lwELFYMpwDC/2IhxnhIyqWbAKnuWGdJcNVAKF6QxI0gY854xKoxRNXs3BrctoubSbBSyarjQiFgpk=,iv:jip5eTFPyBa199/SZhfezMY+Og8i1rh+2dmfVzBRPpo=,tag:xyLR34PqtJI63M5qnMvemQ==,type:str]
+tracktrain:
+ env: ""
+nginx:
+ tracktrain-auth: ENC[AES256_GCM,data:VlcsqohpTdTJ56DtKfjkGZD671jW5LBLWhcKfBQAmYq0RBtiBTzM0oZTYGl7quUZPuIAB0bM8alEcGsPQep8wAre,iv:+I0PQr4LwjwC2xTJDXpr7UxqTAhDCk3JvMlsmaOK6L8=,tag:LzjbqFruDNWGFm03yft79A==,type:str]
sops:
- kms: []
- gcp_kms: []
- azure_kv: []
- hc_vault: []
age:
- recipient: age18wkr3kjalalzrq9l05q32gnlaqr7t6rqqzde307m83rs9fp4xcfsdtj9gt
enc: |
@@ -24,8 +24,7 @@ sops:
aFF6Nkowc3kxckFGNWRqSUxYdXZOd0kKsoRAtnnhIkaPACXgaGzMNW6uAG4pAg4d
DdgcTPKdAEv0uAqAmndsll+vWE1C0FaUwe37/jmBfAKrXpN7GwVa4g==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2024-03-27T22:32:40Z"
- mac: ENC[AES256_GCM,data:MJTMrHLh9rL7p1Y+e4if51ZYvfYWDV25eJvJ3unZwIAahF5GoOav4rb1hU1hLObZFhtlyjgHe/VGP2D+QsDARJOop0kGiybnfHqz7Vh7KIWhjDwsxaBPkxMUovxrEhxnwHR8+zKqNs+Vcl06ZaJ2F6U0rJRqyxO2CK5aSnuqDtE=,iv:qDsnPrVlnwnmWFJYxgCBCvg1/qgFl1IOC3QEifXaEbs=,tag:/oVJDam2l7pD+g2tIBAakg==,type:str]
- pgp: []
+ lastmodified: "2026-03-29T21:30:26Z"
+ mac: ENC[AES256_GCM,data:4zial4AotTlj7/EifC6A9SptDM0HjdBJcINRUPGv0FT8QjinfQD8kQTlRh6LOr+2jfcNkoll5Inxt4Aibl0FpYjiaiML2T2RZXb3e12JE7gcE1ndNBWMbS2DRF2DWPrQywoW2a6IzI3oAC9dZxrFBVkx8mPYGWBtxifmYCBqPfU=,iv:9OBOAR+HS/hDwEh7DK+Vc6s+pwFWDlduq1sxb9aXkvk=,tag:hCFbxL8pFivX7QCDQ6QmYg==,type:str]
unencrypted_suffix: _unencrypted
- version: 3.8.1
+ version: 3.12.1
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-31 00:24:02 +0000