(machines): remove dead modules

4 files changed, 3 insertions, 224 deletions

diff --git a/deployment/system/akashi.scm b/deployment/system/akashi.scm
index 8a3602f..aec057d 100644
--- a/deployment/system/akashi.scm
+++ b/deployment/system/akashi.scm
@@ -21,6 +21,7 @@
 (define-module (deployment system akashi)
   #:export     (host-name)
   #:use-module (guix gexp)
+  #:use-module (sovereign bootloader)
   #:use-module (users id1000)
   #:use-module ((deployment gexp)
                 #:prefix deployment:gexp:)
@@ -50,8 +51,6 @@
                 #:prefix gnu:system:shadow:)
   #:use-module ((guix diagnostics)
                 #:prefix guix:diagnostics:)
-  #:use-module ((machines thinkpad-x200)
-                #:prefix machines:thinkpad-x200:)
   #:use-module ((sovereign systems)
                 #:prefix sovereign:systems:))
 
@@ -103,7 +102,7 @@
                                    "thinkpad_acpi.fan='level 7'"
                                    gnu:system:%default-kernel-arguments))
    (hurd                    #f)
-   (bootloader              (machines:thinkpad-x200:bootloader-configuration* system-keyboard-layout))
+   (bootloader              (custom-bootloader-configuration (list "/dev/sda")))
    (label                   (sovereign:systems:operating-system-label* host-name
                                                                        gnu:system:this-operating-system))
    (keyboard-layout         system-keyboard-layout)
@@ -115,7 +114,7 @@
    (mapped-devices          (list))
    (file-systems            (cons* root-partition
                                    gnu:system:file-systems:%base-file-systems))
-   (swap-devices            (machines:thinkpad-x200:swap-devices* host-name))
+   (swap-devices            (list))
    (users                   (list uid1000-account))
    (groups                  gnu:system:shadow:%base-groups)
    (skeletons               (gnu:system:shadow:default-skeletons))
diff --git a/machines/amd64.scm b/machines/amd64.scm
deleted file mode 100644
index cf00cd1..0000000
--- a/machines/amd64.scm
+++ /dev/null
@@ -1,85 +0,0 @@
-;;; SPDX-License-Identifier: GPL-3.0-or-later
-;;; SPDX-FileCopyrightText: 2026 Marek Paśnikowski <marek@marekpasnikowski.pl>
-
-;;; COPYRIGHT NOTICE
-;;;
-;;; Copyright 2026, Marek Paśnikowski <marek@marekpasnikowski.pl>
-
-;;; LICENSE NOTICE
-;;;
-;;; This library 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.
-;;;
-;;; This library 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 this library.
-;;; If not, see <https://www.gnu.org/licenses/>.
-
-(define-module (machines amd64)
-  ;; file-system
-  ;; swap-space
-  #:use-module (gnu system file-systems)
-
-  ;; linux
-  ;; linux-firmware
-  #:use-module (nongnu packages linux)
-
-  ;; microcode-initrd
-  #:use-module (nongnu system linux-initrd))
-
-;; string ->
-;; (list record* file-system)
-(define-public (file-systems* host-name*)
-  (let* ((root-device-string (string-append host-name* "-root"))
-
-	 (root-device (file-system-label root-device-string))
-
-	 (file-system-root (file-system (type "ext4")
-					(mount-point "/")
-					(device root-device))))
-    (append %base-file-systems
-            (list file-system-root))))
-
-;; (list record* package)
-(define-public firmware*
-  (list linux-firmware))
-
-;; record* package
-(define-public initrd*
-  microcode-initrd)
-
-;; record* package
-(define-public kernel-amd64
-  linux)
-
-;; string ->
-;; (list record* swap-space)
-(define-public (swap-devices* host-name*)
-  (let* ((label* (string-append host-name* "-swap"))
-
-	 (target* (file-system-label label*))
-
-	 (swap-space* (swap-space (target target*))))
-    (list swap-space*)))
-
-;;;???????????????????????????????????????????????????????????????????
-
-(define-public (bootloader-device-path host-name)
-  (let*
-       ((close-pipe (@ (ice-9 popen) close-pipe))
-        (open-input-pipe (@ (ice-9 popen) open-input-pipe))
-        (read-line (@ (ice-9 rdelim) read-line))
-        (command-chain (string-append "findmnt -o SOURCE,LABEL "
-                                      "| grep "
-                                      host-name
-                                      " "
-                                      "| head -n 1 "
-                                      "| awk '{print $1}' "
-                                      "| sed 's/[0-9]*$//' "))
-        (port (open-input-pipe command-chain))
-        (output (read-line port)))
-     (close-pipe port)
-     output))
diff --git a/machines/inspiron.scm b/machines/inspiron.scm
deleted file mode 100644
index e65264c..0000000
--- a/machines/inspiron.scm
+++ /dev/null
@@ -1,86 +0,0 @@
-;;; SPDX-License-Identifier: GPL-3.0-or-later
-;;; SPDX-FileCopyrightText: 2026 Marek Paśnikowski <marek@marekpasnikowski.pl>
-
-;;; COPYRIGHT NOTICE
-;;;
-;;; Copyright 2026, Marek Paśnikowski <marek@marekpasnikowski.pl>
-
-;;; LICENSE NOTICE
-;;;
-;;; This library 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.
-;;;
-;;; This library 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 this library.
-;;; If not, see <https://www.gnu.org/licenses/>.
-
-(define-module (machines inspiron)
-  ;; bootloader-configuration
-  #:use-module (gnu bootloader)
-
-  ;; grub-bootloader
-  #:use-module (gnu bootloader grub)
-
-  ;; file-system
-  ;; swap-space
-  #:use-module (gnu system file-systems)
-
-  ;; linux
-  ;; linux-firmware
-  #:use-module (nongnu packages linux)
-
-  ;; microcode-initrd
-  #:use-module (nongnu system linux-initrd))
-
-;; bootloader-configuration
-(define-public (bootloader-configuration* keyboard-layout*)
-  (let ((bootloader* grub-bootloader)
-	(bootloader-targets (list "/dev/sda")) ; TODO: generalize the target
-	)
-    (bootloader-configuration (bootloader bootloader*)
-			      (targets bootloader-targets)
-			      (keyboard-layout keyboard-layout*))))
-
-;; string ->
-;; (list record* file-system)
-(define-public (file-systems* host-name*)
-  (let* ((root-device-string (string-append host-name* "-root"))
-
-	 (root-device (file-system-label root-device-string))
-
-	 (file-system-root (file-system (type "ext4")
-					(mount-point "/")
-					(device root-device))))
-    (list file-system-root)))
-
-;; (list record* package)
-(define-public firmware*
-  (list linux-firmware))
-
-;; (list string)
-(define-public hardware-groups
-  (list "audio"
-	"netdev"
-	"video"))
-
-;; record* package
-(define-public initrd*
-  microcode-initrd)
-
-;; record* package
-(define-public kernel*
-  linux)
-
-;; string ->
-;; (list record* swap-space)
-(define-public (swap-devices* host-name*)
-  (let* ((label* (string-append host-name* "-swap"))
-
-	 (target* (file-system-label label*))
-
-	 (swap-space* (swap-space (target target*))))
-    (list swap-space*)))
diff --git a/machines/thinkpad-x200.scm b/machines/thinkpad-x200.scm
deleted file mode 100644
index c3c4ed5..0000000
--- a/machines/thinkpad-x200.scm
+++ /dev/null
@@ -1,49 +0,0 @@
-;;; SPDX-License-Identifier: GPL-3.0-or-later
-;;; SPDX-FileCopyrightText: 2026 Marek Paśnikowski <marek@marekpasnikowski.pl>
-
-;;; COPYRIGHT NOTICE
-;;;
-;;; Copyright 2026, Marek Paśnikowski <marek@marekpasnikowski.pl>
-
-;;; LICENSE NOTICE
-;;;
-;;; This library 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.
-;;;
-;;; This library 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 this library.
-;;; If not, see <https://www.gnu.org/licenses/>.
-
-(define-module (machines thinkpad-x200)
-  ;; bootloader-configuration
-  #:use-module (gnu bootloader)
-
-  ;; grub-bootloader
-  #:use-module (gnu bootloader grub)
-
-  ;; file-system
-  ;; swap-space
-  #:use-module (gnu system file-systems))
-
-;; bootloader-configuration
-(define-public (bootloader-configuration* keyboard-layout*)
-  (let ((bootloader* grub-bootloader)
-	(bootloader-targets (list "/dev/sda")) ; TODO: generalize the target
-	)
-    (bootloader-configuration (bootloader bootloader*)
-			      (targets bootloader-targets)
-			      (keyboard-layout keyboard-layout*))))
-
-;; string ->
-;; (list record* swap-space)
-(define-public (swap-devices* host-name*)
-  (let* ((label* (string-append host-name* "-swap"))
-
-	 (target* (file-system-label label*))
-
-	 (swap-space* (swap-space (target target*))))
-    (list swap-space*)))