summaryrefslogtreecommitdiffstats
path: root/krebs/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'krebs/2configs')
-rw-r--r--krebs/2configs/backup.nix2
-rw-r--r--krebs/2configs/cal.nix4
-rw-r--r--krebs/2configs/reaktor2.nix42
-rw-r--r--krebs/2configs/repo-sync.nix3
-rw-r--r--krebs/2configs/wiki.nix8
5 files changed, 29 insertions, 30 deletions
diff --git a/krebs/2configs/backup.nix b/krebs/2configs/backup.nix
index 7ee438784..83dbf66fb 100644
--- a/krebs/2configs/backup.nix
+++ b/krebs/2configs/backup.nix
@@ -1,5 +1,5 @@
{ config, lib, ... }:
-with import <stockholm/lib>;
+with lib;
{
krebs.backup.plans = {
} // mapAttrs (_: recursiveUpdate {
diff --git a/krebs/2configs/cal.nix b/krebs/2configs/cal.nix
index 15f0027b3..f8346cf1e 100644
--- a/krebs/2configs/cal.nix
+++ b/krebs/2configs/cal.nix
@@ -23,13 +23,13 @@
git add .gitignore
'';
- pushCal = pkgs.writeDash "push_cal" ''
+ pushCal = pkgs.writers.writeDash "push_cal" ''
${setupGit}
git fetch origin
git merge --ff-only origin/master || :
'';
- pushCgit = pkgs.writeDash "push_cgit" ''
+ pushCgit = pkgs.writers.writeDash "push_cgit" ''
${setupGit}
git push origin master
'';
diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 45ff61baf..2080c1362 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -1,5 +1,5 @@
-with import <stockholm/lib>;
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
+with pkgs.stockholm.lib;
let
#for shared state directory
@@ -22,7 +22,7 @@ let
# TODO; get state as argument
state_file = "${stateDir}/ledger";
};
- filename = pkgs.writeDash "bedger-add" ''
+ filename = pkgs.writers.writeDash "bedger-add" ''
set -x
tonick=$1
amt=$2
@@ -42,7 +42,7 @@ let
env = {
state_file = "${stateDir}/ledger";
};
- filename = pkgs.writeDash "bedger-balance" ''
+ filename = pkgs.writers.writeDash "bedger-balance" ''
${pkgs.hledger}/bin/hledger -f $state_file bal -N -O csv \
| ${pkgs.coreutils}/bin/tail +2 \
| ${pkgs.miller}/bin/mlr --icsv --opprint cat \
@@ -57,7 +57,7 @@ let
arguments = [1];
timeoutSec = 1337;
command = {
- filename = pkgs.writeDash "bing" ''
+ filename = pkgs.writers.writeDash "bing" ''
set -efu
report_error() {
printf '%s' "$*" |
@@ -97,7 +97,7 @@ let
arguments = [1];
timeoutSec = 1337;
command = {
- filename = pkgs.writeDash "bing-img" ''
+ filename = pkgs.writers.writeDash "bing-img" ''
set -efu
report_error() {
printf '%s' "$*" |
@@ -142,7 +142,7 @@ let
activate = "match";
arguments = [1];
command = {
- filename = pkgs.writeDash "confuse" ''
+ filename = pkgs.writers.writeDash "confuse" ''
set -efux
export PATH=${makeBinPath [
@@ -164,7 +164,7 @@ let
activate = "match";
arguments = [1];
command = {
- filename = pkgs.writeDash "interrogate" ''
+ filename = pkgs.writers.writeDash "interrogate" ''
set -efux
export PATH=${makeBinPath [
@@ -181,7 +181,7 @@ let
activate = "match";
arguments = [1];
command = {
- filename = pkgs.writeDash "confuse" ''
+ filename = pkgs.writers.writeDash "confuse" ''
set -efu
export PATH=${makeBinPath [
pkgs.coreutils
@@ -204,7 +204,7 @@ let
activate = "match";
arguments = [1];
command = {
- filename = pkgs.writeDash "say" ''
+ filename = pkgs.writers.writeDash "say" ''
set -efu
export PATH=${makeBinPath [
@@ -234,20 +234,20 @@ let
arguments = [2];
env.TASKDATA = "${stateDir}/${name}";
commands = rec {
- add.filename = pkgs.writeDash "${name}-task-add" ''
+ add.filename = pkgs.writers.writeDash "${name}-task-add" ''
${pkgs.taskwarrior}/bin/task rc:${taskRcFile} add "$1"
'';
- list.filename = pkgs.writeDash "${name}-task-list" ''
+ list.filename = pkgs.writers.writeDash "${name}-task-list" ''
${pkgs.taskwarrior}/bin/task rc:${taskRcFile} export \
| ${pkgs.jq}/bin/jq -r '
.[] | select(.id != 0) | "\(.id) \(.description)"
'
'';
- delete.filename = pkgs.writeDash "${name}-task-delete" ''
+ delete.filename = pkgs.writers.writeDash "${name}-task-delete" ''
${pkgs.taskwarrior}/bin/task rc:${taskRcFile} delete "$1"
'';
del = delete;
- done.filename = pkgs.writeDash "${name}-task-done" ''
+ done.filename = pkgs.writers.writeDash "${name}-task-done" ''
${pkgs.taskwarrior}/bin/task rc:${taskRcFile} done "$1"
'';
};
@@ -294,7 +294,7 @@ let
activate = "always";
command = {
filename =
- <stockholm/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh>;
+ pkgs.stockholm.outPath + "/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh";
env = {
PATH = makeBinPath [
pkgs.coreutils # XXX env, touch
@@ -311,7 +311,7 @@ let
pattern = "^list-locations";
activate = "match";
command = {
- filename = pkgs.writeDash "list-locations" ''
+ filename = pkgs.writers.writeDash "list-locations" ''
export PATH=${makeBinPath [
pkgs.curl
pkgs.jq
@@ -328,7 +328,7 @@ let
activate = "match";
arguments = [1 2 3];
command = {
- filename = pkgs.writeDash "add-location" ''
+ filename = pkgs.writers.writeDash "add-location" ''
export PATH=${makeBinPath [
pkgs.curl
pkgs.jq
@@ -345,7 +345,7 @@ let
activate = "match";
arguments = [1];
command = {
- filename = pkgs.writeDash "add-location" ''
+ filename = pkgs.writers.writeDash "add-location" ''
export PATH=${makeBinPath [
pkgs.curl
pkgs.jq
@@ -374,7 +374,7 @@ let
sha256 = "sha256-J7jGWZeAULDA1EkO50qx+hjl+5IsUj389pUUMreKeNE=";
};
osm-restaurants = pkgs.callPackage "${osm-restaurants-src}/osm-restaurants" {};
- in pkgs.writeDash "krebsfood" ''
+ in pkgs.writers.writeDash "krebsfood" ''
set -efu
export PATH=${makeBinPath [
osm-restaurants
@@ -418,7 +418,7 @@ let
inherit (commands) dance random-emoji nixos-version;
tell = {
filename =
- <stockholm/krebs/5pkgs/simple/Reaktor/scripts/tell-on_privmsg.sh>;
+ pkgs.stockholm.outPath + "/krebs/5pkgs/simple/Reaktor/scripts/tell-on_privmsg.sh";
env = {
PATH = makeBinPath [
pkgs.coreutils # XXX date, env
@@ -452,7 +452,7 @@ in {
name = "reaktor2";
home = stateDir;
};
- script = ''. ${pkgs.writeDash "agenda" ''
+ script = ''. ${pkgs.writers.writeDash "agenda" ''
echo "$Method $Request_URI" >&2
case "$Method" in
"GET")
diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix
index 9f129d81c..ea9f29514 100644
--- a/krebs/2configs/repo-sync.nix
+++ b/krebs/2configs/repo-sync.nix
@@ -1,6 +1,5 @@
{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
+with pkgs.stockholm.lib;
let
konsens-user = {
diff --git a/krebs/2configs/wiki.nix b/krebs/2configs/wiki.nix
index 40d946f7d..af83a4b0c 100644
--- a/krebs/2configs/wiki.nix
+++ b/krebs/2configs/wiki.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, ... }:
-with import <stockholm/lib>;
+{ config, lib, pkgs, ... }:
+with pkgs.stockholm.lib;
let
setupGit = ''
@@ -14,13 +14,13 @@ let
fi
'';
- pushGollum = pkgs.writeDash "push_gollum" ''
+ pushGollum = pkgs.writers.writeDash "push_gollum" ''
${setupGit}
git fetch origin
git merge --ff-only origin/master
'';
- pushCgit = pkgs.writeDash "push_cgit" ''
+ pushCgit = pkgs.writers.writeDash "push_cgit" ''
${setupGit}
git push origin master
'';
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 14:59:55 +0000