Adapt config to pine

This commit is contained in:
Tissevert 2023-02-15 23:11:22 +01:00
parent 8f13dfa066
commit 3c0d21d4dd
5 changed files with 38 additions and 19 deletions

1
files/authorized_keys Normal file
View File

@ -0,0 +1 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGOChJhdXFjPLFb218mVPSD9IsL7kyHqFdh/u2qcyJsjc5hFNPdnTvHHjQhsX33PaA5IfKM830AziWX/pwnePQQHR1nfw8knEpQaCNPmmHLQkepTeHlXKdSIXrv5fa9I27AWH+8NtAtJIY1F8jbEAGWXF8F6p8vZLybEljsmVOygWrkQmKtmYn/aOo+R7DlX4SnBfXmqWkzoilgI9FmNfaomv6FeU9VVQtemO4XPz/PMIYYvUNCJ2zaVbjNBmA6ZhHmZf3XlK4swnMW49Py2HboKs/MXLPpfwfU+KlLXYUs2wAtL+UFK/6/IUcIpaFdfTid183KQ07jf+uxtpUTEVT kook@burra

View File

@ -23,6 +23,7 @@
(gnu packages vim) (gnu packages vim)
(gnu packages virtualization) (gnu packages virtualization)
(gnu packages wm) (gnu packages wm)
(gnu packages web)
(gnu packages xfce) (gnu packages xfce)
(gnu packages xorg) (gnu packages xorg)
(loom packages eyecandy)) (loom packages eyecandy))
@ -56,7 +57,8 @@
(list (list
gcc-toolchain gcc-toolchain
ghc ghc
git)) git
jq))
(define %web (define %web
(list (list

View File

@ -1,30 +1,36 @@
(use-modules (gnu) (use-modules (gnu)
(gnu services desktop)
(gnu services ssh)
(gnu system)) (gnu system))
(use-modules (nongnu packages linux) (use-modules (nongnu packages linux)
(nongnu system linux-initrd)) (nongnu system linux-initrd))
(load "system.common.scm") (load "system.scm")
(let ((os (install-to (uuid "???" 'ext4)))) (let ((os (install-to (uuid "a942a6ac-012a-46c5-984e-5f53532a3253" 'ext4))))
(operating-system (operating-system
(inherit os) (inherit os)
(host-name "pine") (host-name "pine")
(services (services
(modify-services (append
(xfce-desktop-services os))) (list
(pam-mount "kook" "/dev/md0")
pam-audio
(ssh-only `(("kook" ,(local-file "files/authorized_keys")))))
(desktop-environment (operating-system-keyboard-layout os))
(nonguix %desktop-services)))
(kernel linux)
(initrd microcode-initrd)
(firmware (list linux-firmware))
(mapped-devices (mapped-devices
(list (mapped-device (list (mapped-device
(source (uuid "???")) (source (list "/dev/sdb" "/dev/sdc"))
(target "HOME") (target "/dev/md0")
(type luks-device-mapping)))) (type raid-device-mapping))
))
(file-systems (file-systems
(cons* (file-system (cons* (file-system
(mount-point "/home")
(device (uuid "???" 'ext4))
(type "ext4")
(dependencies mapped-devices))
(file-system
(mount-point "/boot/efi") (mount-point "/boot/efi")
(device (uuid "???" 'fat32)) (device (uuid "7974-61F4" 'fat32))
(type "vfat")) (type "vfat"))
(operating-system-file-systems os))))) (operating-system-file-systems os)))))

View File

@ -4,7 +4,7 @@
(use-modules (nongnu packages linux) (use-modules (nongnu packages linux)
(nongnu system linux-initrd)) (nongnu system linux-initrd))
(load "system.common.scm") (load "system.scm")
(let ((os (install-to (uuid "60c115b5-08f2-435b-95e5-d3b81ffba4f4" 'ext4)))) (let ((os (install-to (uuid "60c115b5-08f2-435b-95e5-d3b81ffba4f4" 'ext4))))
(operating-system (operating-system

View File

@ -8,10 +8,7 @@
((gnu services desktop) #:select (xfce-desktop-service-type)) ((gnu services desktop) #:select (xfce-desktop-service-type))
((gnu services pam-mount) #:select (pam-mount-service-type pam-mount-configuration)) ((gnu services pam-mount) #:select (pam-mount-service-type pam-mount-configuration))
((gnu services xorg) #:select (set-xorg-configuration xorg-configuration)) ((gnu services xorg) #:select (set-xorg-configuration xorg-configuration))
(gnu system) (gnu system))
(rnrs io ports))
(use-modules (nongnu packages linux)
(nongnu system linux-initrd))
(define %utils (define %utils
(list anthy davfs2 gvfs i3-wm ibus ibus-anthy nss-certs)) (list anthy davfs2 gvfs i3-wm ibus ibus-anthy nss-certs))
@ -44,6 +41,12 @@
(type "ext4")) (type "ext4"))
%base-file-systems)))) %base-file-systems))))
(define pam-audio
(pam-limits-service
(list
(pam-limits-entry "@audio" 'both 'rtprio 99)
(pam-limits-entry "@audio" 'both 'memlock 'unlimited))))
(define (pam-mount userName device) (define (pam-mount userName device)
(service pam-mount-service-type (service pam-mount-service-type
(pam-mount-configuration (pam-mount-configuration
@ -71,6 +74,13 @@
(set-xorg-configuration (set-xorg-configuration
(xorg-configuration (keyboard-layout keyboard-layout))))) (xorg-configuration (keyboard-layout keyboard-layout)))))
(define (ssh-only authorized-keys)
(service openssh-service-type
(openssh-configuration
(password-authentication? #f)
(permit-root-login #f)
(authorized-keys authorized-keys))))
(define nonguix (define nonguix
(lambda (services) (lambda (services)
(modify-services services (modify-services services