diff options
| author | Timo Wilken | 2023-04-21 14:23:10 +0200 |
|---|---|---|
| committer | Timo Wilken | 2023-04-21 14:31:01 +0200 |
| commit | 043d2da63b10bddafa9aa7c4855dd01dac76c216 (patch) | |
| tree | 0a94ce4341999e700e96798578596fc6f6f6aa0f /tw/system | |
| parent | 37569e2c619942c36b0910a5833abb4f765c1464 (diff) | |
| parent | 234c026bc56207a5e2376cfd7b7fe41d9edd67a3 (diff) | |
Merge diverged work and home branches
This took some work, particularly when re-merging the diverged OpenSSH configs
and duplicate home services between lap.scm/home.scm and cern.scm.
Diffstat (limited to 'tw/system')
| -rw-r--r-- | tw/system/lap.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tw/system/lap.scm b/tw/system/lap.scm index efbe19f7..9a1b8571 100644 --- a/tw/system/lap.scm +++ b/tw/system/lap.scm @@ -291,7 +291,7 @@ support extra features (acr, pmu, gr).") (extensions (list cups-filters foomatic-filters brlaser)))) - (bluetooth-service) + (service bluetooth-service-type) (service tw-wireguard-service-type (tw-wireguard-configuration @@ -324,7 +324,9 @@ support extra features (acr, pmu, gr).") ;; (service fprintd-service-type) ;; Install i3lock as a setuid binary, so it can talk to PAM. - (screen-locker-service i3lock "i3lock") + (service screen-locker-service-type + (screen-locker-configuration + "i3lock" (file-append i3lock "/bin/i3lock") #f)) ;; gnome-keyring is not in `%desktop-services' by default, ;; but needs to be there to add itself to /etc/pam.d/. |