mirror of
https://github.com/kmein/niveum
synced 2026-03-18 02:51:08 +01:00
Compare commits
1 Commits
master
...
update_fla
| Author | SHA1 | Date | |
|---|---|---|---|
|
a36c29a679 |
@@ -26,6 +26,8 @@
|
||||
})
|
||||
];
|
||||
|
||||
services.getty.autologinOnce = lib.mkForce false;
|
||||
|
||||
# to run nspawn in nix sandbox
|
||||
nix.settings = {
|
||||
auto-allocate-uids = true;
|
||||
|
||||
@@ -71,7 +71,6 @@ in
|
||||
'')
|
||||
# INTERNET
|
||||
telegram-desktop
|
||||
ferdium
|
||||
# FILE MANAGERS
|
||||
lf
|
||||
# MEDIA
|
||||
@@ -194,8 +193,6 @@ in
|
||||
|
||||
#krebs
|
||||
pkgs.nur.repos.mic92.ircsink
|
||||
cyberlocker-tools
|
||||
kpaste
|
||||
|
||||
(haskellPackages.ghcWithHoogle (hs: [
|
||||
hs.text
|
||||
|
||||
165
flake.lock
generated
165
flake.lock
generated
@@ -12,11 +12,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762618334,
|
||||
"narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
|
||||
"lastModified": 1770165109,
|
||||
"narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "fcdea223397448d35d9b31f798479227e80183f6",
|
||||
"rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -122,11 +122,11 @@
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769353768,
|
||||
"narHash": "sha256-zI+7cbMI4wMIR57jMjDSEsVb3grapTnURDxxJPYFIW0=",
|
||||
"lastModified": 1771437256,
|
||||
"narHash": "sha256-bLqwib+rtyBRRVBWhMuBXPCL/OThfokA+j6+uH7jDGU=",
|
||||
"owner": "numtide",
|
||||
"repo": "blueprint",
|
||||
"rev": "c7da5c70ad1c9b60b6f5d4f674fbe205d48d8f6c",
|
||||
"rev": "06ee7190dc2620ea98af9eb225aa9627b68b0e33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -189,11 +189,11 @@
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769842381,
|
||||
"narHash": "sha256-0dPzo1ElvAIZ0RwEwx5FfqAUiFj22K9QJOU9stiMCrw=",
|
||||
"lastModified": 1772261909,
|
||||
"narHash": "sha256-8XbJXrhMFhLgoBrjFIJx5XJi+SD+7/gbvaIXCuqy9Z0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "b2344f384a82db1410ab09769eb8c4a820de667f",
|
||||
"rev": "e4c413b9546d6c9e6426b33b4d6de1a49a375024",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -384,11 +384,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769580047,
|
||||
"narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
|
||||
"lastModified": 1772302941,
|
||||
"narHash": "sha256-TL3+ckbOTILXrR0qSK3dJj2BJ0S5yz/YSsUF1oEgd9g=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
|
||||
"rev": "9b9142b5fe214c2adabe86257c33e022372b7c96",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -405,11 +405,11 @@
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771167156,
|
||||
"narHash": "sha256-hvlg7rTzAmfX2HW0GgrVGvbXoNioTK0bidbRv42QEhY=",
|
||||
"lastModified": 1772328903,
|
||||
"narHash": "sha256-1f5WHVW5jwO0TEBZNIK3GkgkwTqBaUFrNCf0WQ4/sM8=",
|
||||
"owner": "numtide",
|
||||
"repo": "llm-agents.nix",
|
||||
"rev": "bbd22c02ac546b7ba07147eb14194128b44ff209",
|
||||
"rev": "45656c46d998310ea6306a0036d581bf77091213",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -464,24 +464,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"meteora": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773473448,
|
||||
"narHash": "sha256-RpqPNdf0GTcpROKh6Au77cKUbR3MQyYTOMri8KoyGeU=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "2fdcc62d97623f10e9a041e5c05b141950866551",
|
||||
"revCount": 1380,
|
||||
"type": "git",
|
||||
"url": "ssh://git@github.com/kmein/meteora.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "ssh://git@github.com/kmein/meteora.git"
|
||||
}
|
||||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"fenix": [
|
||||
@@ -514,11 +496,11 @@
|
||||
"wrappers": "wrappers"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773416451,
|
||||
"narHash": "sha256-EZbY8AT7fmqmjW/IjYKMI3XFgDkdNqcJH7uMnzUAnMs=",
|
||||
"lastModified": 1771601908,
|
||||
"narHash": "sha256-lqscsSHms5xk8iOOEj0J6XtrIcZp7/TXN4iiQjNeXzM=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "cd556263286754a37ac7d3a4a71b8699923ea37c",
|
||||
"revCount": 45,
|
||||
"rev": "13ee868d5d297fbcfa1370cfff67e5c7f5e3d0aa",
|
||||
"revCount": 42,
|
||||
"type": "git",
|
||||
"url": "https://code.kmein.de/kfm/niphas"
|
||||
},
|
||||
@@ -534,11 +516,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765267181,
|
||||
"narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
|
||||
"lastModified": 1771734689,
|
||||
"narHash": "sha256-/phvMgr1yutyAMjKnZlxkVplzxHiz60i4rc+gKzpwhg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
|
||||
"rev": "8f590b832326ab9699444f3a48240595954a4b10",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -555,11 +537,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769018862,
|
||||
"narHash": "sha256-x3eMpPQhZwEDunyaUos084Hx41XwYTi2uHY4Yc4YNlk=",
|
||||
"lastModified": 1771963727,
|
||||
"narHash": "sha256-gFyFAFYYoNsvd6heI0XtDMIa4pnykjwDljS7dQm45uE=",
|
||||
"owner": "oddlama",
|
||||
"repo": "nix-topology",
|
||||
"rev": "a15cac71d3399a4c2d1a3482ae62040a3a0aa07f",
|
||||
"rev": "b493b9b970388d79129ce1a92a6b060c9305386f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -592,11 +574,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1769302137,
|
||||
"narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
|
||||
"lastModified": 1771969195,
|
||||
"narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
|
||||
"rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -607,11 +589,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1770843696,
|
||||
"narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=",
|
||||
"lastModified": 1771423170,
|
||||
"narHash": "sha256-K7Dg9TQ0mOcAtWTO/FX/FaprtWQ8BmEXTpLIaNRhEwU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16",
|
||||
"rev": "bcc4a9d9533c033d806a46b37dc444f9b0da49dd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -654,11 +636,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1770197578,
|
||||
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
|
||||
"lastModified": 1772198003,
|
||||
"narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
|
||||
"rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -670,27 +652,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1772479524,
|
||||
"narHash": "sha256-u7nCaNiMjqvKpE+uZz9hE7pgXXTmm5yvdtFaqzSzUQI=",
|
||||
"lastModified": 1772047000,
|
||||
"narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4215e62dc2cd3bc705b0a423b9719ff6be378a43",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1769598131,
|
||||
"narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211",
|
||||
"rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -700,7 +666,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1771369470,
|
||||
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
|
||||
@@ -724,11 +690,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769867112,
|
||||
"narHash": "sha256-n3YYhO6VpGadtVOiL/eAxnm9JBC6GfXsJfj8O6V/JvU=",
|
||||
"lastModified": 1772326810,
|
||||
"narHash": "sha256-lqwxrCp2ZgAjlYRKbT+bkvXmxZSibCyB3ee96HwLV34=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "c74b53b75a4219cdecea1194a95e36a222981860",
|
||||
"rev": "7bf299ddf8a26872aa45acc49a4424bd17237072",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -772,11 +738,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773693388,
|
||||
"narHash": "sha256-bYppS16wQsnvCpDMVXqUOaYvP2oSqvkzsrYGjJsrt48=",
|
||||
"lastModified": 1772243521,
|
||||
"narHash": "sha256-Fi0zLX0hGm2eAQJ0d0FTb2y+KuCcM8zjkzkEyZB4fUI=",
|
||||
"owner": "pinpox",
|
||||
"repo": "opencrow",
|
||||
"rev": "7f35d518cf0a0a4d5c90fea324425534a947ee33",
|
||||
"rev": "bb555b7796ec1842e0295462736ee7a956abc676",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -787,14 +753,14 @@
|
||||
},
|
||||
"panoptikon": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771686951,
|
||||
"narHash": "sha256-+s19xrH0kVVDT48TtpulmuWFMagi/ysjWL+PjKcmF/k=",
|
||||
"lastModified": 1771688635,
|
||||
"narHash": "sha256-tKmjgdeoQV5W96Chr2B5WOFXC70FvcfxhNCmBT1YZUY=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "8868eb8736c3395186fa410c040e0000abca56bd",
|
||||
"revCount": 3,
|
||||
"rev": "30e15d8f95693ba82d2d93ef9acbc1ceb65ef430",
|
||||
"revCount": 4,
|
||||
"type": "git",
|
||||
"url": "https://code.kmein.de/kfm/panoptikon"
|
||||
},
|
||||
@@ -827,13 +793,12 @@
|
||||
"llm-agents": "llm-agents",
|
||||
"menstruation-backend": "menstruation-backend",
|
||||
"menstruation-telegram": "menstruation-telegram",
|
||||
"meteora": "meteora",
|
||||
"naersk": "naersk",
|
||||
"niphas": "niphas",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nix-topology": "nix-topology",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-old": "nixpkgs-old",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"nur": "nur",
|
||||
@@ -854,11 +819,11 @@
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1769786006,
|
||||
"narHash": "sha256-ax6cH54Nc20QuxlHNC8RMt1P8quMECY4gaACFAdd5ec=",
|
||||
"lastModified": 1772178959,
|
||||
"narHash": "sha256-DkjUvrEnnhHjOcjMx6aXfYGIZ0PWmcYzvVayhRj1r4M=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "eb0588812b041ebbf2645555f2a4df3bcd853c6d",
|
||||
"rev": "8494a8b3b769c17e8594d811012cc1b0fab090c7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -903,11 +868,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769038106,
|
||||
"narHash": "sha256-k558r83lvHbqDlEFEf3zCX1/WuMNgnp1bjMbwMhg5wM=",
|
||||
"lastModified": 1771846963,
|
||||
"narHash": "sha256-1srlGKTtf0a2nfH78MohqNtkcvLSuEIEVccPD4WJCZk=",
|
||||
"owner": "krebs",
|
||||
"repo": "stockholm",
|
||||
"rev": "0122ded2137e568e771e753c0c3a17b1b20d9ca7",
|
||||
"rev": "bab362d0f6fcde28ac41716ca15cc552d4659ec5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -937,11 +902,11 @@
|
||||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769829895,
|
||||
"narHash": "sha256-J2jDCqzdtUxKVstC/zwy4TaSYgUxyzInGZ1qU7W2LaE=",
|
||||
"lastModified": 1771788390,
|
||||
"narHash": "sha256-RzBpBwn93GWxLjacTte+ngwwg0L/BVOg4G/sSIeK3Rw=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "413e927522d65ca8a37b283f4e88ada4865971dd",
|
||||
"rev": "ebb238f14d6f930068be4718472da3105fd5d3bf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1194,11 +1159,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769691507,
|
||||
"narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=",
|
||||
"lastModified": 1770228511,
|
||||
"narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b",
|
||||
"rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1271,11 +1236,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770311206,
|
||||
"narHash": "sha256-gzTvuaJZaymgxQC4rOZ9HlMRRWHVF2moEEaTnCG556A=",
|
||||
"lastModified": 1772137435,
|
||||
"narHash": "sha256-dqkfxxpIiIs4wdWhT4lfQi1lfA0CgIftPiYGvw0tUOk=",
|
||||
"owner": "lassulus",
|
||||
"repo": "wrappers",
|
||||
"rev": "241f2f7dfcac0dbb2338105bdba7f03f412c5847",
|
||||
"rev": "4e12f430ae705d9bbb591ca9c51cbccbee050a23",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
13
flake.nix
13
flake.nix
@@ -28,7 +28,6 @@
|
||||
wrappers.url = "github:lassulus/wrappers";
|
||||
llm-agents.url = "github:numtide/llm-agents.nix";
|
||||
opencrow.url = "github:pinpox/opencrow";
|
||||
meteora.url = "git+ssh://git@github.com/kmein/meteora.git";
|
||||
|
||||
voidrice.flake = false;
|
||||
|
||||
@@ -97,8 +96,6 @@
|
||||
stylix,
|
||||
voidrice,
|
||||
wetter,
|
||||
wrappers,
|
||||
meteora,
|
||||
...
|
||||
}:
|
||||
let
|
||||
@@ -305,7 +302,6 @@
|
||||
autorenkalender = autorenkalender.packages.${prev.stdenv.hostPlatform.system}.default;
|
||||
onomap = scripts.packages.${prev.stdenv.hostPlatform.system}.onomap;
|
||||
tinc-graph = tinc-graph.packages.${prev.stdenv.hostPlatform.system}.tinc-graph;
|
||||
meteora-website = meteora.packages.${prev.stdenv.hostPlatform.system}.website;
|
||||
|
||||
# krebs
|
||||
brainmelter = prev.callPackage packages/brainmelter.nix { };
|
||||
@@ -315,10 +311,7 @@
|
||||
radio-news = prev.callPackage packages/radio-news { };
|
||||
untilport = prev.callPackage packages/untilport.nix { };
|
||||
weechat-declarative = prev.callPackage packages/weechat-declarative.nix { };
|
||||
pi = prev.callPackage packages/pi {
|
||||
pkgs = final;
|
||||
inherit wrappers;
|
||||
};
|
||||
pi = prev.callPackage packages/pi.nix { };
|
||||
|
||||
# my packages
|
||||
betacode = prev.callPackage packages/betacode.nix { };
|
||||
@@ -520,7 +513,7 @@
|
||||
++ profiles.desktop
|
||||
++ [
|
||||
systems/manakish/configuration.nix
|
||||
nixos-hardware.nixosModules.lenovo-thinkpad-x220
|
||||
nixos-hardware.nixosModules.lenovo-thinkpad-x230
|
||||
];
|
||||
};
|
||||
kabsa = nixpkgs.lib.nixosSystem {
|
||||
@@ -531,7 +524,7 @@
|
||||
++ profiles.desktop
|
||||
++ [
|
||||
systems/kabsa/configuration.nix
|
||||
nixos-hardware.nixosModules.lenovo-thinkpad-x230
|
||||
nixos-hardware.nixosModules.lenovo-thinkpad-x220
|
||||
];
|
||||
};
|
||||
fatteh = nixpkgs.lib.nixosSystem {
|
||||
|
||||
@@ -35,6 +35,26 @@ writers.writeBashBin "mp3player-write" ''
|
||||
exit 1
|
||||
fi
|
||||
|
||||
TOTAL_SIZE=0
|
||||
for f in "''${FILES[@]}"; do
|
||||
if [ ! -f "$f" ]; then
|
||||
echo "Warning: File '$f' does not exist, skipping."
|
||||
continue
|
||||
fi
|
||||
FILE_SIZE=$(${lib.getExe' coreutils "stat"} --printf="%s" "$f")
|
||||
TOTAL_SIZE=$((TOTAL_SIZE + FILE_SIZE / 2))
|
||||
done
|
||||
|
||||
AVAILABLE=$(${lib.getExe' coreutils "df"} --output=avail "$MOUNT_POINT" | ${lib.getExe' coreutils "tail"} -n 1)
|
||||
AVAILABLE=$((AVAILABLE * 1024))
|
||||
|
||||
if [ "$TOTAL_SIZE" -gt "$AVAILABLE" ]; then
|
||||
echo "Error: Not enough space. Required: $TOTAL_SIZE bytes, Available: $AVAILABLE bytes"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Enough space available. Starting conversion..."
|
||||
|
||||
sanitize_filename() {
|
||||
local name
|
||||
name=$(${lib.getExe' coreutils "basename"} "$1")
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
lib,
|
||||
writers,
|
||||
poppler-utils,
|
||||
poppler_utils,
|
||||
tesseract,
|
||||
coreutils,
|
||||
}:
|
||||
@@ -21,7 +21,7 @@ writers.writeDashBin "pdf-ocr" ''
|
||||
|
||||
cd "$tmpdir"
|
||||
|
||||
${lib.getExe' poppler-utils "pdftoppm"} -png "$pdf_path" pdf-ocr
|
||||
${lib.getExe' poppler_utils "pdftoppm"} -png "$pdf_path" pdf-ocr
|
||||
for png in pdf-ocr*.png; do
|
||||
${lib.getExe tesseract} "$png" "$png.txt" 2>/dev/null
|
||||
done
|
||||
|
||||
69
packages/pi.nix
Normal file
69
packages/pi.nix
Normal file
@@ -0,0 +1,69 @@
|
||||
{
|
||||
runCommand,
|
||||
nodejs,
|
||||
writeShellApplication,
|
||||
lib,
|
||||
jq,
|
||||
cacert,
|
||||
pi-llm,
|
||||
}:
|
||||
let
|
||||
# Pre-install pi plugins into a fake npm global prefix
|
||||
pluginPrefixRaw =
|
||||
runCommand "pi-plugins-raw"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
cacert
|
||||
];
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-YrrQ5m8XYKFNR2+dn97GYxKxcWPBndomPZsqKfwD6w0=";
|
||||
impureEnvVars = [
|
||||
"http_proxy"
|
||||
"https_proxy"
|
||||
];
|
||||
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
}
|
||||
''
|
||||
export HOME=$TMPDIR
|
||||
export npm_config_prefix=$out
|
||||
npm install -g pi-hooks shitty-extensions
|
||||
'';
|
||||
|
||||
# Remove the resistance extension (annoying terminator quote widget)
|
||||
pluginPrefix = runCommand "pi-plugins" { } ''
|
||||
cp -a ${pluginPrefixRaw} $out
|
||||
chmod -R u+w $out
|
||||
pkg=$out/lib/node_modules/shitty-extensions/package.json
|
||||
${lib.getExe jq} '.pi.extensions |= map(select(contains("resistance") | not))' "$pkg" > "$pkg.tmp"
|
||||
mv "$pkg.tmp" "$pkg"
|
||||
'';
|
||||
in
|
||||
writeShellApplication {
|
||||
name = "pi";
|
||||
runtimeInputs = [ nodejs ];
|
||||
text = ''
|
||||
set -efu
|
||||
export npm_config_prefix="${pluginPrefix}"
|
||||
|
||||
# Ensure settings.json has our plugins listed
|
||||
SETTINGS_DIR="''${PI_CODING_AGENT_DIR:-$HOME/.pi/agent}"
|
||||
SETTINGS_FILE="$SETTINGS_DIR/settings.json"
|
||||
mkdir -p "$SETTINGS_DIR"
|
||||
|
||||
# Add packages to settings if not already present
|
||||
if [ ! -f "$SETTINGS_FILE" ]; then
|
||||
echo '{"packages":["npm:pi-hooks","npm:shitty-extensions"]}' > "$SETTINGS_FILE"
|
||||
else
|
||||
for pkg in "npm:pi-hooks" "npm:shitty-extensions"; do
|
||||
if ! grep -q "$pkg" "$SETTINGS_FILE"; then
|
||||
${lib.getExe jq} --arg p "$pkg" '.packages = ((.packages // []) + [$p] | unique)' "$SETTINGS_FILE" > "$SETTINGS_FILE.tmp"
|
||||
mv "$SETTINGS_FILE.tmp" "$SETTINGS_FILE"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
exec ${lib.getExe pi-llm} "$@"
|
||||
'';
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
{ pkgs, wrappers }:
|
||||
let
|
||||
piWrapper = wrappers.lib.wrapModule {
|
||||
imports = [ ./module.nix ];
|
||||
inherit pkgs;
|
||||
|
||||
settings = {
|
||||
packages = [
|
||||
{
|
||||
source = "npm:pi-hooks";
|
||||
version = "1.0.3";
|
||||
hash = "sha256-jU3akfqsWgjvOG+8+Md2qEzkXp48LUaXVncpUMXxy7s=";
|
||||
deps = [
|
||||
{
|
||||
source = "npm:shell-quote";
|
||||
version = "1.8.3";
|
||||
hash = "sha256-32QLNUuvjigj1scqLlCVFTfgS3MHm9dBjPk9iVB+IsE=";
|
||||
}
|
||||
{
|
||||
source = "npm:vscode-languageserver-protocol";
|
||||
version = "3.17.5";
|
||||
hash = "sha256-dHPrLSFj8/i+oJZE+dgDeJoZXllrZdOUbEFX5YPjzMg=";
|
||||
deps = [
|
||||
{
|
||||
source = "npm:vscode-jsonrpc";
|
||||
version = "8.2.0";
|
||||
hash = "sha256-PaRFMcOY8VRQdMtyjjWagi81ufiscXHIR/QvByi5x8s=";
|
||||
}
|
||||
{
|
||||
source = "npm:vscode-languageserver-types";
|
||||
version = "3.17.5";
|
||||
hash = "sha256-1nP55/i75RNRvlHFjzLU3PqXpnDruGvGMzaDlMYJysA=";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
source = "npm:shitty-extensions";
|
||||
version = "1.0.9";
|
||||
hash = "sha256-g26MZ5x4HUcDai4SXPaOEhqgGGqzAI68znnsCbKJv7E=";
|
||||
extensions = [ "!extensions/resistance.ts" ];
|
||||
}
|
||||
];
|
||||
extensions = [
|
||||
./questionnaire.ts
|
||||
];
|
||||
defaultProvider = "anthropic";
|
||||
defaultModel = "claude-opus-4-6";
|
||||
defaultThinkingLevel = "medium";
|
||||
permissionLevel = "low";
|
||||
permissionMode = "ask";
|
||||
permissionConfig.overrides.minimal = [
|
||||
"nix build *"
|
||||
"nix eval *"
|
||||
"nix fmt *"
|
||||
];
|
||||
};
|
||||
|
||||
pluginOverrides = ''
|
||||
# Fix keybinding conflicts in extension source
|
||||
${pkgs.gnused}/bin/sed -i 's/"ctrl+u"/"ctrl+shift+u"/' $out/lib/node_modules/shitty-extensions/extensions/ultrathink.ts
|
||||
${pkgs.gnused}/bin/sed -i 's/"ctrl+r"/"ctrl+shift+r"/' $out/lib/node_modules/shitty-extensions/extensions/speedreading.ts
|
||||
|
||||
# Remove a-nach-b skill
|
||||
rm -rf $out/lib/node_modules/shitty-extensions/skills/a-nach-b
|
||||
'';
|
||||
};
|
||||
in
|
||||
piWrapper.wrapper
|
||||
@@ -1,150 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
pkgs = config.pkgs;
|
||||
|
||||
# Extract npm packages with hashes from settings.packages
|
||||
npmPackages = lib.filter (p: builtins.isAttrs p && p ? hash) (config.settings.packages or [ ]);
|
||||
|
||||
# Fetch an npm tarball and unpack it into lib/node_modules/<name>
|
||||
fetchPlugin =
|
||||
pkg:
|
||||
let
|
||||
source = pkg.source or pkg;
|
||||
name = lib.removePrefix "npm:" source;
|
||||
tarball = pkgs.fetchurl {
|
||||
url = "https://registry.npmjs.org/${name}/-/${name}-${pkg.version}.tgz";
|
||||
hash = pkg.hash;
|
||||
};
|
||||
deps = map fetchPlugin (pkg.deps or [ ]);
|
||||
in
|
||||
pkgs.runCommand "pi-plugin-${name}"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
pkgs.gnutar
|
||||
pkgs.gzip
|
||||
];
|
||||
}
|
||||
''
|
||||
mkdir -p $out/lib/node_modules/${name}
|
||||
tar xzf ${tarball} --strip-components=1 -C $out/lib/node_modules/${name}
|
||||
${lib.concatMapStringsSep "\n" (
|
||||
dep:
|
||||
"mkdir -p $out/lib/node_modules/${name}/node_modules"
|
||||
+ "\ncp -a ${dep}/lib/node_modules/* $out/lib/node_modules/${name}/node_modules/"
|
||||
+ "\ncp -a ${dep}/lib/node_modules/* $out/lib/node_modules/"
|
||||
) deps}
|
||||
'';
|
||||
|
||||
fetchedPlugins = map fetchPlugin npmPackages;
|
||||
|
||||
# Strip hash and null-valued attrs from package entries before writing settings.json
|
||||
cleanPackage =
|
||||
p:
|
||||
if builtins.isAttrs p then
|
||||
lib.filterAttrs (k: v: k != "hash" && k != "version" && k != "deps" && v != null) p
|
||||
else
|
||||
p;
|
||||
|
||||
cleanSettings = config.settings // {
|
||||
packages = map cleanPackage (config.settings.packages or [ ]);
|
||||
};
|
||||
|
||||
settingsFile = pkgs.writeText "pi-settings.json" (builtins.toJSON cleanSettings);
|
||||
in
|
||||
{
|
||||
_class = "wrapper";
|
||||
|
||||
options = {
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.submodule {
|
||||
freeformType = (pkgs.formats.json { }).type;
|
||||
options.packages = lib.mkOption {
|
||||
type = lib.types.listOf (
|
||||
lib.types.either lib.types.str (
|
||||
lib.types.submodule {
|
||||
freeformType = (pkgs.formats.json { }).type;
|
||||
options.hash = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "Fixed-output hash for fetching this npm package.";
|
||||
};
|
||||
options.source = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "Package source (e.g. npm:package-name).";
|
||||
};
|
||||
options.version = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "Exact version to pin (e.g. 1.0.3). Ensures reproducible fetching.";
|
||||
};
|
||||
options.deps = lib.mkOption {
|
||||
type = lib.types.listOf (lib.types.attrsOf lib.types.anything);
|
||||
default = [ ];
|
||||
description = "Transitive npm dependencies as {source, version, hash} attrsets.";
|
||||
};
|
||||
options.extensions = lib.mkOption {
|
||||
type = lib.types.nullOr (lib.types.listOf lib.types.str);
|
||||
default = null;
|
||||
description = ''
|
||||
Extension filter patterns following pi's native syntax.
|
||||
When null (default), all extensions from the package are loaded.
|
||||
An empty list explicitly disables all extensions.
|
||||
Patterns use prefixes to control inclusion:
|
||||
- `"!pattern"` — exclude matching extensions
|
||||
- `"+pattern"` — force-include (overrides excludes)
|
||||
- `"-pattern"` — force-exclude (overrides includes)
|
||||
- `"path"` — plain path to include
|
||||
'';
|
||||
example = [
|
||||
"!./extensions/resistance.ts"
|
||||
];
|
||||
};
|
||||
}
|
||||
)
|
||||
);
|
||||
default = [ ];
|
||||
description = "Pi packages list. Object entries may include a `hash` for Nix fetching.";
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
description = "Pi settings.json content.";
|
||||
};
|
||||
|
||||
pluginOverrides = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
Shell commands to run after assembling the plugin prefix.
|
||||
The variable `$out` points to the mutable copy.
|
||||
'';
|
||||
};
|
||||
|
||||
pluginPrefix = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
description = "The final npm prefix with all plugins merged and overrides applied.";
|
||||
default = pkgs.runCommand "pi-plugins" { } ''
|
||||
mkdir -p $out
|
||||
${lib.concatMapStringsSep "\n" (p: "cp -a --no-preserve=mode ${p}/* $out/") fetchedPlugins}
|
||||
${lib.optionalString (config.pluginOverrides != "") config.pluginOverrides}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config.package = lib.mkDefault pkgs.pi-llm;
|
||||
|
||||
config.extraPackages = [ pkgs.nodejs ];
|
||||
|
||||
config.env.npm_config_prefix = "${config.pluginPrefix}";
|
||||
config.env.PI_SETTINGS_FILE = "${settingsFile}";
|
||||
|
||||
config.meta.maintainers = [
|
||||
{
|
||||
name = "lassulus";
|
||||
github = "lassulus";
|
||||
githubId = 621375;
|
||||
}
|
||||
];
|
||||
config.meta.platforms = lib.platforms.all;
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Patch pi-hooks permission extension to play peon sounds via pw-play on Linux."""
|
||||
import re
|
||||
import sys
|
||||
|
||||
ts_file = sys.argv[1]
|
||||
pw_play = sys.argv[2]
|
||||
|
||||
src = open(ts_file).read()
|
||||
|
||||
# Use a lambda for replacement to avoid re.sub interpreting backslash sequences
|
||||
replacement = r"""function playPermissionSound(): void {
|
||||
const isMac = process.platform === "darwin";
|
||||
if (isMac) {
|
||||
exec('afplay /System/Library/Sounds/Funk.aiff 2>/dev/null', (err) => {
|
||||
if (err) process.stdout.write("\x07");
|
||||
});
|
||||
} else {
|
||||
const n = Math.floor(Math.random() * 4) + 1;
|
||||
exec(`""" + pw_play + r""" "$HOME/src/sounds/games/Warcraft III/Units/Orc/Peon/PeonWhat${n}.wav"`, () => {});
|
||||
}
|
||||
}"""
|
||||
|
||||
result = re.sub(
|
||||
r'function playPermissionSound\(\): void \{.*?\n\}',
|
||||
lambda m: replacement,
|
||||
src,
|
||||
flags=re.DOTALL,
|
||||
)
|
||||
|
||||
if result == src:
|
||||
print("ERROR: playPermissionSound function not found in", ts_file, file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
open(ts_file, 'w').write(result)
|
||||
@@ -1,463 +0,0 @@
|
||||
/**
|
||||
* Questionnaire Tool - Ask the user multiple choice questions
|
||||
*
|
||||
* Registers a "questionnaire" tool the LLM can call to ask single or multiple
|
||||
* questions with an interactive TUI. Based on mic92's pi-agent-extensions.
|
||||
*/
|
||||
|
||||
import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
|
||||
import {
|
||||
Editor,
|
||||
type EditorTheme,
|
||||
Key,
|
||||
matchesKey,
|
||||
Text,
|
||||
truncateToWidth,
|
||||
} from "@mariozechner/pi-tui";
|
||||
import { Type } from "@sinclair/typebox";
|
||||
|
||||
interface QuestionOption {
|
||||
value: string;
|
||||
label: string;
|
||||
description?: string;
|
||||
}
|
||||
|
||||
type RenderOption = QuestionOption & { isOther?: boolean };
|
||||
|
||||
interface Question {
|
||||
id: string;
|
||||
label: string;
|
||||
prompt: string;
|
||||
options: QuestionOption[];
|
||||
allowOther: boolean;
|
||||
}
|
||||
|
||||
interface Answer {
|
||||
id: string;
|
||||
value: string;
|
||||
label: string;
|
||||
wasCustom: boolean;
|
||||
index?: number;
|
||||
}
|
||||
|
||||
interface QuestionnaireResult {
|
||||
questions: Question[];
|
||||
answers: Answer[];
|
||||
cancelled: boolean;
|
||||
}
|
||||
|
||||
const QuestionOptionSchema = Type.Object({
|
||||
value: Type.String({ description: "The value returned when selected" }),
|
||||
label: Type.String({ description: "Display label for the option" }),
|
||||
description: Type.Optional(
|
||||
Type.String({ description: "Optional description shown below label" }),
|
||||
),
|
||||
});
|
||||
|
||||
const QuestionSchema = Type.Object({
|
||||
id: Type.String({ description: "Unique identifier for this question" }),
|
||||
label: Type.Optional(
|
||||
Type.String({
|
||||
description:
|
||||
"Short contextual label for tab bar, e.g. 'Scope', 'Priority' (defaults to Q1, Q2)",
|
||||
}),
|
||||
),
|
||||
prompt: Type.String({ description: "The full question text to display" }),
|
||||
options: Type.Array(QuestionOptionSchema, {
|
||||
description: "Available options to choose from",
|
||||
}),
|
||||
allowOther: Type.Optional(
|
||||
Type.Boolean({
|
||||
description: "Allow 'Type something' option (default: true)",
|
||||
}),
|
||||
),
|
||||
});
|
||||
|
||||
const QuestionnaireParams = Type.Object({
|
||||
questions: Type.Array(QuestionSchema, {
|
||||
description: "Questions to ask the user",
|
||||
}),
|
||||
});
|
||||
|
||||
function errorResult(
|
||||
message: string,
|
||||
questions: Question[] = [],
|
||||
): {
|
||||
content: { type: "text"; text: string }[];
|
||||
details: QuestionnaireResult;
|
||||
} {
|
||||
return {
|
||||
content: [{ type: "text", text: message }],
|
||||
details: { questions, answers: [], cancelled: true },
|
||||
};
|
||||
}
|
||||
|
||||
export default function questionnaire(pi: ExtensionAPI) {
|
||||
pi.registerTool({
|
||||
name: "questionnaire",
|
||||
label: "Questionnaire",
|
||||
description:
|
||||
"Ask the user one or more multiple choice questions. Use for clarifying requirements, getting preferences, confirming decisions, or quizzing. For single questions, shows a simple option list. For multiple questions, shows a tab-based interface.",
|
||||
parameters: QuestionnaireParams,
|
||||
|
||||
async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
|
||||
if (!ctx.hasUI) {
|
||||
return errorResult(
|
||||
"Error: UI not available (running in non-interactive mode)",
|
||||
);
|
||||
}
|
||||
if (params.questions.length === 0) {
|
||||
return errorResult("Error: No questions provided");
|
||||
}
|
||||
|
||||
const questions: Question[] = params.questions.map((q, i) => ({
|
||||
...q,
|
||||
label: q.label || `Q${i + 1}`,
|
||||
allowOther: q.allowOther !== false,
|
||||
}));
|
||||
|
||||
const isMulti = questions.length > 1;
|
||||
const totalTabs = questions.length + 1;
|
||||
|
||||
const result = await ctx.ui.custom<QuestionnaireResult>(
|
||||
(tui, theme, _kb, done) => {
|
||||
let currentTab = 0;
|
||||
let optionIndex = 0;
|
||||
let inputMode = false;
|
||||
let inputQuestionId: string | null = null;
|
||||
let cachedLines: string[] | undefined;
|
||||
const answers = new Map<string, Answer>();
|
||||
|
||||
const editorTheme: EditorTheme = {
|
||||
borderColor: (s) => theme.fg("accent", s),
|
||||
selectList: {
|
||||
selectedPrefix: (t) => theme.fg("accent", t),
|
||||
selectedText: (t) => theme.fg("accent", t),
|
||||
description: (t) => theme.fg("muted", t),
|
||||
scrollInfo: (t) => theme.fg("dim", t),
|
||||
noMatch: (t) => theme.fg("warning", t),
|
||||
},
|
||||
};
|
||||
const editor = new Editor(tui, editorTheme);
|
||||
|
||||
function refresh() {
|
||||
cachedLines = undefined;
|
||||
tui.requestRender();
|
||||
}
|
||||
|
||||
function submit(cancelled: boolean) {
|
||||
done({
|
||||
questions,
|
||||
answers: Array.from(answers.values()),
|
||||
cancelled,
|
||||
});
|
||||
}
|
||||
|
||||
function currentQuestion(): Question | undefined {
|
||||
return questions[currentTab];
|
||||
}
|
||||
|
||||
function currentOptions(): RenderOption[] {
|
||||
const q = currentQuestion();
|
||||
if (!q) return [];
|
||||
const opts: RenderOption[] = [...q.options];
|
||||
if (q.allowOther) {
|
||||
opts.push({
|
||||
value: "__other__",
|
||||
label: "Type something.",
|
||||
isOther: true,
|
||||
});
|
||||
}
|
||||
return opts;
|
||||
}
|
||||
|
||||
function allAnswered(): boolean {
|
||||
return questions.every((q) => answers.has(q.id));
|
||||
}
|
||||
|
||||
function advanceAfterAnswer() {
|
||||
if (!isMulti) {
|
||||
submit(false);
|
||||
return;
|
||||
}
|
||||
if (currentTab < questions.length - 1) {
|
||||
currentTab++;
|
||||
} else {
|
||||
currentTab = questions.length;
|
||||
}
|
||||
optionIndex = 0;
|
||||
refresh();
|
||||
}
|
||||
|
||||
function saveAnswer(
|
||||
questionId: string,
|
||||
value: string,
|
||||
label: string,
|
||||
wasCustom: boolean,
|
||||
index?: number,
|
||||
) {
|
||||
answers.set(questionId, {
|
||||
id: questionId,
|
||||
value,
|
||||
label,
|
||||
wasCustom,
|
||||
index,
|
||||
});
|
||||
}
|
||||
|
||||
editor.onSubmit = (value) => {
|
||||
if (!inputQuestionId) return;
|
||||
const trimmed = value.trim() || "(no response)";
|
||||
saveAnswer(inputQuestionId, trimmed, trimmed, true);
|
||||
inputMode = false;
|
||||
inputQuestionId = null;
|
||||
editor.setText("");
|
||||
advanceAfterAnswer();
|
||||
};
|
||||
|
||||
function handleInput(data: string) {
|
||||
if (inputMode) {
|
||||
if (matchesKey(data, Key.escape)) {
|
||||
inputMode = false;
|
||||
inputQuestionId = null;
|
||||
editor.setText("");
|
||||
refresh();
|
||||
return;
|
||||
}
|
||||
editor.handleInput(data);
|
||||
refresh();
|
||||
return;
|
||||
}
|
||||
|
||||
const q = currentQuestion();
|
||||
const opts = currentOptions();
|
||||
|
||||
if (isMulti) {
|
||||
if (matchesKey(data, Key.tab) || matchesKey(data, Key.right)) {
|
||||
currentTab = (currentTab + 1) % totalTabs;
|
||||
optionIndex = 0;
|
||||
refresh();
|
||||
return;
|
||||
}
|
||||
if (
|
||||
matchesKey(data, Key.shift("tab")) ||
|
||||
matchesKey(data, Key.left)
|
||||
) {
|
||||
currentTab = (currentTab - 1 + totalTabs) % totalTabs;
|
||||
optionIndex = 0;
|
||||
refresh();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (currentTab === questions.length) {
|
||||
if (matchesKey(data, Key.enter) && allAnswered()) {
|
||||
submit(false);
|
||||
} else if (matchesKey(data, Key.escape)) {
|
||||
submit(true);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (matchesKey(data, Key.up)) {
|
||||
optionIndex = Math.max(0, optionIndex - 1);
|
||||
refresh();
|
||||
return;
|
||||
}
|
||||
if (matchesKey(data, Key.down)) {
|
||||
optionIndex = Math.min(opts.length - 1, optionIndex + 1);
|
||||
refresh();
|
||||
return;
|
||||
}
|
||||
|
||||
if (matchesKey(data, Key.enter) && q) {
|
||||
const opt = opts[optionIndex];
|
||||
if (opt.isOther) {
|
||||
inputMode = true;
|
||||
inputQuestionId = q.id;
|
||||
editor.setText("");
|
||||
refresh();
|
||||
return;
|
||||
}
|
||||
saveAnswer(q.id, opt.value, opt.label, false, optionIndex + 1);
|
||||
advanceAfterAnswer();
|
||||
return;
|
||||
}
|
||||
|
||||
if (matchesKey(data, Key.escape)) {
|
||||
submit(true);
|
||||
}
|
||||
}
|
||||
|
||||
function render(width: number): string[] {
|
||||
if (cachedLines) return cachedLines;
|
||||
|
||||
const lines: string[] = [];
|
||||
const q = currentQuestion();
|
||||
const opts = currentOptions();
|
||||
|
||||
const add = (s: string) => lines.push(truncateToWidth(s, width));
|
||||
|
||||
add(theme.fg("accent", "─".repeat(width)));
|
||||
|
||||
if (isMulti) {
|
||||
const tabs: string[] = ["← "];
|
||||
for (let i = 0; i < questions.length; i++) {
|
||||
const isActive = i === currentTab;
|
||||
const isAnswered = answers.has(questions[i].id);
|
||||
const lbl = questions[i].label;
|
||||
const box = isAnswered ? "■" : "□";
|
||||
const color = isAnswered ? "success" : "muted";
|
||||
const text = ` ${box} ${lbl} `;
|
||||
const styled = isActive
|
||||
? theme.bg("selectedBg", theme.fg("text", text))
|
||||
: theme.fg(color, text);
|
||||
tabs.push(`${styled} `);
|
||||
}
|
||||
const canSubmit = allAnswered();
|
||||
const isSubmitTab = currentTab === questions.length;
|
||||
const submitText = " ✓ Submit ";
|
||||
const submitStyled = isSubmitTab
|
||||
? theme.bg("selectedBg", theme.fg("text", submitText))
|
||||
: theme.fg(canSubmit ? "success" : "dim", submitText);
|
||||
tabs.push(`${submitStyled} →`);
|
||||
add(` ${tabs.join("")}`);
|
||||
lines.push("");
|
||||
}
|
||||
|
||||
function renderOptions() {
|
||||
for (let i = 0; i < opts.length; i++) {
|
||||
const opt = opts[i];
|
||||
const selected = i === optionIndex;
|
||||
const isOther = opt.isOther === true;
|
||||
const prefix = selected ? theme.fg("accent", "> ") : " ";
|
||||
const color = selected ? "accent" : "text";
|
||||
if (isOther && inputMode) {
|
||||
add(prefix + theme.fg("accent", `${i + 1}. ${opt.label} ✎`));
|
||||
} else {
|
||||
add(prefix + theme.fg(color, `${i + 1}. ${opt.label}`));
|
||||
}
|
||||
if (opt.description) {
|
||||
add(` ${theme.fg("muted", opt.description)}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (inputMode && q) {
|
||||
add(theme.fg("text", ` ${q.prompt}`));
|
||||
lines.push("");
|
||||
renderOptions();
|
||||
lines.push("");
|
||||
add(theme.fg("muted", " Your answer:"));
|
||||
for (const line of editor.render(width - 2)) {
|
||||
add(` ${line}`);
|
||||
}
|
||||
lines.push("");
|
||||
add(theme.fg("dim", " Enter to submit • Esc to cancel"));
|
||||
} else if (currentTab === questions.length) {
|
||||
add(theme.fg("accent", theme.bold(" Ready to submit")));
|
||||
lines.push("");
|
||||
for (const question of questions) {
|
||||
const answer = answers.get(question.id);
|
||||
if (answer) {
|
||||
const prefix = answer.wasCustom ? "(wrote) " : "";
|
||||
add(
|
||||
`${theme.fg("muted", ` ${question.label}: `)}${theme.fg(
|
||||
"text",
|
||||
prefix + answer.label,
|
||||
)}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
lines.push("");
|
||||
if (allAnswered()) {
|
||||
add(theme.fg("success", " Press Enter to submit"));
|
||||
} else {
|
||||
const missing = questions
|
||||
.filter((q) => !answers.has(q.id))
|
||||
.map((q) => q.label)
|
||||
.join(", ");
|
||||
add(theme.fg("warning", ` Unanswered: ${missing}`));
|
||||
}
|
||||
} else if (q) {
|
||||
add(theme.fg("text", ` ${q.prompt}`));
|
||||
lines.push("");
|
||||
renderOptions();
|
||||
}
|
||||
|
||||
lines.push("");
|
||||
if (!inputMode) {
|
||||
const help = isMulti
|
||||
? " Tab/←→ navigate • ↑↓ select • Enter confirm • Esc cancel"
|
||||
: " ↑↓ navigate • Enter select • Esc cancel";
|
||||
add(theme.fg("dim", help));
|
||||
}
|
||||
add(theme.fg("accent", "─".repeat(width)));
|
||||
|
||||
cachedLines = lines;
|
||||
return lines;
|
||||
}
|
||||
|
||||
return {
|
||||
render,
|
||||
invalidate: () => {
|
||||
cachedLines = undefined;
|
||||
},
|
||||
handleInput,
|
||||
};
|
||||
},
|
||||
);
|
||||
|
||||
if (result.cancelled) {
|
||||
return {
|
||||
content: [{ type: "text", text: "User cancelled the questionnaire" }],
|
||||
details: result,
|
||||
};
|
||||
}
|
||||
|
||||
const answerLines = result.answers.map((a) => {
|
||||
const qLabel = questions.find((q) => q.id === a.id)?.label || a.id;
|
||||
if (a.wasCustom) {
|
||||
return `${qLabel}: user wrote: ${a.label}`;
|
||||
}
|
||||
return `${qLabel}: user selected: ${a.index}. ${a.label}`;
|
||||
});
|
||||
|
||||
return {
|
||||
content: [{ type: "text", text: answerLines.join("\n") }],
|
||||
details: result,
|
||||
};
|
||||
},
|
||||
|
||||
renderCall(args, theme) {
|
||||
const qs = (args.questions as Question[]) || [];
|
||||
const count = qs.length;
|
||||
const labels = qs.map((q) => q.label || q.id).join(", ");
|
||||
let text = theme.fg("toolTitle", theme.bold("questionnaire "));
|
||||
text += theme.fg("muted", `${count} question${count !== 1 ? "s" : ""}`);
|
||||
if (labels) {
|
||||
text += theme.fg("dim", ` (${truncateToWidth(labels, 40)})`);
|
||||
}
|
||||
return new Text(text, 0, 0);
|
||||
},
|
||||
|
||||
renderResult(result, _options, theme) {
|
||||
const details = result.details as QuestionnaireResult | undefined;
|
||||
if (!details) {
|
||||
const text = result.content[0];
|
||||
return new Text(text?.type === "text" ? text.text : "", 0, 0);
|
||||
}
|
||||
if (details.cancelled) {
|
||||
return new Text(theme.fg("warning", "Cancelled"), 0, 0);
|
||||
}
|
||||
const lines = details.answers.map((a) => {
|
||||
if (a.wasCustom) {
|
||||
return `${theme.fg("success", "✓ ")}${theme.fg("accent", a.id)}: ${theme.fg("muted", "(wrote) ")}${a.label}`;
|
||||
}
|
||||
const display = a.index ? `${a.index}. ${a.label}` : a.label;
|
||||
return `${theme.fg("success", "✓ ")}${theme.fg("accent", a.id)}: ${display}`;
|
||||
});
|
||||
return new Text(lines.join("\n"), 0, 0);
|
||||
},
|
||||
});
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
--- /tmp/settings-manager.js.orig 2026-02-18 23:29:05.967146474 +0100
|
||||
+++ /tmp/settings-manager.js 2026-02-18 23:29:12.452952321 +0100
|
||||
@@ -97,7 +97,16 @@
|
||||
/** Create a SettingsManager that loads from files */
|
||||
static create(cwd = process.cwd(), agentDir = getAgentDir()) {
|
||||
const storage = new FileSettingsStorage(cwd, agentDir);
|
||||
- return SettingsManager.fromStorage(storage);
|
||||
+ const manager = SettingsManager.fromStorage(storage);
|
||||
+ const baseFile = process.env.PI_SETTINGS_FILE;
|
||||
+ if (baseFile) {
|
||||
+ try {
|
||||
+ const baseSettings = JSON.parse(readFileSync(baseFile, "utf-8"));
|
||||
+ manager.globalSettings = deepMergeSettings(manager.globalSettings, baseSettings);
|
||||
+ manager.settings = deepMergeSettings(manager.globalSettings, manager.projectSettings);
|
||||
+ } catch (e) {}
|
||||
+ }
|
||||
+ return manager;
|
||||
}
|
||||
/** Create a SettingsManager from an arbitrary storage backend */
|
||||
static fromStorage(storage) {
|
||||
2
secrets
2
secrets
Submodule secrets updated: a6ec08c247...4fa163a68e
@@ -1,5 +1,4 @@
|
||||
secrets/alertmanager-token-reporters.age
|
||||
secrets/anthropic-api-key.age
|
||||
secrets/brevo-key.age
|
||||
secrets/cifs-credentials-zodiac.age
|
||||
secrets/copecart-ipn.age
|
||||
@@ -55,7 +54,6 @@ secrets/matrix-token-lakai.age
|
||||
secrets/matrix-token-lakai-env.age
|
||||
secrets/maxmind-license-key.age
|
||||
secrets/mega-password.age
|
||||
secrets/meteora-auth.age
|
||||
secrets/miniflux-api-token.age
|
||||
secrets/miniflux-credentials.age
|
||||
secrets/nextcloud-password-admin.age
|
||||
@@ -63,11 +61,7 @@ secrets/nextcloud-password-database.age
|
||||
secrets/nextcloud-password-fysi.age
|
||||
secrets/nextcloud-password-kieran.age
|
||||
secrets/onlyoffice-jwt-key.age
|
||||
secrets/openclaw-gateway-token.age
|
||||
secrets/openclaw-telegram-token.age
|
||||
secrets/opencrow-gemini-key.age
|
||||
secrets/opencrow-matrix-token.age
|
||||
secrets/opencrow-openrouter-key.age
|
||||
secrets/opencrow-soul.age
|
||||
secrets/openweathermap-api-key.age
|
||||
secrets/restic.age
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
nixpkgs.config = {
|
||||
allowUnfree = true;
|
||||
@@ -21,7 +22,14 @@
|
||||
};
|
||||
};
|
||||
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
acceleration = "cuda"; # Force it to use the MX150
|
||||
package = pkgs.ollama-cuda;
|
||||
};
|
||||
|
||||
nix.settings.system-features = [ "cuda" ];
|
||||
nixpkgs.config.cudaCapabilities = [ "6.1" ];
|
||||
|
||||
programs.nix-required-mounts = {
|
||||
enable = true;
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
./wallabag.nix
|
||||
./nethack.nix
|
||||
./opencrow.nix
|
||||
./meteora.nix
|
||||
];
|
||||
|
||||
niveum.passport = {
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
{ config, pkgs, ... }: {
|
||||
age.secrets.meteora-auth = {
|
||||
file = ../../secrets/meteora-auth.age;
|
||||
owner = "nginx";
|
||||
};
|
||||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
virtualHosts."meteora.xn--kiern-0qa.de" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
root = "${pkgs.meteora-website}";
|
||||
locations."/" = {
|
||||
basicAuthFile = config.age.secrets.meteora-auth.path;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user