@@ 19,7 19,7 @@
(operating-system
(kernel linux)
(initrd microcode-initrd)
- (firmware (cons* amdgpu-firmware
+ (firmware (cons* linux-firmware
%base-firmware))
(host-name "laptop-ruther")
(timezone "Europe/Prague")
@@ 59,8 59,9 @@
;; Specify a swap file for the system, which resides on the
;; root file system.
- (swap-devices (list (swap-space
- (target "/swapfile"))))
+ (swap-devices (list ;; (swap-space
+ ;; (target "/swapfile"))
+ ))
;; Create user `bob' with `alice' as its initial password.
(users (cons (user-account
@@ 72,8 73,8 @@
%base-user-accounts))
;; Add the `students' group
- (groups (cons* (user-group
- (name "users"))
+ (groups (cons* ;; (user-group
+ ;; (name "users"))
%base-groups))
;; This is where we specify system-wide packages.
@@ 85,31 86,14 @@
emacs-vterm)
%base-packages))
- ;; Add GNOME and Xfce---we can choose at the log-in screen
- ;; by clicking the gear. Use the "desktop" services, which
- ;; include the X11 log-in service, networking with
- ;; NetworkManager, and more.
- (services (if (target-x86-64?)
- (append (list (service gnome-desktop-service-type)
- (service xfce-desktop-service-type)
- (set-xorg-configuration
- (xorg-configuration
- (keyboard-layout keyboard-layout))))
- %desktop-services
- (list (service special-files-service-type
- `(("/bin/sh" ,(file-append bash "/bin/bash"))))))
+ (services
+ (append (list (service gnome-desktop-service-type)
+ (set-xorg-configuration
+ (xorg-configuration
+ (keyboard-layout keyboard-layout)))
+ (service bluetooth-service-type))
+ %desktop-services)) ;; todo remove gdm))
- ;; FIXME: Since GDM depends on Rust (gdm -> gnome-shell -> gjs
- ;; -> mozjs -> rust) and Rust is currently unavailable on
- ;; non-x86_64 platforms, we use SDDM and Mate here instead of
- ;; GNOME and GDM.
- (append (list (service mate-desktop-service-type)
- (service xfce-desktop-service-type)
- (set-xorg-configuration
- (xorg-configuration
- (keyboard-layout keyboard-layout))
- sddm-service-type))
- %desktop-services)))
;; Allow resolution of '.local' host names with mDNS.
(name-service-switch %mdns-host-lookup-nss))