kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-16 10:11:08 +01:00
Code Releases Activity

fix makanek and ful build

Browse Source
This commit is contained in:
Kierán Meinhardt
2025-12-25 14:44:56 +01:00
parent dd50715f43
commit 37ef9a1b05
4 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flake.nix
View File

@@ -228,9 +228,9 @@
cyberlocker-tools = prev.callPackage packages/cyberlocker-tools.nix { }; cyberlocker-tools = prev.callPackage packages/cyberlocker-tools.nix { };
hc = prev.callPackage packages/hc.nix { }; hc = prev.callPackage packages/hc.nix { };
pls = prev.callPackage packages/pls.nix { }; pls = prev.callPackage packages/pls.nix { };
radio-news = prev.callPackage packages/radio-news.nix { }; radio-news = prev.callPackage packages/radio-news { };
untilport = prev.callPackage packages/untilport.nix { }; untilport = prev.callPackage packages/untilport.nix { };
weechat-declarative = prev.callPackage packages/weechat-declarative {}; weechat-declarative = prev.callPackage packages/weechat-declarative.nix {};
# my packages # my packages
betacode = prev.callPackage packages/betacode.nix { }; betacode = prev.callPackage packages/betacode.nix { };
@@ -327,6 +327,7 @@
system = "aarch64-linux"; system = "aarch64-linux";
specialArgs = niveumSpecialArgs system; specialArgs = niveumSpecialArgs system;
modules = [ modules = [
{ nixpkgs.overlays = [ self.overlays.default ]; }
systems/ful/configuration.nix systems/ful/configuration.nix
agenix.nixosModules.default agenix.nixosModules.default
self.nixosModules.passport self.nixosModules.passport
@@ -351,6 +352,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = niveumSpecialArgs system; specialArgs = niveumSpecialArgs system;
modules = [ modules = [
{ nixpkgs.overlays = [ self.overlays.default ]; }
systems/zaatar/configuration.nix systems/zaatar/configuration.nix
agenix.nixosModules.default agenix.nixosModules.default
retiolum.nixosModules.retiolum retiolum.nixosModules.retiolum
@@ -360,6 +362,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = niveumSpecialArgs system; specialArgs = niveumSpecialArgs system;
modules = [ modules = [
{ nixpkgs.overlays = [ self.overlays.default ]; }
systems/kibbeh/configuration.nix systems/kibbeh/configuration.nix
agenix.nixosModules.default agenix.nixosModules.default
retiolum.nixosModules.retiolum retiolum.nixosModules.retiolum
@@ -371,6 +374,7 @@
# for using inputs in other config files # for using inputs in other config files
specialArgs = niveumSpecialArgs system; specialArgs = niveumSpecialArgs system;
modules = [ modules = [
{ nixpkgs.overlays = [ self.overlays.default ]; }
systems/makanek/configuration.nix systems/makanek/configuration.nix
self.nixosModules.telegram-bot self.nixosModules.telegram-bot
self.nixosModules.passport self.nixosModules.passport
@@ -383,6 +387,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = niveumSpecialArgs system; specialArgs = niveumSpecialArgs system;
modules = [ modules = [
{ nixpkgs.overlays = [ self.overlays.default ]; }
systems/tahina/configuration.nix systems/tahina/configuration.nix
agenix.nixosModules.default agenix.nixosModules.default
retiolum.nixosModules.retiolum retiolum.nixosModules.retiolum
@@ -392,6 +397,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = niveumSpecialArgs system; specialArgs = niveumSpecialArgs system;
modules = [ modules = [
{ nixpkgs.overlays = [ self.overlays.default ]; }
systems/tabula/configuration.nix systems/tabula/configuration.nix
agenix.nixosModules.default agenix.nixosModules.default
retiolum.nixosModules.retiolum retiolum.nixosModules.retiolum
@@ -401,6 +407,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = niveumSpecialArgs system; specialArgs = niveumSpecialArgs system;
modules = [ modules = [
{ nixpkgs.overlays = [ self.overlays.default ]; }
systems/manakish/configuration.nix systems/manakish/configuration.nix
agenix.nixosModules.default agenix.nixosModules.default
retiolum.nixosModules.retiolum retiolum.nixosModules.retiolum
@@ -414,6 +421,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = niveumSpecialArgs system; specialArgs = niveumSpecialArgs system;
modules = [ modules = [
{ nixpkgs.overlays = [ self.overlays.default ]; }
systems/kabsa/configuration.nix systems/kabsa/configuration.nix
agenix.nixosModules.default agenix.nixosModules.default
retiolum.nixosModules.retiolum retiolum.nixosModules.retiolum

11
packages/weechat-declarative.nix
View File

@@ -9,7 +9,7 @@
config = args.config or {}; config = args.config or {};
lib = lib =
lib.recursiveUpdate args.lib args.lib //
(let (let
attrPaths = let attrPaths = let
recurse = path: value: recurse = path: value:
@@ -18,11 +18,6 @@
else [(lib.nameValuePair path value)]; else [(lib.nameValuePair path value)];
in in
attrs: lib.flatten (recurse [] attrs); attrs: lib.flatten (recurse [] attrs);
in {
inherit attrPaths;
attrPathsSep = sep: attrs: lib.listToAttrs (map (x: x // {name = lib.concatStringsSep sep x.name;}) (attrPaths attrs));
toWeechatValue = x: toWeechatValue = x:
{ {
bool = builtins.toJSON x; bool = builtins.toJSON x;
@@ -31,6 +26,10 @@
int = toString x; int = toString x;
} }
.${builtins.typeOf x}; .${builtins.typeOf x};
in {
inherit attrPaths toWeechatValue;
attrPathsSep = sep: attrs: lib.listToAttrs (map (x: x // {name = lib.concatStringsSep sep x.name;}) (attrPaths attrs));
setCommand = name: value: "/set ${name} \"${toWeechatValue value}\""; setCommand = name: value: "/set ${name} \"${toWeechatValue value}\"";

44
systems/ful/panoptikon.nix
View File

@@ -4,7 +4,7 @@
lib, lib,
... ...
}: let }: let
irc-xxx = lib.panoptikon.kpaste-irc { irc-xxx = pkgs.lib.panoptikon.kpaste-irc {
target = lib.escapeShellArg "#xxx"; target = lib.escapeShellArg "#xxx";
retiolumLink = true; retiolumLink = true;
}; };
@@ -37,7 +37,7 @@
| ${pkgs.jq}/bin/jq -e .ok | ${pkgs.jq}/bin/jq -e .ok
''; '';
irc-kmein = lib.panoptikon.kpaste-irc { irc-kmein = pkgs.lib.panoptikon.kpaste-irc {
messagePrefix = "$PANOPTIKON_WATCHER: "; messagePrefix = "$PANOPTIKON_WATCHER: ";
target = "kmein"; target = "kmein";
nick = "panoptikon-kmein"; nick = "panoptikon-kmein";
@@ -56,7 +56,7 @@ in {
enable = true; enable = true;
watchers = { watchers = {
"github-meta" = { "github-meta" = {
script = lib.panoptikon.urlJSON { script = pkgs.lib.panoptikon.urlJSON {
jqScript = '' jqScript = ''
{ {
ssh_key_fingerprints: .ssh_key_fingerprints, ssh_key_fingerprints: .ssh_key_fingerprints,
@@ -67,79 +67,79 @@ in {
reporters = [irc-xxx]; reporters = [irc-xxx];
}; };
lammla = { lammla = {
script = lib.panoptikon.url "http://lammla.info/index.php?reihe=30"; script = pkgs.lib.panoptikon.url "http://lammla.info/index.php?reihe=30";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
kratylos = { kratylos = {
script = lib.panoptikon.url "https://kratylos.reichert-online.org/current_issue/KRATYLOS"; script = pkgs.lib.panoptikon.url "https://kratylos.reichert-online.org/current_issue/KRATYLOS";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
kobudo-tesshinkan = { kobudo-tesshinkan = {
script = lib.panoptikon.url "https://kobudo-tesshinkan.eu/index.php/de/termine-berichte/lehrgaenge/"; script = pkgs.lib.panoptikon.url "https://kobudo-tesshinkan.eu/index.php/de/termine-berichte/lehrgaenge/";
reporters = [telegram-kmein matrix-kmein]; reporters = [telegram-kmein matrix-kmein];
}; };
zeno-free = { zeno-free = {
script = lib.panoptikon.urlSelector ".zenoCOMain" "http://www.zeno.org/Lesesaal/M/E-Books"; script = pkgs.lib.panoptikon.urlSelector ".zenoCOMain" "http://www.zeno.org/Lesesaal/M/E-Books";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
carolinawelslau = { carolinawelslau = {
script = lib.panoptikon.urlSelector "#main" "https://carolinawelslau.de/"; script = pkgs.lib.panoptikon.urlSelector "#main" "https://carolinawelslau.de/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
humboldt-preis = { humboldt-preis = {
script = lib.panoptikon.urlSelector "#content-core" "https://www.hu-berlin.de/de/ueberblick/menschen/ehrungen/humboldtpreis"; script = pkgs.lib.panoptikon.urlSelector "#content-core" "https://www.hu-berlin.de/de/ueberblick/menschen/ehrungen/humboldtpreis";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
lisalittmann = { lisalittmann = {
script = lib.panoptikon.urlSelector "#site-content" "https://lisalittmann.de/"; script = pkgs.lib.panoptikon.urlSelector "#site-content" "https://lisalittmann.de/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
lisalittmann-archive = { lisalittmann-archive = {
script = lib.panoptikon.urlSelector "#site-content" "https://lisalittmann.de/archive/"; script = pkgs.lib.panoptikon.urlSelector "#site-content" "https://lisalittmann.de/archive/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
lisalittmann-projects = { lisalittmann-projects = {
script = lib.panoptikon.urlSelector "#site-content" "https://lisalittmann.de/projects/"; script = pkgs.lib.panoptikon.urlSelector "#site-content" "https://lisalittmann.de/projects/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
tatort = { tatort = {
script = lib.panoptikon.urlSelector ".linklist" "https://www.daserste.de/unterhaltung/krimi/tatort/sendung/index.html"; script = pkgs.lib.panoptikon.urlSelector ".linklist" "https://www.daserste.de/unterhaltung/krimi/tatort/sendung/index.html";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
warpgrid-idiomarium = { warpgrid-idiomarium = {
script = lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/idiomarium/"; script = pkgs.lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/idiomarium/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
warpgrid-futurism = { warpgrid-futurism = {
script = lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/futurism/"; script = pkgs.lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/futurism/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
warpgrid-imagiary = { warpgrid-imagiary = {
script = lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/imagiary/"; script = pkgs.lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/imagiary/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
warpgrid-alchemy = { warpgrid-alchemy = {
script = lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/alchemy/"; script = pkgs.lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/alchemy/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
indogermanische-forschungen = { indogermanische-forschungen = {
script = lib.panoptikon.urlSelector "#latestIssue" "https://www.degruyter.com/journal/key/INDO/html"; script = pkgs.lib.panoptikon.urlSelector "#latestIssue" "https://www.degruyter.com/journal/key/INDO/html";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
ig-neuigkeiten = { ig-neuigkeiten = {
script = lib.panoptikon.urlSelector "[itemprop=articleBody]" "https://www.indogermanistik.org/aktuelles/neuigkeiten.html"; script = pkgs.lib.panoptikon.urlSelector "[itemprop=articleBody]" "https://www.indogermanistik.org/aktuelles/neuigkeiten.html";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
ig-tagungen = { ig-tagungen = {
script = lib.panoptikon.urlSelector "[itemprop=articleBody]" "https://www.indogermanistik.org/tagungen/tagungen-der-ig.html"; script = pkgs.lib.panoptikon.urlSelector "[itemprop=articleBody]" "https://www.indogermanistik.org/tagungen/tagungen-der-ig.html";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
fu-distant = { fu-distant = {
script = lib.panoptikon.urlSelector "#current_events" "https://www.geschkult.fu-berlin.de/en/e/ma-distant/Termine/index.html"; script = pkgs.lib.panoptikon.urlSelector "#current_events" "https://www.geschkult.fu-berlin.de/en/e/ma-distant/Termine/index.html";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
fu-aegyptologie = { fu-aegyptologie = {
script = lib.panoptikon.urlSelector "#current_events" "https://www.geschkult.fu-berlin.de/e/aegyptologie/termine/index.html"; script = pkgs.lib.panoptikon.urlSelector "#current_events" "https://www.geschkult.fu-berlin.de/e/aegyptologie/termine/index.html";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
}; };

4
systems/makanek/weechat.nix
View File

@@ -29,8 +29,8 @@ in {
scripts = [ scripts = [
pkgs.weechatScripts.weechat-autosort pkgs.weechatScripts.weechat-autosort
pkgs.weechatScripts.colorize_nicks pkgs.weechatScripts.colorize_nicks
pkgs.weechatScripts.hotlist2extern
# pkgs.weechatScripts.weechat-matrix # pkgs.weechatScripts.weechat-matrix
(pkgs.callPackage ../../packages/weechatScripts/hotlist2extern.nix {})
]; ];
settings = let settings = let
nick = "kmein"; nick = "kmein";
@@ -180,7 +180,7 @@ in {
users.extraUsers.weechat = { users.extraUsers.weechat = {
useDefaultShell = true; useDefaultShell = true;
openssh.authorizedKeys.keys = openssh.authorizedKeys.keys =
kieran.sshKeys pkgs.lib.niveum.kieran.sshKeys
++ [ ++ [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC+KVDmYYH7mA8v81e9O3swXm3ZVYY9t4HP65ud61uXy weechat_android@kibbeh" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC+KVDmYYH7mA8v81e9O3swXm3ZVYY9t4HP65ud61uXy weechat_android@kibbeh"
]; ];