Update CERN machine to be new laptop

1 files changed, 4 insertions, 22 deletions

diff --git a/tw/system/cern.scm b/tw/system/cern.scm
index 9a87913d..002386f6 100644
--- a/tw/system/cern.scm
+++ b/tw/system/cern.scm
@@ -22,11 +22,9 @@
                      vpn xorg)
 
 (define efi-system-partition          ; /dev/nvme0n1p1
-  (uuid "806A-2762" 'fat))
+  (uuid "7E1B-8A5B" 'fat))
 (define guixsd-root-partition         ; /dev/nvme0n1p2
-  (uuid "04134b95-9cc5-4931-903a-c3446297a006" 'btrfs))
-(define swap-partition                ; /dev/nvme0n1p3
-  (uuid "53559d6c-bf62-4cf6-991a-6dce6dd1dc64"))
+  (uuid "933d1bec-14ec-4421-aa4d-93846c68f27c" 'btrfs))
 
 (define custom-xorg-config
   (xorg-configuration
@@ -34,7 +32,7 @@
 
 (define-public %cern-system
   (operating-system
-    (host-name "twilkendesktop.cern.ch")
+    (host-name "twilkenlaptop.cern.ch")
     (timezone "Europe/Zurich")
     (locale "en_GB.utf8")
     (locale-definitions
@@ -55,18 +53,7 @@
       (bootloader grub-efi-bootloader)
       (targets '("/boot/efi"))
       ;; Note: keyboard-layout is ignored by non-grub bootloaders.
-      (keyboard-layout keyboard-layout)
-      (menu-entries
-       (list
-        (menu-entry
-         (label "systemd-boot")
-         (device efi-system-partition)
-         (chain-loader "/EFI/systemd/systemd-bootx64.efi"))))))
-
-    (swap-devices
-     (list (swap-space
-            (target swap-partition)
-            (discard? #t))))
+      (keyboard-layout keyboard-layout)))
 
     (file-systems
      (cons* (file-system
@@ -219,11 +206,6 @@
                      (string-append #$(file-append util-linux "/sbin/fstrim")
                                     " --fstab --verbose"))))
 
-      (simple-service 'arm-builders hosts-service-type
-        (list (host "188.184.68.217" "arm-builder-1")
-              (host "188.184.71.187" "arm-builder-2")
-              (host "188.184.69.33" "arm-builder-3")))
-
       (service openssh-service-type
         (openssh-configuration
          (port-number 22022)