From 3a59b6f6e69d1fc941d1ffa5f5d4ea9ba7092dd1 Mon Sep 17 00:00:00 2001
From: Noah Metz <nmetz@metznet.ca>
Date: Sat, 17 Sep 2022 20:02:36 -0600
Subject: [PATCH] Changed otto to define-public

---
 system/clients/otto.scm | 107 ++++++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 53 deletions(-)

diff --git a/system/clients/otto.scm b/system/clients/otto.scm
index f2313f4..dbfcc5f 100644
--- a/system/clients/otto.scm
+++ b/system/clients/otto.scm
@@ -50,57 +50,58 @@
 ;      (list (service-extension shepherd-root-service-type nvidia-insmod-shepherd-service)))
 ;    (default-value '())))
 
-(operating-system
-  (inherit base-desktop-system)
-  (host-name "otto")
-  (hosts-file
-    (plain-file "hosts"
-    (string-append (local-host-aliases host-name)
-"# LAN geofff.homelab ip
-192.168.86.2 geofff.homelab\n")))
-  (kernel-arguments '("modprobe.blacklist=nouveau"))
-  (packages (append (list blueman bluez bluez-alsa pulseaudio docker python openvswitch
-                          qemu texlive firefox pavucontrol mupdf gcc-toolchain gnu-make
-                          gcc-arm-none-eabi-7-2018-q2-update sane-backends-minimal xsane
-                          cups xf86-video-nv xf86-input-libinput vulkan-loader vulkan-tools
-                          (list isc-bind "utils")) %my-desktop-packages))
-  (services (append (list
-                      (simple-service 'blueman dbus-root-service-type (list blueman))
-                      (bluetooth-service #:auto-enable? #t)
-                      (service docker-service-type)
-                      (service openvswitch-service-type)
-                      (set-xorg-configuration
-                        (xorg-configuration
-                          (keyboard-layout %default-keyboard-layout)))
-                      (service sane-service-type)
-                      (service cups-service-type
-                               (cups-configuration
-                                 (web-interface? #t))))
-                    (modify-services %my-desktop-services
-                      (udev-service-type config =>
-                                         (udev-configuration (inherit config)
-                                                             (rules (append (list
-                                                                              %usb-udev-rule)
-                                                                      (udev-configuration-rules config))))))))
-  (users (cons* (user-account
-                  (name "nmetz")
-                  (comment "Noah Metz")
-                  (group "users")
-                  (home-directory "/home/nmetz")
-                  (shell (file-append zsh "/bin/zsh"))
-                  (supplementary-groups
-                    `("wheel" "netdev" "audio" "video" "usb" "kvm" "lp" "docker")))
-                %my-base-user-accounts))
-  (file-systems
-    (cons* (file-system
-             (mount-point "/boot/efi")
-             (device (uuid "6E88-FE62" 'fat32))
-             (type "vfat"))
-           (file-system
-             (mount-point "/")
-             (device
-               (uuid "ba93a043-9e58-466f-b90f-bf2a6bbf91fe"
-                     'ext4))
-             (type "ext4"))
-           %base-file-systems)))
+(define-public otto-operating-system
+  (operating-system
+    (inherit base-desktop-system)
+    (host-name "otto")
+    (hosts-file
+      (plain-file "hosts"
+      (string-append (local-host-aliases host-name)
+  "# LAN geofff.homelab ip
+  192.168.86.2 geofff.homelab\n")))
+    (kernel-arguments '("modprobe.blacklist=nouveau"))
+    (packages (append (list blueman bluez bluez-alsa pulseaudio docker python openvswitch
+                            qemu texlive firefox pavucontrol mupdf gcc-toolchain gnu-make
+                            gcc-arm-none-eabi-7-2018-q2-update sane-backends-minimal xsane
+                            cups xf86-video-nv xf86-input-libinput vulkan-loader vulkan-tools
+                            (list isc-bind "utils")) %my-desktop-packages))
+    (services (append (list
+                        (simple-service 'blueman dbus-root-service-type (list blueman))
+                        (bluetooth-service #:auto-enable? #t)
+                        (service docker-service-type)
+                        (service openvswitch-service-type)
+                        (set-xorg-configuration
+                          (xorg-configuration
+                            (keyboard-layout %default-keyboard-layout)))
+                        (service sane-service-type)
+                        (service cups-service-type
+                                 (cups-configuration
+                                   (web-interface? #t))))
+                      (modify-services %my-desktop-services
+                        (udev-service-type config =>
+                                           (udev-configuration (inherit config)
+                                                               (rules (append (list
+                                                                                %usb-udev-rule)
+                                                                        (udev-configuration-rules config))))))))
+    (users (cons* (user-account
+                    (name "nmetz")
+                    (comment "Noah Metz")
+                    (group "users")
+                    (home-directory "/home/nmetz")
+                    (shell (file-append zsh "/bin/zsh"))
+                    (supplementary-groups
+                      `("wheel" "netdev" "audio" "video" "usb" "kvm" "lp" "docker")))
+                  %my-base-user-accounts))
+    (file-systems
+      (cons* (file-system
+               (mount-point "/boot/efi")
+               (device (uuid "6E88-FE62" 'fat32))
+               (type "vfat"))
+             (file-system
+               (mount-point "/")
+               (device
+                 (uuid "ba93a043-9e58-466f-b90f-bf2a6bbf91fe"
+                       'ext4))
+               (type "ext4"))
+             %base-file-systems))))