diff options
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/examples/vm-image.tmpl | 28 | ||||
| -rw-r--r-- | gnu/system/images/orangepi-r1-plus-lts-rk3328.scm | 76 | ||||
| -rw-r--r-- | gnu/system/install.scm | 7 |
3 files changed, 92 insertions, 19 deletions
diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index b68183a023..dc9a7542a5 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -8,7 +8,7 @@ (use-modules (gnu) (guix) (srfi srfi-1)) (use-service-modules desktop mcron networking spice ssh xorg sddm) (use-package-modules bootloaders certs fonts - package-management xorg) + package-management xdisorg xorg) (define vm-image-motd (plain-file "motd" " \x1b[1;37mThis is the GNU system. Welcome!\x1b[0m @@ -25,18 +25,6 @@ Run '\x1b[1;37minfo guix\x1b[0m' to browse documentation. accounts.\x1b[0m ")) -;;; XXX: Xfce does not implement what is needed for the SPICE dynamic -;;; resolution to work (see: -;;; https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/142). Workaround it -;;; by manually invoking xrandr every second. -(define auto-update-resolution-crutch - #~(job '(next-second) - (lambda () - (setenv "DISPLAY" ":0.0") - (setenv "XAUTHORITY" "/home/guest/.Xauthority") - (execl (string-append #$xrandr "/bin/xrandr") "xrandr" "-s" "0")) - #:user "guest")) - (operating-system (host-name "gnu") (timezone "Etc/UTC") @@ -65,7 +53,7 @@ accounts.\x1b[0m (users (cons (user-account (name "guest") (comment "GNU Guix Live") - (password "") ;no password + (password "") ;no password (group "users") (supplementary-groups '("wheel" "netdev" "audio" "video"))) @@ -77,8 +65,13 @@ accounts.\x1b[0m root ALL=(ALL) ALL %wheel ALL=NOPASSWD: ALL\n")) - (packages (append (list font-bitstream-vera nss-certs) - %base-packages)) + (packages + (append (list font-bitstream-vera nss-certs + ;; Auto-started script providing SPICE dynamic resizing for + ;; Xfce (see: + ;; https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/142). + x-resize) + %base-packages)) (services (append (list (service xfce-desktop-service-type) @@ -104,9 +97,6 @@ root ALL=(ALL) ALL ;; integration with the host, etc. (service spice-vdagent-service-type) - (simple-service 'cron-jobs mcron-service-type - (list auto-update-resolution-crutch)) - ;; Use the DHCP client service rather than NetworkManager. (service dhcp-client-service-type)) diff --git a/gnu/system/images/orangepi-r1-plus-lts-rk3328.scm b/gnu/system/images/orangepi-r1-plus-lts-rk3328.scm new file mode 100644 index 0000000000..eaaa12ba78 --- /dev/null +++ b/gnu/system/images/orangepi-r1-plus-lts-rk3328.scm @@ -0,0 +1,76 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2023 Herman Rimm <herman@rimm.ee> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (gnu system images orangepi-r1-plus-lts-rk3328) + #:use-module (gnu bootloader) + #:use-module (gnu bootloader u-boot) + #:use-module (gnu image) + #:use-module (gnu packages linux) + #:use-module (gnu packages certs) + #:use-module (guix platforms arm) + #:use-module (gnu services) + #:use-module (gnu services base) + #:use-module (gnu services networking) + #:use-module (gnu system) + #:use-module (gnu system file-systems) + #:use-module (gnu system image) + #:use-module (srfi srfi-26) + #:export (orangepi-r1-plus-lts-rk3328-barebones-os + orangepi-r1-plus-lts-rk3328-image-type + orangepi-r1-plus-lts-rk3328-barebones-raw-image)) + +(define orangepi-r1-plus-lts-rk3328-barebones-os + (operating-system + (host-name "windmolen") + (timezone "Europe/Amsterdam") + (locale "en_US.utf8") + (bootloader (bootloader-configuration + (bootloader u-boot-orangepi-r1-plus-lts-rk3328-bootloader) + (targets '("/dev/mmcblk0")))) + (initrd-modules '()) + (kernel linux-libre-arm64-generic) + (file-systems (cons (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext4")) %base-file-systems)) + (services + (cons* (service agetty-service-type + (agetty-configuration (extra-options '("-L")) ;no carrier detect + (baud-rate "1500000") + (term "vt100") + (tty "ttyS2"))) + (service dhcp-client-service-type) + (service ntp-service-type) %base-services)) + (packages (cons nss-certs %base-packages)))) + +(define orangepi-r1-plus-lts-rk3328-image-type + (image-type (name 'orangepi-r1-plus-lts-rk3328-raw) + (constructor (lambda (os) + (image (inherit (raw-with-offset-disk-image (expt + 2 24))) + (operating-system + os) + (platform aarch64-linux)))))) + +(define orangepi-r1-plus-lts-rk3328-barebones-raw-image + (image (inherit (os+platform->image orangepi-r1-plus-lts-rk3328-barebones-os + aarch64-linux + #:type orangepi-r1-plus-lts-rk3328-image-type)) + (name 'orangepi-r1-plus-lts-rk3328-barebones-raw-image))) + +orangepi-r1-plus-lts-rk3328-barebones-raw-image diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 336d13bd07..371bfc2a63 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2022 Josselin Poiret <dev@jpoiret.xyz> +;;; Copyright © 2023 Herman Rimm <herman@rimm.ee> ;;; ;;; This file is part of GNU Guix. ;;; @@ -69,6 +70,7 @@ mx6cuboxi-installation-os nintendo-nes-classic-edition-installation-os novena-installation-os + orangepi-r1-plus-lts-rk3328-installation-os firefly-rk3399-installation-os pine64-plus-installation-os pinebook-installation-os @@ -633,6 +635,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." "/dev/mmcblk0" ; SD card (solder it yourself) "ttyS0")) +(define orangepi-r1-plus-lts-rk3328-installation-os + (embedded-installation-os u-boot-orangepi-r1-plus-lts-rk3328-bootloader + "/dev/mmcblk0" ; SD card storage + "ttyS0")) + (define pine64-plus-installation-os (embedded-installation-os u-boot-pine64-plus-bootloader "/dev/mmcblk0" ; SD card storage |