feat(guix): update other systems

This commit is contained in:
Pavel Korytov 2021-07-20 21:41:58 +03:00
parent b89a27b390
commit bd7d246fef
3 changed files with 31 additions and 13 deletions

View file

@ -12,6 +12,7 @@
(use-modules (gnu packages openbox)) (use-modules (gnu packages openbox))
(use-modules (gnu services docker)) (use-modules (gnu services docker))
(use-modules (gnu services cups)) (use-modules (gnu services cups))
(use-modules (gnu services virtualization))
(use-modules (srfi srfi-1)) (use-modules (srfi srfi-1))
(use-modules (guix channels)) (use-modules (guix channels))
(use-modules (guix inferior)) (use-modules (guix inferior))
@ -30,10 +31,17 @@
(cups-configuration (cups-configuration
(web-interface? #t))) (web-interface? #t)))
(service docker-service-type) (service docker-service-type)
(service libvirt-service-type
(libvirt-configuration
(unix-sock-group "libvirt")
(tls-port "16555")))
(service virtlog-service-type)
(modify-services %desktop-services (modify-services %desktop-services
(network-manager-service-type config => (network-manager-service-type
(network-manager-configuration (inherit config) config =>
(vpn-plugins (list network-manager-openvpn))))))) (network-manager-configuration
(inherit config)
(vpn-plugins (list network-manager-openvpn)))))))
(define %backlight-udev-rule (define %backlight-udev-rule
@ -52,14 +60,14 @@
(list (channel (list (channel
(name 'nonguix) (name 'nonguix)
(url "https://gitlab.com/nonguix/nonguix") (url "https://gitlab.com/nonguix/nonguix")
(commit "46c1d8bcca674d3a71cd077c52dde9552a89873d")) (commit "d3c5eea0cbfe3e5bfbcf1fe15bc916fefacc624f"))
(channel (channel
(name 'guix) (name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git") (url "https://git.savannah.gnu.org/git/guix.git")
(commit "f463f376e91ccc1fe4ab68d5e822b5d71a1234f5")))) (commit "cf88c967afbf15c58efb0ba37d6638f1be9a0481"))))
(inferior (inferior
(inferior-for-channels channels))) (inferior-for-channels channels)))
(first (lookup-inferior-packages inferior "linux" "5.12.8")))) (first (lookup-inferior-packages inferior "linux" "5.12.9"))))
;; (kernel linux) ;; (kernel linux)
(initrd microcode-initrd) (initrd microcode-initrd)
(firmware (list linux-firmware)) (firmware (list linux-firmware))
@ -80,6 +88,7 @@
"tty" "tty"
"docker" "docker"
"scanner" "scanner"
"libvirt"
"lp"))) "lp")))
%base-user-accounts)) %base-user-accounts))

View file

@ -12,6 +12,7 @@
(use-modules (gnu packages openbox)) (use-modules (gnu packages openbox))
(use-modules (gnu services docker)) (use-modules (gnu services docker))
(use-modules (gnu services cups)) (use-modules (gnu services cups))
(use-modules (gnu services virtualization))
(use-modules (srfi srfi-1)) (use-modules (srfi srfi-1))
(use-modules (guix channels)) (use-modules (guix channels))
(use-modules (guix inferior)) (use-modules (guix inferior))
@ -30,10 +31,17 @@
(cups-configuration (cups-configuration
(web-interface? #t))) (web-interface? #t)))
(service docker-service-type) (service docker-service-type)
(service libvirt-service-type
(libvirt-configuration
(unix-sock-group "libvirt")
(tls-port "16555")))
(service virtlog-service-type)
(modify-services %desktop-services (modify-services %desktop-services
(network-manager-service-type config => (network-manager-service-type
(network-manager-configuration (inherit config) config =>
(vpn-plugins (list network-manager-openvpn))))))) (network-manager-configuration
(inherit config)
(vpn-plugins (list network-manager-openvpn)))))))
(operating-system (operating-system
@ -43,14 +51,14 @@
(list (channel (list (channel
(name 'nonguix) (name 'nonguix)
(url "https://gitlab.com/nonguix/nonguix") (url "https://gitlab.com/nonguix/nonguix")
(commit "46c1d8bcca674d3a71cd077c52dde9552a89873d")) (commit "d3c5eea0cbfe3e5bfbcf1fe15bc916fefacc624f"))
(channel (channel
(name 'guix) (name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git") (url "https://git.savannah.gnu.org/git/guix.git")
(commit "f463f376e91ccc1fe4ab68d5e822b5d71a1234f5")))) (commit "cf88c967afbf15c58efb0ba37d6638f1be9a0481"))))
(inferior (inferior
(inferior-for-channels channels))) (inferior-for-channels channels)))
(first (lookup-inferior-packages inferior "linux" "5.12.8")))) (first (lookup-inferior-packages inferior "linux" "5.12.9"))))
;; (kernel linux) ;; (kernel linux)
(initrd microcode-initrd) (initrd microcode-initrd)
(firmware (list linux-firmware)) (firmware (list linux-firmware))
@ -71,6 +79,7 @@
"tty" "tty"
"docker" "docker"
"scanner" "scanner"
"libvirt"
"lp"))) "lp")))
%base-user-accounts)) %base-user-accounts))

View file

@ -142,7 +142,7 @@ References:
(cons* (cons*
(channel (channel
(name 'channel-q) (name 'channel-q)
(url "https://github.com/SqrtMinusOne/channel-q.git")) (url "file:///home/pavel/Code/channel-q"))
(channel (channel
(name 'flat) (name 'flat)
(url "https://github.com/flatwhatson/guix-channel.git") (url "https://github.com/flatwhatson/guix-channel.git")