From e2dc072afea1717aa8c7ae1eb43046f3fb93d1ea Mon Sep 17 00:00:00 2001
From: "Christopher R. Nelson" <christopher.nelson@languidnights.com>
Date: Mon, 19 Jan 2026 09:54:21 -0500
Subject: fix missed import in desktop, move systems

---
 crn/gemini.scm         | 27 +++++++++++++++++++++++++++
 crn/guix/gemini.scm    | 27 ---------------------------
 crn/guix/sputnik.scm   | 35 -----------------------------------
 crn/sputnik.scm        | 35 +++++++++++++++++++++++++++++++++++
 crn/system/desktop.scm |  2 +-
 5 files changed, 63 insertions(+), 63 deletions(-)
 create mode 100644 crn/gemini.scm
 delete mode 100644 crn/guix/gemini.scm
 delete mode 100644 crn/guix/sputnik.scm
 create mode 100644 crn/sputnik.scm

diff --git a/crn/gemini.scm b/crn/gemini.scm
new file mode 100644
index 0000000..263f2e1
--- /dev/null
+++ b/crn/gemini.scm
@@ -0,0 +1,27 @@
+(define-module (gemini))
+
+(use-modules (system base)
+             (system desktop)
+             (gnu system)
+             (gnu services))
+
+(let ((os (make-system #:use-nonguix? #t
+                       #:host-name "gemini"
+                       #:timezone "America/Kentucky/Louisville"
+                       #:user-login "christopher"
+                       #:user-fullname "Christopher R. Nelson"
+
+                       #:swap-device (make-swap '("/dev/nvme0n1p2"))
+                       #:root-device (make-fs "/" "/dev/nvme0n1p3" "btrfs")
+                       #:efi-device (make-fs "/boot/efi" "/dev/nvme0n1p1" "vfat")
+
+                       #:packages '()
+                       #:role 'desktop)))
+  (operating-system
+   (inherit os)
+   (services (append
+              (operating-system-user-services os)
+              desktop-services))
+   (packages (append
+              %base-packages
+              desktop-packages))))
diff --git a/crn/guix/gemini.scm b/crn/guix/gemini.scm
deleted file mode 100644
index da5f68d..0000000
--- a/crn/guix/gemini.scm
+++ /dev/null
@@ -1,27 +0,0 @@
-(define-module (guix gemini))
-
-(use-modules (system base)
-             (system desktop)
-             (gnu system)
-             (gnu services))
-
-(let ((os (make-system #:use-nonguix? #t
-                       #:host-name "gemini"
-                       #:timezone "America/Kentucky/Louisville"
-                       #:user-login "christopher"
-                       #:user-fullname "Christopher R. Nelson"
-
-                       #:swap-device (make-swap '("/dev/nvme0n1p2"))
-                       #:root-device (make-fs "/" "/dev/nvme0n1p3" "btrfs")
-                       #:efi-device (make-fs "/boot/efi" "/dev/nvme0n1p1" "vfat")
-
-                       #:packages '()
-                       #:role 'desktop)))
-  (operating-system
-   (inherit os)
-   (services (append
-              (operating-system-user-services os)
-              desktop-services))
-   (packages (append
-              %base-packages
-              desktop-packages))))
diff --git a/crn/guix/sputnik.scm b/crn/guix/sputnik.scm
deleted file mode 100644
index fd691fc..0000000
--- a/crn/guix/sputnik.scm
+++ /dev/null
@@ -1,35 +0,0 @@
-(define-module (guix sputnik))
-
-(use-modules (system base)
-             (system develop)
-             (system nvidia)
-             (gnu system)
-             (gnu services))
-
-(let ((os (make-system #:use-nonguix? #t
-                       #:host-name "sputnik"
-                       #:timezone "America/Kentucky/Louisville"
-                       #:user-login "christopher"
-                       #:user-fullname "Christopher R. Nelson"
-
-                       #:swap-device (make-swap '("/dev/nvme0n1p2"))
-                       #:root-device (make-fs "/" "/dev/nvme0n1p3" "btrfs")
-                       #:efi-device (make-fs "/boot/efi" "/dev/nvme0n1p1" "vfat")
-
-                       #:packages '()
-                       #:role 'nvidia-server)))
-  (operating-system
-   (inherit os)
-
-   (kernel-arguments nvidia-kernel-arguments)
-   (services (append
-              (operating-system-user-services os)
-              nvidia-services
-              develop-services))
-   (packages (append
-              %base-packages
-              nvidia-packages
-              develop-packages))
-   (file-systems (append
-                  (list (make-fs "/genai" "/dev/nvme1n1p1" "btrfs"))
-                  (operating-system-file-systems os)))))
diff --git a/crn/sputnik.scm b/crn/sputnik.scm
new file mode 100644
index 0000000..915f06e
--- /dev/null
+++ b/crn/sputnik.scm
@@ -0,0 +1,35 @@
+(define-module (sputnik))
+
+(use-modules (system base)
+             (system develop)
+             (system nvidia)
+             (gnu system)
+             (gnu services))
+
+(let ((os (make-system #:use-nonguix? #t
+                       #:host-name "sputnik"
+                       #:timezone "America/Kentucky/Louisville"
+                       #:user-login "christopher"
+                       #:user-fullname "Christopher R. Nelson"
+
+                       #:swap-device (make-swap '("/dev/nvme0n1p2"))
+                       #:root-device (make-fs "/" "/dev/nvme0n1p3" "btrfs")
+                       #:efi-device (make-fs "/boot/efi" "/dev/nvme0n1p1" "vfat")
+
+                       #:packages '()
+                       #:role 'nvidia-server)))
+  (operating-system
+   (inherit os)
+
+   (kernel-arguments nvidia-kernel-arguments)
+   (services (append
+              (operating-system-user-services os)
+              nvidia-services
+              develop-services))
+   (packages (append
+              %base-packages
+              nvidia-packages
+              develop-packages))
+   (file-systems (append
+                  (list (make-fs "/genai" "/dev/nvme1n1p1" "btrfs"))
+                  (operating-system-file-systems os)))))
diff --git a/crn/system/desktop.scm b/crn/system/desktop.scm
index 234389c..919e4b6 100644
--- a/crn/system/desktop.scm
+++ b/crn/system/desktop.scm
@@ -7,7 +7,7 @@
              (gnu system)
              (gnu services))
 (use-package-modules wm)
-(use-service-modules avahi desktop networking nfs xorg)
+(use-service-modules avahi cups desktop networking nfs xorg)
 
 (define desktop-services
   (list
-- 
cgit v1.2.3