From 66931009f7e5edf1fa52e3d3b3415e7cd2417a3d Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Thu, 21 Mar 2024 02:57:41 +0100 Subject: [PATCH] . --- channels.scm | 44 ++++++++++++++++++----------------- config.org | 46 +++++++++++++++++++------------------ config.scm | 46 +++++++++++++++++++------------------ home/home-configuration.scm | 22 ------------------ 4 files changed, 71 insertions(+), 87 deletions(-) diff --git a/channels.scm b/channels.scm index f5efc77..f12e32f 100644 --- a/channels.scm +++ b/channels.scm @@ -1,21 +1,23 @@ -(cons* (channel - (name 'nonguix) - (url "https://gitlab.com/nonguix/nonguix") - ;; Enable signature verification: - (introduction - (make-channel-introduction - "897c1a470da759236cc11798f4e0a5f7d4d59fbc" - (openpgp-fingerprint - "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) - (channel - (name 'emacs-melpa) - (url "https://github.com/babariviere/guix-emacs") - (introduction - (make-channel-introduction - "72ca4ef5b572fea10a4589c37264fa35d4564783" - (openpgp-fingerprint - "261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18")))) - (channel - (name 'ziltis-channel) - (url "https://gitea.lyrion.ch/zilti/guixchannel")) - %default-channels) +(append %default-channels + (list + (channel + (name 'nonguix) + (url "https://gitlab.com/nonguix/nonguix") + ;; Enable signature verification: + (introduction + (make-channel-introduction + "897c1a470da759236cc11798f4e0a5f7d4d59fbc" + (openpgp-fingerprint + "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) + (channel + (name 'emacs-melpa) + (url "https://github.com/babariviere/guix-emacs") + (introduction + (make-channel-introduction + "72ca4ef5b572fea10a4589c37264fa35d4564783" + (openpgp-fingerprint + "261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18")))) + (channel + (name 'ziltis-channel) + (url "https://gitea.lyrion.ch/zilti/guixchannel"))) + ) diff --git a/config.org b/config.org index 84edbd0..fe9f23a 100644 --- a/config.org +++ b/config.org @@ -132,27 +132,29 @@ This adds the Nonguix channel. #+NAME: root-channels #+begin_src scheme :tangle channels.scm - (cons* (channel - (name 'nonguix) - (url "https://gitlab.com/nonguix/nonguix") - ;; Enable signature verification: - (introduction - (make-channel-introduction - "897c1a470da759236cc11798f4e0a5f7d4d59fbc" - (openpgp-fingerprint - "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) - (channel - (name 'emacs-melpa) - (url "https://github.com/babariviere/guix-emacs") - (introduction - (make-channel-introduction - "72ca4ef5b572fea10a4589c37264fa35d4564783" - (openpgp-fingerprint - "261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18")))) - (channel - (name 'ziltis-channel) - (url "https://gitea.lyrion.ch/zilti/guixchannel")) - %default-channels) + (append %default-channels + (list + (channel + (name 'nonguix) + (url "https://gitlab.com/nonguix/nonguix") + ;; Enable signature verification: + (introduction + (make-channel-introduction + "897c1a470da759236cc11798f4e0a5f7d4d59fbc" + (openpgp-fingerprint + "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) + (channel + (name 'emacs-melpa) + (url "https://github.com/babariviere/guix-emacs") + (introduction + (make-channel-introduction + "72ca4ef5b572fea10a4589c37264fa35d4564783" + (openpgp-fingerprint + "261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18")))) + (channel + (name 'ziltis-channel) + (url "https://gitea.lyrion.ch/zilti/guixchannel"))) + ) #+end_src ** Packages @@ -176,7 +178,7 @@ This adds the Nonguix channel. - network-manager - podman - readline -- swayfx +- swayfx-0.3.2 - tuxedo-keyboard - xf86-video-amdgpu - xf86-video-intel diff --git a/config.scm b/config.scm index d52a3ca..1f3635c 100644 --- a/config.scm +++ b/config.scm @@ -98,7 +98,7 @@ network-manager podman readline - swayfx + swayfx-0.3.2 tuxedo-keyboard xf86-video-amdgpu xf86-video-intel @@ -202,26 +202,28 @@ (unattended-upgrade-configuration (schedule "5 12 * * 1") #;(channels - (cons* (channel - (name 'nonguix) - (url "https://gitlab.com/nonguix/nonguix") - ;; Enable signature verification: - (introduction - (make-channel-introduction - "897c1a470da759236cc11798f4e0a5f7d4d59fbc" - (openpgp-fingerprint - "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) - (channel - (name 'emacs-melpa) - (url "https://github.com/babariviere/guix-emacs") - (introduction - (make-channel-introduction - "72ca4ef5b572fea10a4589c37264fa35d4564783" - (openpgp-fingerprint - "261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18")))) - (channel - (name 'ziltis-channel) - (url "https://gitea.lyrion.ch/zilti/guixchannel")) - %default-channels))))) + (append %default-channels + (list + (channel + (name 'nonguix) + (url "https://gitlab.com/nonguix/nonguix") + ;; Enable signature verification: + (introduction + (make-channel-introduction + "897c1a470da759236cc11798f4e0a5f7d4d59fbc" + (openpgp-fingerprint + "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) + (channel + (name 'emacs-melpa) + (url "https://github.com/babariviere/guix-emacs") + (introduction + (make-channel-introduction + "72ca4ef5b572fea10a4589c37264fa35d4564783" + (openpgp-fingerprint + "261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18")))) + (channel + (name 'ziltis-channel) + (url "https://gitea.lyrion.ch/zilti/guixchannel"))) + ))))) )) (name-service-switch %mdns-host-lookup-nss)) diff --git a/home/home-configuration.scm b/home/home-configuration.scm index c960727..9234e89 100644 --- a/home/home-configuration.scm +++ b/home/home-configuration.scm @@ -131,28 +131,6 @@ (home-mcron-configuration (jobs '()))) - (simple-service 'ziltis-channels - home-channels-service-type - (list - (channel - (name 'ziltis-channel) - (url "https://gitea.lyrion.ch/zilti/guixchannel")) - (channel - (name 'emacs-melpa) - (url "https://github.com/babariviere/guix-emacs") - (introduction - (make-channel-introduction - "72ca4ef5b572fea10a4589c37264fa35d4564783" - (openpgp-fingerprint - "261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18")))) - (channel - (name 'nongnu-guix) - (url "https://gitlab.com/nonguix/nonguix") - (introduction - (make-channel-introduction - "897c1a470da759236cc11798f4e0a5f7d4d59fbc" - (openpgp-fingerprint - "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))))) (simple-service 'ziltis-packages home-profile-service-type (specifications->packages