convert to proper module

1 files changed, 26 insertions, 14 deletions

diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index ce4b5ab..cdb28fd 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -1,16 +1,27 @@
-(use-modules (gnu) (nongnu packages linux))
-(use-modules (gnu system setuid))
-(use-modules (gnu packages admin))
-(use-modules (guix packages))
-(use-modules (gnu packages shells))
-(use-modules (guix build-system trivial))
-(use-modules (guix licenses))
-(use-modules (gnu packages tls))
-(use-modules (srfi srfi-1))
-(use-modules (ryan-packages freedesktop))
-(use-modules (ryan-packages wm))
-(use-package-modules security-token)
-(use-service-modules cups desktop networking xorg ssh nix sound security-token docker virtualization)
+(define-module (ryan-config base-system)
+                #:use-module (gnu)
+                #:use-module (nongnu packages linux)
+                #:use-module (gnu system setuid)
+                #:use-module (gnu packages admin)
+                #:use-module (guix packages)
+                #:use-module (gnu packages shells)
+                #:use-module (guix build-system trivial)
+                #:use-module (guix licenses)
+                #:use-module (gnu packages tls)
+                #:use-module (srfi srfi-1)
+                #:use-module (ryan-packages freedesktop)
+                #:use-module (ryan-packages wm)
+                #:use-module (gnu packages security-token)
+                #:use-module (gnu services security-token)
+                #:use-module (gnu services cups)
+                #:use-module (gnu services desktop)
+                #:use-module (gnu services networking)
+                #:use-module (gnu services xorg)
+                #:use-module (gnu services ssh)
+                #:use-module (gnu services nix)
+                #:use-module (gnu services sound)
+                #:use-module (gnu services docker)
+                #:use-module (gnu services virtualization))
 
 ; Define package that installs my root ca public keys
 (define my-ca-certs
@@ -70,6 +81,7 @@
                    "ACTION==\"add\", SUBSYSTEM==\"backlight\", "
                     "RUN+=\"/run/current-system/profile/bin/chmod g+w /sys/class/backlight/%k/brightness\"")))
 
+(define-public base-operating-system
 (operating-system
   (kernel linux)
   (firmware (list linux-firmware))
@@ -183,4 +195,4 @@
   (bootloader (bootloader-configuration
                 (bootloader grub-efi-bootloader)
                 (targets (list "/boot/efi"))
-                (keyboard-layout keyboard-layout))))))))
+                (keyboard-layout keyboard-layout)))))))))