migrate rose to modular services config including pam-mount
This commit is contained in:
parent
36a7940de5
commit
8f13dfa066
|
|
@ -0,0 +1,6 @@
|
|||
(public-key
|
||||
(ecc
|
||||
(curve Ed25519)
|
||||
(q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)
|
||||
)
|
||||
)
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
(use-modules (gnu)
|
||||
(gnu services desktop)
|
||||
(gnu system))
|
||||
(use-modules (nongnu packages linux)
|
||||
(nongnu system linux-initrd))
|
||||
|
|
@ -10,32 +11,17 @@
|
|||
(inherit os)
|
||||
(host-name "rose")
|
||||
(services
|
||||
(modify-services
|
||||
(xfce-desktop-services os)
|
||||
(guix-service-type config =>
|
||||
(guix-configuration
|
||||
(inherit config)
|
||||
(substitute-urls
|
||||
(cons* "https://substitutes.nonguix.org"
|
||||
%default-substitute-urls))
|
||||
(authorized-keys
|
||||
(cons* (local-file "./nonguix.key.pub")
|
||||
%default-authorized-guix-keys))))))
|
||||
(append
|
||||
(list (pam-mount
|
||||
"kook"
|
||||
"/dev/disk/by-uuid/c896e07f-d2ed-4390-8ce0-b82080d1bdc2"))
|
||||
(desktop-environment (operating-system-keyboard-layout os))
|
||||
(nonguix %desktop-services)))
|
||||
(kernel linux)
|
||||
(initrd microcode-initrd)
|
||||
(firmware (list linux-firmware))
|
||||
(mapped-devices
|
||||
(list (mapped-device
|
||||
(source (uuid "c896e07f-d2ed-4390-8ce0-b82080d1bdc2"))
|
||||
(target "HOME")
|
||||
(type luks-device-mapping))))
|
||||
(file-systems
|
||||
(cons* (file-system
|
||||
(mount-point "/home")
|
||||
(device (uuid "73dc31f8-844d-4a87-bf54-4fb86a49469c" 'ext4))
|
||||
(type "ext4")
|
||||
(dependencies mapped-devices))
|
||||
(file-system
|
||||
(mount-point "/boot/efi")
|
||||
(device (uuid "545B-970F" 'fat32))
|
||||
(type "vfat"))
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@
|
|||
((gnu packages file-systems) #:select (davfs2))
|
||||
((gnu packages ibus) #:select (ibus ibus-anthy))
|
||||
((gnu packages wm) #:select (i3-wm))
|
||||
((gnu services desktop) #:select (xfce-desktop-service-type %desktop-services))
|
||||
((gnu services desktop) #:select (xfce-desktop-service-type))
|
||||
((gnu services pam-mount) #:select (pam-mount-service-type pam-mount-configuration))
|
||||
((gnu services xorg) #:select (set-xorg-configuration xorg-configuration))
|
||||
(gnu system)
|
||||
(rnrs io ports))
|
||||
|
|
@ -15,19 +16,6 @@
|
|||
(define %utils
|
||||
(list anthy davfs2 gvfs i3-wm ibus ibus-anthy nss-certs))
|
||||
|
||||
(define (read-file file-path)
|
||||
(get-string-all (open-input-file file-path)))
|
||||
|
||||
(define (xfce-desktop-services os)
|
||||
(append
|
||||
(list
|
||||
(service xfce-desktop-service-type)
|
||||
(set-xorg-configuration
|
||||
(xorg-configuration
|
||||
(keyboard-layout (operating-system-keyboard-layout os))
|
||||
(extra-config (list (read-file "touchpad.conf"))))))
|
||||
%desktop-services))
|
||||
|
||||
(define (install-to root-fs)
|
||||
(operating-system
|
||||
(locale "fr_FR.utf8")
|
||||
|
|
@ -55,3 +43,44 @@
|
|||
(device root-fs)
|
||||
(type "ext4"))
|
||||
%base-file-systems))))
|
||||
|
||||
(define (pam-mount userName device)
|
||||
(service pam-mount-service-type
|
||||
(pam-mount-configuration
|
||||
(rules `((debug (@ (enable "0")))
|
||||
(volume (@ (user ,userName)
|
||||
(fstype "crypt")
|
||||
(path ,device)
|
||||
(mountpoint "/home/")))
|
||||
(mntoptions (@ (allow ,(string-join
|
||||
'("nosuid" "nodev" "loop"
|
||||
"encryption" "fsck" "nonempty"
|
||||
"allow_root" "allow_other")
|
||||
","))))
|
||||
(mntoptions (@ (require "nosuid,nodev")))
|
||||
(logout (@ (wait "0")
|
||||
(hup "0")
|
||||
(term "no")
|
||||
(kill "no")))
|
||||
(mkmountpoint (@ (enable "1")
|
||||
(remove "false"))))))))
|
||||
|
||||
(define (desktop-environment keyboard-layout)
|
||||
(list
|
||||
(service xfce-desktop-service-type)
|
||||
(set-xorg-configuration
|
||||
(xorg-configuration (keyboard-layout keyboard-layout)))))
|
||||
|
||||
(define nonguix
|
||||
(lambda (services)
|
||||
(modify-services services
|
||||
(guix-service-type
|
||||
config =>
|
||||
(guix-configuration
|
||||
(inherit config)
|
||||
(substitute-urls
|
||||
(append (list "https://substitutes.nonguix.org")
|
||||
%default-substitute-urls))
|
||||
(authorized-keys
|
||||
(append (list (local-file "./nonguix.signing-key.scm"))
|
||||
%default-authorized-guix-keys)))))))
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
Section "InputClass"
|
||||
Identifier "touchpad overrides"
|
||||
# This makes this snippet apply to any device with the "synaptics" driver
|
||||
# assigned
|
||||
MatchDriver "synaptics"
|
||||
|
||||
####################################
|
||||
## The lines that you need to add ##
|
||||
# Enable left mouse button by tapping
|
||||
Option "TapButton1" "1"
|
||||
EndSection
|
||||
Loading…
Reference in New Issue