Okay fine ill do it the way that works

Signed-off-by: Skylar "The Cobra" Widulski <cobra@vern.cc>
This commit is contained in:
Skylar "The Cobra" Widulski 2023-06-05 01:21:31 -04:00
parent 6dea4defb7
commit e20cc0b9d6
Signed by: cobra
GPG Key ID: 4FD8F812083FF6F9
2 changed files with 21 additions and 28 deletions

View File

@ -7,9 +7,7 @@
#:use-module (guix gexp)
#:use-module (cobra packages)
#:use-module (cobra lists)
#:export (%thinkpad
%devmap:fde
%devmap:matrix))
#:export (%thinkpad))
(define sudoers
(plain-file "sudoers" "\
@ -19,17 +17,6 @@ Cmnd_Alias WITHOUTPW = /home/cobra/.local/bin/__suspend, /home/cobra/.local/bin/
Defaults!WITHOUTPW !authenticate
"))
(define %devmap:fde
(mapped-device
(source (uuid "ffffffff-ffff-ffff-ffff-ffffffffffff"))
(target "fde")
(type luks-device-mapping)))
(define %devmap:matrix
(mapped-device
(source "matrix")
(targets (list "matrix-rootvol"))
(type lvm-device-mapping)))
(define %thinkpad
(operating-system
(kernel linux-libre)
@ -47,7 +34,7 @@ Defaults!WITHOUTPW !authenticate
(host-name "Noble-Gas")
(mapped-devices (list
(mapped-device
(source (uuid "ffffffff-ffff-ffff-ffff-ffffffffffff"))
(source (uuid "00000000-0000-0000-0000-000000000000"))
(target "fde")
(type luks-device-mapping))
(mapped-device
@ -63,7 +50,7 @@ Defaults!WITHOUTPW !authenticate
(options "space_cache=v2")
(needed-for-boot? #t)
(dependencies mapped-devices)))
%base-file-systems))
%base-file-systems))
(users (append (list
(user-account
(name "cobra")
@ -87,12 +74,3 @@ Defaults!WITHOUTPW !authenticate
(name-service-switch %mdns-host-lookup-nss)
(services service-list)
(sudoers-file sudoers)))
(define %thinkpad:t60
(operating-system
(inherit %thinkpad)
(host-name "Neon")
(mapped-devices (list
(mapped-device (inherit %devmap:fde)
(source (uuid "72cd3842-a6e5-4fb5-b994-1ce11d2d0a16")))
%devmap:matrix))))

View File

@ -5,6 +5,21 @@
(inherit %thinkpad)
(host-name "Oganesson")
(mapped-devices (list
(mapped-device (inherit %devmap:fde)
(source (uuid "e836ef6e-97a8-442b-a025-e81ab58bbc04")))
%devmap:matrix)))
(mapped-device
(source (uuid "e836ef6e-97a8-442b-a025-e81ab58bbc04"))
(target "fde")
(type luks-device-mapping))
(mapped-device
(source "matrix")
(targets (list "matrix-rootvol"))
(type lvm-device-mapping))))
(file-systems (append (list
(file-system
(type "btrfs")
(mount-point "/")
(device (file-system-label "root"))
(flags '(no-atime))
(options "space_cache=v2")
(needed-for-boot? #t)
(dependencies mapped-devices)))
%base-file-systems)))