Makefile

@@ -322,7 +322,7 @@ container_registry=harbor.home.wugi.info
 guix-image-workstation:
 	set -o nounset -o errexit -o pipefail -o xtrace
 	commit_8=$$(git rev-parse HEAD | cut -c -8)
-	container=$$(guix time-machine --channels=dotfiles/channels-current-local-file-pc0.scm -- system image --substitute-urls='https://bordeaux.guix.gnu.org https://substitutes.nonguix.org http://ci.guix.trop.in' --max-layers=100 -t docker --network ~/.local/share/chezmoi/dotfiles/guixsd/guix-image-workstation.scm)
+	container=$$(guix time-machine --channels=dotfiles/channels-current-guix-image-workstation.scm -- system image --substitute-urls='https://bordeaux.guix.gnu.org https://substitutes.nonguix.org http://ci.guix.trop.in' --max-layers=100 -t docker --network ~/.local/share/chezmoi/dotfiles/guixsd/guix-image-workstation.scm)
 	skopeo copy docker-archive\:$$container docker://$(container_registry)/library/$@:$$commit_8
 	echo $(container_registry)/library/$@:$$commit_8
 

apps/cluster1/workstation/kustomization.yaml

@@ -7,7 +7,7 @@ patchesStrategicMerge:
 - daemonset.yaml
 images:
 - name: harbor.home.wugi.info/library/guix-image-workstation
-  newTag: "e37260bb"
+  newTag: "8d47e3cb"
 - name: harbor.home.wugi.info/library/nixos-systemd
   newTag: 096ce36c
 - name: harbor.home.wugi.info/library/archlinux-systemd

dotfiles/channels-current-guix-image-workstation.scm

@@ -0,0 +1,34 @@
+(list (channel
+        (name 'guix)
+        (url "https://cgit.wugi.info/git/guix/guix")
+        (branch "master")
+        (commit
+          "ff4998fc38e1ef62f6392dddd3b5bae504ffe61a")
+        (introduction
+          (make-channel-introduction
+            "9edb3f66fd807b096b48283debdcddccfea34bad"
+            (openpgp-fingerprint
+              "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA"))))
+      (channel
+        (name 'guix-wigust)
+        (url "https://github.com/kitnil/guix-wigust")
+        (branch "master")
+        (commit
+          "83e86a2891dd57f54fc3568d6a56581fabbb02d2"))
+      (channel
+        (name 'nonguix)
+        (url "https://gitlab.com/nonguix/nonguix")
+        (branch "master")
+        (commit
+          "720df79727769e4230706e891841ec6f0b8b3890")
+        (introduction
+          (make-channel-introduction
+            "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
+            (openpgp-fingerprint
+              "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
+      (channel
+        (name 'prometheus-shepherd-exporter)
+        (url "https://gitlab.com/wigust/prometheus-shepherd-exporter")
+        (branch "master")
+        (commit
+          "542ec52c4955c854e770f615148ced99de5e9fec")))

dotfiles/channels-current-local-file-pc0.scm

@@ -3,7 +3,7 @@
         (url "https://cgit.wugi.info/git/guix/guix")
         (branch "master")
         (commit
-          "ff4998fc38e1ef62f6392dddd3b5bae504ffe61a")
+          "222fbcb37e13943b687e6b2e8cb0031077932a8a")
         (introduction
           (make-channel-introduction
             "9edb3f66fd807b096b48283debdcddccfea34bad"
@@ -20,7 +20,7 @@
         (url "https://gitlab.com/nonguix/nonguix")
         (branch "master")
         (commit
-          "720df79727769e4230706e891841ec6f0b8b3890")
+          "ad966c3844385e8f7b60b0dc915f92a1eba47e09")
         (introduction
           (make-channel-introduction
             "897c1a470da759236cc11798f4e0a5f7d4d59fbc"

dotfiles/manifests/obs.scm

@@ -1,13 +1,40 @@
-(use-modules (gnu packages video)
-             (packages video)
-             (guix profiles)
-             (nongnu packages video))
-
-(packages->manifest
- (list
-  obs-exporter
-  obs-pipewire-audio-capture
-  obs-source-clone
-  obs-source-record
-  obs-with-cef
-  obs-wlrobs))
+(define-module (obs)
+  #:use-module (gnu packages video)
+  #:use-module (guix channels)
+  #:use-module (guix inferior)
+  #:use-module (guix profiles)
+  #:use-module (guix store)
+  #:use-module (nongnu packages video)
+  #:use-module (packages video)
+  #:use-module (srfi srfi-1))
+
+(define channels
+  (include "/home/oleg/.local/share/chezmoi/dotfiles/channels-current-local-file.scm"))
+
+(define cached
+  (with-store store
+    (cached-channel-instance store
+                             channels
+                             #:authenticate? #t
+                             #:cache-directory (%inferior-cache-directory)
+                             #:ttl (* 3600 24 30))))
+
+(define inferior
+  (open-inferior cached #:error-port (current-error-port)))
+
+(define %obs-package-names
+  (list "obs-with-cef"
+        "obs-pipewire-audio-capture"
+        "obs-wlrobs"
+        "obs-looking-glass"
+
+        ;; "obs-exporter"
+        ;; "obs-source-clone"
+        ;; "obs-source-record"
+        ))
+
+(packages->manifest (append (map (lambda (package-name)
+                                   (first
+                                    (lookup-inferior-packages inferior package-name)))
+                                 %obs-package-names)
+                            (list obs-ndi)))

dotfiles/manifests/pc0-packages.scm

@@ -46,7 +46,6 @@
                "freerdp"
                "remmina"
                "looking-glass-client"
-               "obs-looking-glass"
                "netcat-openbsd"
                "openssh"
                "clipman")))