aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralex <alex@pdp7.net>2025-08-01 20:29:54 +0200
committeralexpdp7 <alex@corcoles.net>2025-08-01 20:37:21 +0200
commit649e6db8259fe5d5cc0b712c974fa16f6629206f (patch)
treecf00fc8476851a5e8c3871d73706f5c541b8423e
parentb859bc938954ee4d8e7674df4cea488062c5ce99 (diff)
Run senpai through nix-portable
-rw-r--r--scripts/p7s/senpai.py6
-rw-r--r--scripts/pyproject.toml1
-rwxr-xr-xworkstation/build_workstation1
-rw-r--r--workstation/modern_irc.md4
4 files changed, 9 insertions, 3 deletions
diff --git a/scripts/p7s/senpai.py b/scripts/p7s/senpai.py
new file mode 100644
index 00000000..60629879
--- /dev/null
+++ b/scripts/p7s/senpai.py
@@ -0,0 +1,6 @@
+#!/usr/bin/python3
+import os, shutil, subprocess, sys
+
+def main():
+ os.environ["NP_RUNTIME"] = "bwrap"
+ sys.exit(subprocess.run([shutil.which("nix-portable"), "nix", "run", "nixpkgs#senpai"]).returncode)
diff --git a/scripts/pyproject.toml b/scripts/pyproject.toml
index 69b6ab26..b7b5ecf6 100644
--- a/scripts/pyproject.toml
+++ b/scripts/pyproject.toml
@@ -28,3 +28,4 @@ setup_emacs = 'p7s.emacs:setup_emacs'
setup_ubpkg = 'p7s.ubpkg:setup_ubpkg'
setup_paperwm = 'p7s.paperwm:setup_paperwm'
setup_x12 = 'p7s.x12:setup_x12'
+senpai = 'p7s.senpai:main'
diff --git a/workstation/build_workstation b/workstation/build_workstation
index cb58db30..fd3d82fc 100755
--- a/workstation/build_workstation
+++ b/workstation/build_workstation
@@ -29,7 +29,6 @@ set -ue
--package qemu-img \
--package cdrtools \
--package mailutils \
- --package senpai \
--aur-package telegram-tdlib-purple-minimal-git \
--aur-package bitlbee-libpurple \
workstation
diff --git a/workstation/modern_irc.md b/workstation/modern_irc.md
index 5729d5df..1599d3a3 100644
--- a/workstation/modern_irc.md
+++ b/workstation/modern_irc.md
@@ -31,10 +31,10 @@ With this setup, I can:
# Set up
-My [workstation container image](build_workstation) includes Bitlbee, and the Telegram/Bitlbee adapter.
+My [workstation container image](build_workstation) includes Soju, Bitlbee, and the Telegram/Bitlbee adapter.
I have Python scripts that configure [soju](../scripts/p7s/soju.py) and [Bitlbee](../scripts/p7s/bitlbee.py) as persistent systemd services running as containers.
-The container image also includes Senpai, which I run using [distrobox](https://distrobox.it/).
+I use [Senpai](https://git.sr.ht/~delthas/senpai/) through [nix-portable](https://github.com/DavHau/nix-portable).
I install Goguma on my phone using [F-Droid](https://f-droid.org/).