diff --git a/flake.nix b/flake.nix index 78b08db..d7d1960 100644 --- a/flake.nix +++ b/flake.nix @@ -228,9 +228,9 @@ cyberlocker-tools = prev.callPackage packages/cyberlocker-tools.nix { }; hc = prev.callPackage packages/hc.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 { }; - weechat-declarative = prev.callPackage packages/weechat-declarative {}; + weechat-declarative = prev.callPackage packages/weechat-declarative.nix {}; # my packages betacode = prev.callPackage packages/betacode.nix { }; @@ -327,6 +327,7 @@ system = "aarch64-linux"; specialArgs = niveumSpecialArgs system; modules = [ + { nixpkgs.overlays = [ self.overlays.default ]; } systems/ful/configuration.nix agenix.nixosModules.default self.nixosModules.passport @@ -351,6 +352,7 @@ system = "x86_64-linux"; specialArgs = niveumSpecialArgs system; modules = [ + { nixpkgs.overlays = [ self.overlays.default ]; } systems/zaatar/configuration.nix agenix.nixosModules.default retiolum.nixosModules.retiolum @@ -360,6 +362,7 @@ system = "x86_64-linux"; specialArgs = niveumSpecialArgs system; modules = [ + { nixpkgs.overlays = [ self.overlays.default ]; } systems/kibbeh/configuration.nix agenix.nixosModules.default retiolum.nixosModules.retiolum @@ -371,6 +374,7 @@ # for using inputs in other config files specialArgs = niveumSpecialArgs system; modules = [ + { nixpkgs.overlays = [ self.overlays.default ]; } systems/makanek/configuration.nix self.nixosModules.telegram-bot self.nixosModules.passport @@ -383,6 +387,7 @@ system = "x86_64-linux"; specialArgs = niveumSpecialArgs system; modules = [ + { nixpkgs.overlays = [ self.overlays.default ]; } systems/tahina/configuration.nix agenix.nixosModules.default retiolum.nixosModules.retiolum @@ -392,6 +397,7 @@ system = "x86_64-linux"; specialArgs = niveumSpecialArgs system; modules = [ + { nixpkgs.overlays = [ self.overlays.default ]; } systems/tabula/configuration.nix agenix.nixosModules.default retiolum.nixosModules.retiolum @@ -401,6 +407,7 @@ system = "x86_64-linux"; specialArgs = niveumSpecialArgs system; modules = [ + { nixpkgs.overlays = [ self.overlays.default ]; } systems/manakish/configuration.nix agenix.nixosModules.default retiolum.nixosModules.retiolum @@ -414,6 +421,7 @@ system = "x86_64-linux"; specialArgs = niveumSpecialArgs system; modules = [ + { nixpkgs.overlays = [ self.overlays.default ]; } systems/kabsa/configuration.nix agenix.nixosModules.default retiolum.nixosModules.retiolum diff --git a/packages/weechat-declarative.nix b/packages/weechat-declarative.nix index 7f23a13..12bd2c4 100644 --- a/packages/weechat-declarative.nix +++ b/packages/weechat-declarative.nix @@ -9,7 +9,7 @@ config = args.config or {}; lib = - lib.recursiveUpdate args.lib + args.lib // (let attrPaths = let recurse = path: value: @@ -18,11 +18,6 @@ else [(lib.nameValuePair path value)]; in 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: { bool = builtins.toJSON x; @@ -31,6 +26,10 @@ int = toString 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}\""; diff --git a/systems/ful/panoptikon.nix b/systems/ful/panoptikon.nix index 53d0de1..4ee66a1 100644 --- a/systems/ful/panoptikon.nix +++ b/systems/ful/panoptikon.nix @@ -4,7 +4,7 @@ lib, ... }: let - irc-xxx = lib.panoptikon.kpaste-irc { + irc-xxx = pkgs.lib.panoptikon.kpaste-irc { target = lib.escapeShellArg "#xxx"; retiolumLink = true; }; @@ -37,7 +37,7 @@ | ${pkgs.jq}/bin/jq -e .ok ''; - irc-kmein = lib.panoptikon.kpaste-irc { + irc-kmein = pkgs.lib.panoptikon.kpaste-irc { messagePrefix = "$PANOPTIKON_WATCHER: "; target = "kmein"; nick = "panoptikon-kmein"; @@ -56,7 +56,7 @@ in { enable = true; watchers = { "github-meta" = { - script = lib.panoptikon.urlJSON { + script = pkgs.lib.panoptikon.urlJSON { jqScript = '' { ssh_key_fingerprints: .ssh_key_fingerprints, @@ -67,79 +67,79 @@ in { reporters = [irc-xxx]; }; 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]; }; 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]; }; 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]; }; 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]; }; carolinawelslau = { - script = lib.panoptikon.urlSelector "#main" "https://carolinawelslau.de/"; + script = pkgs.lib.panoptikon.urlSelector "#main" "https://carolinawelslau.de/"; reporters = [matrix-kmein]; }; 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]; }; lisalittmann = { - script = lib.panoptikon.urlSelector "#site-content" "https://lisalittmann.de/"; + script = pkgs.lib.panoptikon.urlSelector "#site-content" "https://lisalittmann.de/"; reporters = [matrix-kmein]; }; 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]; }; 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]; }; 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]; }; 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]; }; 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]; }; 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]; }; 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]; }; 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]; }; 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]; }; 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]; }; 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]; }; 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]; }; }; diff --git a/systems/makanek/weechat.nix b/systems/makanek/weechat.nix index bfbd5bd..58d4e16 100644 --- a/systems/makanek/weechat.nix +++ b/systems/makanek/weechat.nix @@ -29,8 +29,8 @@ in { scripts = [ pkgs.weechatScripts.weechat-autosort pkgs.weechatScripts.colorize_nicks + pkgs.weechatScripts.hotlist2extern # pkgs.weechatScripts.weechat-matrix - (pkgs.callPackage ../../packages/weechatScripts/hotlist2extern.nix {}) ]; settings = let nick = "kmein"; @@ -180,7 +180,7 @@ in { users.extraUsers.weechat = { useDefaultShell = true; openssh.authorizedKeys.keys = - kieran.sshKeys + pkgs.lib.niveum.kieran.sshKeys ++ [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC+KVDmYYH7mA8v81e9O3swXm3ZVYY9t4HP65ud61uXy weechat_android@kibbeh" ];