From 024feceb441a449018c83cbe02ceccc4eab189c8 Mon Sep 17 00:00:00 2001
From: Frieder Schlesier <frieder@fschl.de>
Date: Sun, 19 May 2024 13:42:46 +0200
Subject: [PATCH] update fschl/systems/{base,x230}.scm

---
 fschl/systems/base.scm | 26 +++++++++++++-------------
 fschl/systems/x230.scm |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/fschl/systems/base.scm b/fschl/systems/base.scm
index 7196fb3..58e79a5 100644
--- a/fschl/systems/base.scm
+++ b/fschl/systems/base.scm
@@ -15,7 +15,7 @@
 
 (define-public base-operating-system
   (operating-system
-   (host-name "x230guix")
+   (host-name "default-placeholder")
    (timezone "Europe/Berlin")
    (locale "en_US.utf8")
 
@@ -35,7 +35,7 @@
    ;; Partition mounted on /boot/efi.
   (bootloader (bootloader-configuration
                 (bootloader grub-bootloader)
-                ;;(targets (list "/dev/sda"))
+                (targets (list "/dev/vda"))
                 (keyboard-layout keyboard-layout)))
 ;;   (bootloader (bootloader-configuration
 ;;                (bootloader grub-efi-bootloader)
@@ -52,7 +52,7 @@
                    (check? #f))
 
                   (file-system
-                   (device "/dev/sda3")
+                   (device "/dev/vda3")
                    (mount-point "/")
                    (type "ext4"))
                   %base-file-systems))
@@ -81,21 +81,21 @@
 
    ;; Install bare-minimum system packages
    (packages (append (map specification->package
-                          '("git"
-                            "ntfs-3g"
+                          '("bluez"
+                            "bluez-alsa"
+                            "brightnessctl"
+                            "btrfs-progs"
+                            "emacs-no-x-toolkit"
                             "exfat-utils"
                             "fuse-exfat"
-                            "stow"
-                            "vim"
-                            "emacs-no-x-toolkit"
-                            "brightnessctl"
-                            "bluez"
-                            "bluez-alsa"
+                            "git"
+                            "gvfs"    ;; Enable user mounts
                             "intel-vaapi-driver"
                             "libva-utils"
-                            "xf86-input-libinput"
                             "nss-certs" ;; SSL root certificates
-                            "gvfs"))    ;; Enable user mounts
+                            "ntfs-3g"
+                            "vim"
+                            "xf86-input-libinput"))
                      %base-packages))
 
    ;; Configure only the services necessary to run the system
diff --git a/fschl/systems/x230.scm b/fschl/systems/x230.scm
index a2705af..2d7c073 100644
--- a/fschl/systems/x230.scm
+++ b/fschl/systems/x230.scm
@@ -1,4 +1,4 @@
-(define-module (fschl systems x230ding)
+(define-module (fschl systems x230)
   #:use-module (fschl utils)
   #:use-module (fschl systems base)
   #:use-module (fschl systems common)
@@ -25,7 +25,7 @@
 (define system
   (operating-system
    (inherit base-operating-system)
-   (host-name "x230guix")
+   (host-name "x230")
 
    ;; Add sof-firmware drivers for audio on ThinkPad x230
  ;;  (firmware (list linux-firmware sof-firmware))