diff --git a/channels.scm b/channels.scm index 9198ef5..f35b7bf 100644 --- a/channels.scm +++ b/channels.scm @@ -1,31 +1,30 @@ -(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) - (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 'rosenthal) - (url "https://codeberg.org/hako/rosenthal.git") - (branch "trunk") - (introduction - (make-channel-introduction - "7677db76330121a901604dfbad19077893865f35" - (openpgp-fingerprint - "13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7")))) - (channel - (name 'ziltis-channel) - (url "https://gitea.lyrion.ch/zilti/guixchannel")))) +(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) + (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 'rosenthal) + (url "https://codeberg.org/hako/rosenthal.git") + (branch "trunk") + (introduction + (make-channel-introduction + "7677db76330121a901604dfbad19077893865f35" + (openpgp-fingerprint + "13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7")))) + (channel + (name 'ziltis-channel) + (url "https://gitea.lyrion.ch/zilti/guixchannel")) + %default-channels) diff --git a/config.org b/config.org index 1a02b03..4268704 100644 --- a/config.org +++ b/config.org @@ -11,8 +11,6 @@ #+begin_src makefile :tangle Makefile reconfigure: - mkdir -p ~/.config/guix - ln -sf `pwd`/channels.scm ~/.config/guix/channels.scm guix archive --authorize < signing-key.pub guix system reconfigure ./config.scm --substitute-urls='https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://substitutes.nonguix.org' make -C /home/zilti/.guix-home/profile/lib/browserpass hosts-firefox-user @@ -30,7 +28,6 @@ This is to be run after setting up the partitions. mkdir -p /mnt/boot/efi mount /dev/disk/by-label/EFI /mnt/boot/efi herd start cow-store /mnt - guix pull -C./channels.scm GUIX_PROFILE="/root/.config/guix/current" . "$GUIX_PROFILE/etc/profile" hash guix @@ -45,6 +42,7 @@ There are many community modules at [[https://whereis.みんな/][Whereis]]. - gnu - gnu image - gnu system nss +- guix channels - rosenthal packages wm - zilti packages sway - zilti packages hyprland @@ -136,38 +134,37 @@ There are many community modules at [[https://whereis.みんな/][Whereis]]. This adds the Nonguix channel. #+NAME: root-channels -#+begin_src scheme :tangle channels.scm - (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) - (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 'rosenthal) - (url "https://codeberg.org/hako/rosenthal.git") - (branch "trunk") - (introduction - (make-channel-introduction - "7677db76330121a901604dfbad19077893865f35" - (openpgp-fingerprint - "13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7")))) - (channel - (name 'ziltis-channel) - (url "https://gitea.lyrion.ch/zilti/guixchannel")))) +#+begin_src scheme + (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) + (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 'rosenthal) + (url "https://codeberg.org/hako/rosenthal.git") + (branch "trunk") + (introduction + (make-channel-introduction + "7677db76330121a901604dfbad19077893865f35" + (openpgp-fingerprint + "13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7")))) + (channel + (name 'ziltis-channel) + (url "https://gitea.lyrion.ch/zilti/guixchannel")) + %default-channels) #+end_src #+RESULTS: root-channels @@ -186,6 +183,7 @@ This adds the Nonguix channel. - hyprland - i915-firmware - libdrm +- linux-pam - mesa - nss-certs - network-manager @@ -193,11 +191,12 @@ This adds the Nonguix channel. - qtwayland - readline - tuxedo-keyboard -- xdg-desktop-portal - xdg-desktop-portal-hyprland +- xdg-desktop-portal - xf86-video-amdgpu - xf86-video-intel - xorg-server-xwayland +- xorg-server - wayland - amdgpu-firmware - amd-microcode @@ -261,7 +260,7 @@ These services are unmodified, or have just few settings. (service unattended-upgrade-service-type (unattended-upgrade-configuration (schedule "5 12 * * 1") - #;(channels #~ + (channels #~ <>))) #+end_src @@ -317,6 +316,8 @@ These services are unmodified, or have just few settings. (delete pulseaudio-service-type) (guix-service-type config => (guix-configuration (inherit config) + (channels + <>) (substitute-urls (append (list "https://substitutes.nonguix.org") %default-substitute-urls)) diff --git a/config.scm b/config.scm index bcc1b1b..31388fc 100644 --- a/config.scm +++ b/config.scm @@ -2,6 +2,7 @@ (gnu) (gnu image) (gnu system nss) + (guix channels) (rosenthal packages wm) (zilti packages sway) (zilti packages hyprland) @@ -103,11 +104,12 @@ qtwayland readline tuxedo-keyboard - xdg-desktop-portal xdg-desktop-portal-hyprland + xdg-desktop-portal xf86-video-amdgpu xf86-video-intel xorg-server-xwayland + xorg-server wayland amdgpu-firmware amd-microcode @@ -124,6 +126,37 @@ (delete pulseaudio-service-type) (guix-service-type config => (guix-configuration (inherit config) + (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) + (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 'rosenthal) + (url "https://codeberg.org/hako/rosenthal.git") + (branch "trunk") + (introduction + (make-channel-introduction + "7677db76330121a901604dfbad19077893865f35" + (openpgp-fingerprint + "13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7")))) + (channel + (name 'ziltis-channel) + (url "https://gitea.lyrion.ch/zilti/guixchannel")) + %default-channels)) (substitute-urls (append (list "https://substitutes.nonguix.org") %default-substitute-urls)) @@ -162,30 +195,6 @@ (service sddm-service-type (sddm-configuration))) (list polkit-wheel-service) - #;(list - (service greetd-service-type - (greetd-configuration - (greeter-supplementary-groups - (list "video" "input")) - (terminals - (list - (greetd-terminal-configuration - (terminal-vt "1")) - (greetd-terminal-configuration - (terminal-vt "2")) - (greetd-terminal-configuration - (terminal-vt "3")) - (greetd-terminal-configuration - (terminal-vt "4")) - #;(greetd-terminal-configuration - (terminal-vt "7") - (terminal-switch #t) - (default-session-command - (greetd-wlgreet-session - (command - (file-append swayfx "/bin/sway"))))) - (greetd-terminal-configuration - (terminal-vt "8"))))))) (list (service screen-locker-service-type (screen-locker-configuration @@ -202,36 +211,35 @@ (service unattended-upgrade-service-type (unattended-upgrade-configuration (schedule "5 12 * * 1") - #;(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) - (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 'rosenthal) - (url "https://codeberg.org/hako/rosenthal.git") - (branch "trunk") - (introduction - (make-channel-introduction - "7677db76330121a901604dfbad19077893865f35" - (openpgp-fingerprint - "13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7")))) - (channel - (name 'ziltis-channel) - (url "https://gitea.lyrion.ch/zilti/guixchannel")))))))))) + (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) + (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 'rosenthal) + (url "https://codeberg.org/hako/rosenthal.git") + (branch "trunk") + (introduction + (make-channel-introduction + "7677db76330121a901604dfbad19077893865f35" + (openpgp-fingerprint + "13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7")))) + (channel + (name 'ziltis-channel) + (url "https://gitea.lyrion.ch/zilti/guixchannel")) + %default-channels))))))) (name-service-switch %mdns-host-lookup-nss))