diff --git a/.config/guix/manifests/system.scm b/.config/guix/manifests/system.scm index 1161260..5e2ac2f 100644 --- a/.config/guix/manifests/system.scm +++ b/.config/guix/manifests/system.scm @@ -1,6 +1,7 @@ ;; [[file:../../../Guix.org::*Manifests][Manifests:3]] (specifications->manifest '( + "zlib" "glibc" "patchelf" "python" diff --git a/.config/guix/systems/azure.scm b/.config/guix/systems/azure.scm index 8b3e565..551ef76 100644 --- a/.config/guix/systems/azure.scm +++ b/.config/guix/systems/azure.scm @@ -49,6 +49,7 @@ (inferior (inferior-for-channels channels))) (first (lookup-inferior-packages inferior "linux" "5.12.8")))) + ;; (kernel linux) (initrd microcode-initrd) (firmware (list linux-firmware)) (locale "en_US.utf8") diff --git a/.config/guix/systems/blue.scm b/.config/guix/systems/blue.scm index 265cd02..ddf2362 100644 --- a/.config/guix/systems/blue.scm +++ b/.config/guix/systems/blue.scm @@ -1,6 +1,8 @@ ;; [[file:../../../Guix.org::*blue][blue:1]] (use-modules (gnu)) (use-modules (gnu system nss)) +(use-modules (gnu packages bash)) +(use-modules ((gnu packages base) #:select (coreutils glibc))) (use-modules (gnu packages certs)) (use-modules (gnu packages version-control)) (use-modules (gnu packages vim)) @@ -8,6 +10,9 @@ (use-modules (gnu packages xorg)) (use-modules (gnu packages wm)) (use-modules (gnu packages openbox)) +(use-modules (srfi srfi-1)) +(use-modules (guix channels)) +(use-modules (guix inferior)) (use-modules (nongnu packages linux)) (use-modules (nongnu system linux-initrd)) @@ -21,7 +26,21 @@ (operating-system - (kernel linux) + (kernel + (let* + ((channels + (list (channel + (name 'nonguix) + (url "https://gitlab.com/nonguix/nonguix") + (commit "46c1d8bcca674d3a71cd077c52dde9552a89873d")) + (channel + (name 'guix) + (url "https://git.savannah.gnu.org/git/guix.git") + (commit "f463f376e91ccc1fe4ab68d5e822b5d71a1234f5")))) + (inferior + (inferior-for-channels channels))) + (first (lookup-inferior-packages inferior "linux" "5.12.8")))) + ;; (kernel linux) (initrd microcode-initrd) (firmware (list linux-firmware)) (locale "en_US.utf8") diff --git a/Guix.org b/Guix.org index 5064777..59dcc7e 100644 --- a/Guix.org +++ b/Guix.org @@ -453,7 +453,7 @@ Before I figure out how to package this for Guix: The official binaries work just fine after some patching, except for the =aw-qt= binary. -Properly building from source is more awkward (PyInstaller? Are you serious? xD), as there are multiple packages with lots of dependencies. +Properly building from source is more awkward, as there is poetry, which isn't oficially supported by Guix yet. The patching is as follows: @@ -470,7 +470,7 @@ Add libz to RPATH | Category | Guix dependency | |----------+-----------------| -| misc | zlib | +| system | zlib | #+begin_src bash eval :no patchelf --set-rpath /gnu/store/rykm237xkmq7rl1p0nwass01p090p88x-zlib-1.2.11/lib/ aw-qt @@ -482,7 +482,7 @@ patchelf --set-rpath /gnu/store/rykm237xkmq7rl1p0nwass01p090p88x-zlib-1.2.11/lib As aw-qt doesn't work properly, and the only thing it does is makes a tray icon anyhow, here is a script to launch the required components: #+begin_src bash :tangle ./bin/aw-start -~/Programs/activitywatch/aw-server/aw-server & -~/Programs/activitywatch/aw-watcher-afk/aw-watcher-afk & -~/Programs/activitywatch/aw-watcher-window/aw-watcher-window & +~/bin/activitywatch/aw-server/aw-server & +~/bin/activitywatch/aw-watcher-afk/aw-watcher-afk & +~/bin/activitywatch/aw-watcher-window/aw-watcher-window & #+end_src