From 24dca153d4e563c905497cb6821221b1774921dc Mon Sep 17 00:00:00 2001
From: bartronx7 <bart@akeley.dev>
Date: Sat, 1 Nov 2025 15:24:34 -0500
Subject: [PATCH] reorg a bit and add x1carbon

---
 {laptop => laptops}/channels.scm              |   0
 laptops/x1carbon/system.scm                   | 122 ++++++++++++++++++
 {laptop => laptops/xps9360}/system.scm        |   0
 {server => servers}/docs_luks_notes.txt       |   0
 {server => servers/excellon}/caddy/Caddyfile  |   0
 {server => servers/excellon}/caddy/Dockerfile |   0
 {server => servers/excellon}/config.scm       |   0
 7 files changed, 122 insertions(+)
 rename {laptop => laptops}/channels.scm (100%)
 create mode 100644 laptops/x1carbon/system.scm
 rename {laptop => laptops/xps9360}/system.scm (100%)
 rename {server => servers}/docs_luks_notes.txt (100%)
 rename {server => servers/excellon}/caddy/Caddyfile (100%)
 rename {server => servers/excellon}/caddy/Dockerfile (100%)
 rename {server => servers/excellon}/config.scm (100%)

diff --git a/laptop/channels.scm b/laptops/channels.scm
similarity index 100%
rename from laptop/channels.scm
rename to laptops/channels.scm
diff --git a/laptops/x1carbon/system.scm b/laptops/x1carbon/system.scm
new file mode 100644
index 0000000..bce5a08
--- /dev/null
+++ b/laptops/x1carbon/system.scm
@@ -0,0 +1,122 @@
+;; This is an operating system configuration generated
+;; by the graphical installer.
+;;
+;; Once installation is complete, you can learn and modify
+;; this file to tweak the system configuration, and pass it
+;; to the 'guix system reconfigure' command to effect your
+;; changes.
+
+
+;; Indicate which modules to import to access the variables
+;; used in this configuration.
+(use-modules (gnu) (nongnu packages linux))
+(use-service-modules cups desktop networking ssh xorg)
+(use-package-modules shells)
+
+(operating-system
+  (kernel linux)
+  (firmware (list linux-firmware))
+  (locale "en_US.utf8")
+  (timezone "America/Chicago")
+  (keyboard-layout (keyboard-layout "us"))
+  (host-name "x1carbon")
+  
+  (swap-devices (list (swap-space (target "/swapfile"))))
+
+  ;; The list of user accounts ('root' is implicit).
+  (users
+    (cons*
+      (user-account
+        (name "bartronx7")
+        (comment "Bart")
+        (group "users")
+        (home-directory "/home/bartronx7")
+        (shell #~(string-append #$zsh "/bin/zsh"))
+        (supplementary-groups '("wheel" "netdev" "audio" "video")))
+      (user-account
+        (name "kate")
+        (comment "Kate")
+        (group "users")
+        (home-directory "/home/kate")
+        (supplementary-groups '("wheel" "netdev" "audio" "video")))
+      (user-account
+        (name "emma")
+        (comment "Emma")
+        (group "users")
+        (home-directory "/home/emma")
+        (supplementary-groups '("wheel" "netdev" "audio" "video")))
+      (user-account
+        (name "claire")
+        (comment "Claire")
+        (group "users")
+        (home-directory "/home/claire")
+        (supplementary-groups '("wheel" "netdev" "audio" "video")))
+      %base-user-accounts))
+
+  ;; Packages installed system-wide.  Users can also install packages
+  ;; under their own account: use 'guix search KEYWORD' to search
+  ;; for packages and 'guix install PACKAGE' to install a package.
+  (packages
+    (append
+      (map specification->package (list
+        "dmenu"
+        "st"
+        "firefox"
+        "libreoffice"
+        "git"
+        "curl"
+        "rust"
+        "zsh"
+        "unzip"))
+      %base-packages))
+
+  ;; Below is the list of system services.  To search for available
+  ;; services, run 'guix system search KEYWORD' in a terminal.
+  (services
+   (append
+     %desktop-services
+     (list
+       (service gnome-desktop-service-type)
+        (service bluetooth-service-type
+          (bluetooth-configuration
+            (fast-connectable? #t)
+            (auto-enable? #t)))
+        (service openssh-service-type)
+        (service tor-service-type)
+        (service cups-service-type
+          (cups-configuration
+            (web-interface? #t)))
+        (set-xorg-configuration (xorg-configuration (keyboard-layout keyboard-layout))))))
+
+  (bootloader
+    (bootloader-configuration
+      (bootloader grub-efi-bootloader)
+      (targets (list "/boot/efi"))
+      (keyboard-layout keyboard-layout)))
+
+  (mapped-devices
+    (list
+      (mapped-device
+        (source (uuid "7806a618-e7c1-4881-be00-16041bfd418f"))
+        (target "home")
+        (type luks-device-mapping))))
+
+  ;; The list of file systems that get "mounted".  The unique
+  ;; file system identifiers there ("UUIDs") can be obtained
+  ;; by running 'blkid' in a terminal.
+  (file-systems
+    (cons*
+      (file-system
+        (mount-point "/boot/efi")
+        (device (uuid "D4BC-107B" 'fat32))
+        (type "vfat"))
+      (file-system
+        (mount-point "/")
+        (device (uuid "9230ca9f-8dcd-4ad5-bd7b-96a94e6227f7"))
+        (type "btrfs"))
+      (file-system
+        (mount-point "/home")
+        (device "/dev/mapper/home")
+        (type "btrfs")
+        (dependencies mapped-devices))
+      %base-file-systems)))
diff --git a/laptop/system.scm b/laptops/xps9360/system.scm
similarity index 100%
rename from laptop/system.scm
rename to laptops/xps9360/system.scm
diff --git a/server/docs_luks_notes.txt b/servers/docs_luks_notes.txt
similarity index 100%
rename from server/docs_luks_notes.txt
rename to servers/docs_luks_notes.txt
diff --git a/server/caddy/Caddyfile b/servers/excellon/caddy/Caddyfile
similarity index 100%
rename from server/caddy/Caddyfile
rename to servers/excellon/caddy/Caddyfile
diff --git a/server/caddy/Dockerfile b/servers/excellon/caddy/Dockerfile
similarity index 100%
rename from server/caddy/Dockerfile
rename to servers/excellon/caddy/Dockerfile
diff --git a/server/config.scm b/servers/excellon/config.scm
similarity index 100%
rename from server/config.scm
rename to servers/excellon/config.scm