From b887ae0c7dd17923eabd91b747120b32c46f98d5 Mon Sep 17 00:00:00 2001 From: SqrtMinusOne Date: Sun, 20 Jun 2021 20:16:34 +0300 Subject: [PATCH] feat(guix): update manifests --- .config/guix/manifests/latex.scm | 1 + .config/guix/manifests/system.scm | 6 +++++- Desktop.org | 9 ++------- Guix.org | 13 ++++++++++++- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.config/guix/manifests/latex.scm b/.config/guix/manifests/latex.scm index b82e81d..a140256 100644 --- a/.config/guix/manifests/latex.scm +++ b/.config/guix/manifests/latex.scm @@ -1,3 +1,4 @@ (specifications->manifest '( + "texlab-bin" "texlive")) diff --git a/.config/guix/manifests/system.scm b/.config/guix/manifests/system.scm index f14351d..49270a5 100644 --- a/.config/guix/manifests/system.scm +++ b/.config/guix/manifests/system.scm @@ -1,3 +1,7 @@ +;; [[file:../../../Guix.org::*Manifest][Manifest:2]] (specifications->manifest '( - )) + "glibc" + "patchelf" + "openvpn")) +;; Manifest:2 ends here diff --git a/Desktop.org b/Desktop.org index 42f3518..0462898 100644 --- a/Desktop.org +++ b/Desktop.org @@ -2032,11 +2032,13 @@ This section generates manifests for various desktop software that I'm using. | Category | Guix dependency | |----------+-----------------| | latex | texlive | +| latex | texlab-bin | ** Dev | Category | Guix dependency | |----------+-----------------| | dev | conda | | dev | docker-compose | +| dev | python | ** Manifests #+NAME: packages #+begin_src emacs-lisp :tangle no :var category="" @@ -2057,13 +2059,6 @@ Browsers <>)) #+end_src -System -#+begin_src scheme :tangle .config/guix/manifests/system.scm :noweb yes -(specifications->manifest - '( - <>)) -#+end_src - Music #+begin_src scheme :tangle .config/guix/manifests/music.scm :noweb yes (specifications->manifest diff --git a/Guix.org b/Guix.org index eabe1e7..9834666 100644 --- a/Guix.org +++ b/Guix.org @@ -394,7 +394,6 @@ Don't forget to install =JetBrainsMono Nerd Font=. | Category | Guix dependency | |----------+-----------------| | system | openvpn | -| system | python | ** VPN I'm not sure how to properly spin up VPN on Guix, so here is what I'm doing now. @@ -458,6 +457,18 @@ nmcli con modify "$CONN" ipv4.method auto nmcli con modify "$CONN" ipv6.method auto nmcli connection up "$CONN" #+end_src +** Manifest +#+NAME: packages +#+begin_src emacs-lisp :tangle no :var category="" +(my/format-guix-dependencies category) +#+end_src + +System +#+begin_src scheme :tangle .config/guix/manifests/system.scm :noweb yes +(specifications->manifest + '( + <>)) +#+end_src * Notes on installing software | Category | Guix dependency | Description | |----------+-----------------+----------------------------------------------------|