Merge remote-tracking branch 'lass/master'

author: makefu <github@syntax-fehler.de> 2022-12-12 19:44:00 +0100
committer: makefu <github@syntax-fehler.de> 2022-12-12 19:44:00 +0100
commit: 6eb5e44b7e5bdc8b1b3b5ffe40c146841f7afd10 (patch)
tree: f706bf7c3c7a289f680ac329caa2b578e5145a56 /krebs/5pkgs
parent: 96e934dc8a353cff91ef824f6a125ed49996d058 (diff)
parent: 3884243448869bdf09f6434b385e532c7c26ae88 (diff)
8 files changed, 77 insertions, 203 deletions
diff --git a/krebs/5pkgs/simple/ergo/default.nix b/krebs/5pkgs/simple/ergo/default.nix
deleted file mode 100644
index 2c9223eed..000000000
--- a/krebs/5pkgs/simple/ergo/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ buildGo117Module , fetchFromGitHub, lib }:
-
-buildGo117Module rec {
-  pname = "ergo";
-  version = "2.9.1";
-
-  src = fetchFromGitHub {
-    owner = "ergochat";
-    repo = "ergo";
-    rev = "v${version}";
-    sha256 = "sha256-RxsmkTfHymferS/FRW0sLnstKfvGXkW6cEb/JbeS4lc=";
-  };
-
-  vendorSha256 = null;
-
-  meta = {
-    description = "A modern IRC server (daemon/ircd) written in Go";
-    homepage = "https://github.com/ergochat/ergo";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ lassulus tv ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/krebs/5pkgs/simple/hashPassword/default.nix b/krebs/5pkgs/simple/hashPassword/default.nix
index 3c604be80..8d3ba2525 100644
--- a/krebs/5pkgs/simple/hashPassword/default.nix
+++ b/krebs/5pkgs/simple/hashPassword/default.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, ... }:
 
-pkgs.writeDashBin "hashPassword" ''
+pkgs.writers.writeDashBin "hashPassword" ''
   # usage: hashPassword [...]
   set -euf
 
diff --git a/krebs/5pkgs/simple/htgen/default.nix b/krebs/5pkgs/simple/htgen/default.nix
index 14b6f4c58..1ee13783b 100644
--- a/krebs/5pkgs/simple/htgen/default.nix
+++ b/krebs/5pkgs/simple/htgen/default.nix
@@ -1,13 +1,12 @@
 { fetchgit, lib, pkgs, stdenv }:
 stdenv.mkDerivation rec {
   pname = "htgen";
-  version = "1.3.1";
+  version = "1.4.0";
 
-  #src = <htgen>;
   src = fetchgit {
-    url = "http://cgit.krebsco.de/htgen";
+    url = "https://cgit.krebsco.de/htgen";
     rev = "refs/tags/${version}";
-    sha256 = "0ml8kp89bwkrwy6iqclzyhxgv2qn9dcpwaafbmsr4mgcl70zx22r";
+    sha256 = "1k6xdr4g1p2wjiyizwh33ihw3azbar7kmhyxywcq0whpip9inpmj";
   };
 
   installPhase = ''
diff --git a/krebs/5pkgs/simple/krebs-pages/fixtures/index.html b/krebs/5pkgs/simple/krebs-pages/fixtures/index.html
index e6b7034b3..68b2cbad6 100644
--- a/krebs/5pkgs/simple/krebs-pages/fixtures/index.html
+++ b/krebs/5pkgs/simple/krebs-pages/fixtures/index.html
@@ -24,19 +24,10 @@
   }
 </script>
 <body>
-  <p>
-    <a href="http://krebscode.github.io/minikrebs/linuxtag">
-      Linuxtag Heckenkrebs Presentation
-    </a>
-  </p>
-  <p>
-    <a href="http://krebscode.github.io/writeups">
-      CTF Writeups
-    </a>
-  </p>
-  <p>
-    <a href="thesauron.html">
-      Thesauron
-    </a>
-  </p>
+  <p><a href='https://cgit.krebsco.de/krops/about/'>krops</a></p>
+  <p><a href='https://github.com/krebs/cholerab/blob/master/thesauron.adoc'>Thesauron</a></p>
+  <p><a href='https://nixos.wiki/'>Project: The new NixOS wiki</a></p>
+  <p><a target="_blank" href="https://www.amazon.de/?&_encoding=UTF8&tag=krebscode06-21&linkCode=ur2&linkId=d4430b368b8aceeca92101cd4a4cdd1d&camp=1638&creative=6742">Go through this amazon affiliate link and generate krebsgold</a><img src="//ir-de.amazon-adsystem.com/e/ir?t=krebscode06-21&l=ur2&o=3" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" /></p>
+  <p>  <a href="https://s.click.aliexpress.com/e/_A5luNt" target="_parent">Go through this aliexpress affiliate link and generate krebsgold</a></p>
+
 </body>
diff --git a/krebs/5pkgs/simple/krebs-pages/fixtures/thesauron.html b/krebs/5pkgs/simple/krebs-pages/fixtures/thesauron.html
deleted file mode 100644
index bcf1c5d48..000000000
--- a/krebs/5pkgs/simple/krebs-pages/fixtures/thesauron.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<p>Cholerab n.
-[de]
-- Kunstwort aus Kollaboration und Cholera. Beschreibt den Zustand, dass
- Zusammenarbeit niemals gut, einfach und ohne Schmerzen funktioniert.
-- Teamwork-Plattform für Krebscode.</p>
-
-<p>eigentlich adv.
-[de]
-- Hinweis darauf, dass der Inhalt eines Satzes eine Soll-Realität beschreibt,
- die nicht der Fall ist.
-Antonym: tatsaechlich</p>
-
-<p>ghost n.
-[de]
-- Host im Darknet welcher evtl. irgendwie noch da ist (als dd image auf anderen
- Festplatten) aber wohl nie wieder kommen wird.
-Siehe: Wiederbelebung</p>
-
-<p>KD;RP abbr. (pronounciation: kah-derp)
-[en]
-- Short for Krebs Darknet / Retiolum Prefix.</p>
-
-<p>krebs
-[de]
-- krebs ist ein soziales Experiment, eine Organisation, das zweit aelteste
- Softwareprojekt im Shack und viel verteilte infrastruktur.</p>
-
-<p>kremium
-[en]
-- coinage derived from the words premium and krebs
-see: broken
-usage: Reaktor ircbot has unfixed broken behavior since ever-&gt;&#8220;Kremium Software&#8221;</p>
-
-<p>KRI abbr. (pronounciation: [en] cry)
-[en]
-- Short for Krebs Request for Implementation.
- Derived from Scheme Requests for Implementation (SRFI).</p>
-
-<p>litterate programming n.
-[en]
-- any code that has not been proved mathematically.</p>
-
-<p>Nahziel n.
-[de]
-- Ziel mit höchst möglicher Priorität.</p>
-
-<p>Nahzielerfahrung n.
-[de]
-- das Erlebnis der (endgültigen) Nichterreichung eines Nahziels (obwohl
- nur noch wenig ((quasi-) infinitesimal viel) nötig gewesen wäre).</p>
-
-<p>parentheses of fear
-[en]
-- unnecessary parentheses, usually used when order of precedence is unknown.
- - Examples: 1 + (2 * 3)</p>
-
-<p>Protip n.
-[en]
-- (Probably vague) description how a task can be solved.
- - Antonym: Spoiler
- - Example:
- - To defeat the Cyberdaemon, shoot at it until it dies.
- - RTFM</p>
-
-<p>Punching Lemma n.
-[de]
-- Sozialer Druck zur Aufrechterhaltung der Ordnung in dem sozialen Geflaecht
- von Krebs</p>
-
-<p>ref, n.
-[en]
-- A reference like an URI, ISBN, name of a person, etc.</p>
-
-<p>reftrace, n.
-[en]
-- A stacktrace-like representation of refs that lead to some (any kind of)
- conclusion. Usually generated by a human. The conclusion can be either on
- the top or on the bottom of the stack. If the order is ambiguous, then it
- should be communicated explicitly.
- - Example: (conclusion first)
- - http://en.wikipedia.org/wiki/Stack_trace
- - google &#8220;stacktrace&#8221; (first entry / 2014&#8211;12&#8211;05T12:13:58Z)
- - think about some example [this could be omitted, as it&#8217;s obvious&#8230;]</p>
-
-<p>Retiolum n.
-[en]
-- The official darknet of Krebs which utilizes the Retiolum Prefix to
- address individual nodes.</p>
-
-<p>Retiolum Prefix n.
-[en]
-- The universally accepted IPv6-prefix, 42::/16. Anyone can has a
- /128-subnet and, if require, anything larger.</p>
-
-<p>Retiolum Realtime Map n.
-[en]
-- The network map of the public visible part of Retiolum.</p>
-
-<p>RRM [abbr.][en]
-- Short for Retiolum Retiolum Map.</p>
-
-<p>Sanatorium n.
-[en]
-- The Krebs Control and Command Center.
-- An Retiolum-based IRC-channel where all Reaktor-enabled nodes gather
- and lurk for relevant input.</p>
-
-<p>Spoiler n.
-[en]
-- A subset of walkthrough, i.e. any individual steps may be omitted.
- - Antonym: Protip</p>
-
-<p>tatsaechlich, adv.
-[de]
-- Hinweis darauf, dass der Inhalt eines Satzes exakt der Realität entspricht.
-Antonym: eigentlich</p>
-
-<p>Verkrebsung n.
-[de]
-- Synonym fuer die Installation von Krebs (oder eine einzelnen Krebs
- Komponente) auf einem beliebigem System.</p>
-
-<p>Walkthrough n.
-[en]
-- Description of the individual steps to complete a task.
- - Examples:
- - program code
- - small-step semantics</p>
-
-<p>Wiederbelebung n.
-[de]
-- Ein ghost wird im Darknet wieder erreichbar
-Siehe: ghost</p>
diff --git a/krebs/5pkgs/simple/nix-prefetch-github.nix b/krebs/5pkgs/simple/nix-prefetch-github.nix
deleted file mode 100644
index 14096c33f..000000000
--- a/krebs/5pkgs/simple/nix-prefetch-github.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ curl, jq, nix, writeDashBin }:
-
-writeDashBin "nix-prefetch-github" ''
-  # usage: nix-prefetch-github OWNER REPO [REF]
-  set -efu
-
-  owner=$1
-  repo=$2
-  ref=''${3-master}
-
-  info_url=https://api.github.com/repos/$owner/$repo/commits/$ref
-  info=$(${curl}/bin/curl -fsS "$info_url")
-  rev=$(printf %s "$info" | ${jq}/bin/jq -r .sha)
-
-  name=$owner-$repo-$ref
-  url=https://github.com/$owner/$repo/tarball/$rev
-  sha256=$(${nix}/bin/nix-prefetch-url --name "$name" --unpack "$url")
-
-  export owner repo rev sha256
-  ${jq}/bin/jq -n '
-    env | {
-      owner, repo, rev, sha256
-    }
-  '
-''
diff --git a/krebs/5pkgs/simple/stable-generate/default.nix b/krebs/5pkgs/simple/stable-generate/default.nix
new file mode 100644
index 000000000..fac261613
--- /dev/null
+++ b/krebs/5pkgs/simple/stable-generate/default.nix
@@ -0,0 +1,64 @@
+{ pkgs, lib, ... }:
+
+pkgs.writers.writeDashBin "stable-generate" ''
+  set -efu
+
+  export PATH=${lib.makeBinPath [
+    pkgs.curl
+    pkgs.jq
+  ]}
+
+  STABLE_URL=''${STABLE_URL:-http://stable-confusion.r}
+
+  PAYLOAD=$(jq -cn --arg query "$*" '{fn_index: 51, data: [
+    $query,
+    "",
+    "None",
+    "None",
+    20, # sampling steps
+    "Euler a", # sampling method
+    false, # restore faces
+    false,
+    1,
+    1,
+    7,
+    -1,
+    -1,
+    0,
+    0,
+    0,
+    false,
+    512, #probably resolution
+    512, #probably resolution
+    false,
+    0.7,
+    0,
+    0,
+    "None",
+    "",
+    false,
+    false,
+    false,
+    "",
+    "Seed",
+    "",
+    "Nothing",
+    "",
+    true,
+    false,
+    false,
+    null,
+    "",
+  ""], session_hash: "hello_this_is_dog"}')
+
+  data=$(curl -Ssf "$STABLE_URL/run/predict/" \
+    -X POST \
+    --Header 'Content-Type: application/json' \
+    --data "$PAYLOAD"
+  )
+  export data
+
+  filename=$(jq -rn 'env.data | fromjson.data[0][0].name')
+
+  echo "$STABLE_URL/file=$filename"
+''
diff --git a/krebs/5pkgs/simple/weechat-declarative/default.nix b/krebs/5pkgs/simple/weechat-declarative/default.nix
index 5f9c8635b..93c73761c 100644
--- a/krebs/5pkgs/simple/weechat-declarative/default.nix
+++ b/krebs/5pkgs/simple/weechat-declarative/default.nix
@@ -33,7 +33,7 @@ let
 
   eval = lib.evalModules {
     modules = lib.singleton {
-      _file = toString ./weechat-declarative.nix;
+      _file = toString ./default.nix;
       imports = lib.singleton config;
       options = {
         scripts = lib.mkOption {
@@ -148,7 +148,8 @@ let
     ${lib.concatStringsSep "\n"
       (lib.mapAttrsToList
         (name: target: /* sh */ ''
-          ${pkgs.coreutils}/bin/ln -s ${lib.escapeShellArg target} "$CONFDIR"/${lib.escapeShellArg name}
+          ${pkgs.coreutils}/bin/cp ${lib.escapeShellArg target} "$CONFDIR"/${lib.escapeShellArg name}
+          ${pkgs.coreutils}/bin/chmod +w "$CONFDIR"/${lib.escapeShellArg name}
         '')
         cfg.files
       )
author	makefu <github@syntax-fehler.de>	2022-12-12 19:44:00 +0100
committer	makefu <github@syntax-fehler.de>	2022-12-12 19:44:00 +0100
commit	6eb5e44b7e5bdc8b1b3b5ffe40c146841f7afd10 (patch)
tree	f706bf7c3c7a289f680ac329caa2b578e5145a56 /krebs/5pkgs
parent	96e934dc8a353cff91ef824f6a125ed49996d058 (diff)
parent	3884243448869bdf09f6434b385e532c7c26ae88 (diff)