diff options
Diffstat (limited to 'tw/system')
| -rw-r--r-- | tw/system/cern.scm | 31 | ||||
| -rw-r--r-- | tw/system/lap.scm | 33 |
2 files changed, 31 insertions, 33 deletions
diff --git a/tw/system/cern.scm b/tw/system/cern.scm index 508a7691..7ca6eab2 100644 --- a/tw/system/cern.scm +++ b/tw/system/cern.scm @@ -95,22 +95,21 @@ %base-user-accounts)) (sudoers-file - (plain-file - "sudoers" - (string-append - ;; We need to preserve $TERMINFO so that programs under sudo can - ;; find kitty's terminfo files. This is possibly unsafe; sudo - ;; explicitly deletes this variable by default. - "Defaults env_keep += \"TERMINFO\"\n" - (plain-file-content %sudoers-specification) - ;; In addition to the default rules, allow admins to power off - ;; the computer. They'll have to use the system binaries, not - ;; those from their user profile, as /etc/sudoers requires - ;; absolute paths to commands. - "%wheel ALL=(ALL) NOPASSWD: " - "/run/current-system/profile/sbin/halt, " - "/run/current-system/profile/sbin/reboot, " - "/run/current-system/profile/sbin/shutdown\n"))) + (plain-file "sudoers" + (string-append + ;; We need to preserve $TERMINFO so that programs under sudo can + ;; find kitty's terminfo files. This is possibly unsafe; sudo + ;; explicitly deletes this variable by default. + "Defaults env_keep += \"TERMINFO\"\n" + (plain-file-content %sudoers-specification) + ;; In addition to the default rules, allow admins to power off + ;; the computer. They'll have to use the system binaries, not + ;; those from their user profile, as /etc/sudoers requires + ;; absolute paths to commands. + "%wheel ALL=(ALL) NOPASSWD: " + "/run/current-system/profile/sbin/halt, " + "/run/current-system/profile/sbin/reboot, " + "/run/current-system/profile/sbin/shutdown\n"))) ;; This is where we specify system-wide packages. (packages diff --git a/tw/system/lap.scm b/tw/system/lap.scm index e9df3abf..1bcc0d78 100644 --- a/tw/system/lap.scm +++ b/tw/system/lap.scm @@ -222,22 +222,21 @@ support extra features (acr, pmu, gr).") %base-user-accounts)) (sudoers-file - (plain-file - "sudoers" - (string-append - ;; We need to preserve $TERMINFO so that programs under sudo can - ;; find kitty's terminfo files. This is possibly unsafe; sudo - ;; explicitly deletes this variable by default. - "Defaults env_keep += \"TERMINFO\"\n" - (plain-file-content %sudoers-specification) - ;; In addition to the default rules, allow admins to power off - ;; the computer. They'll have to use the system binaries, not - ;; those from their user profile, as /etc/sudoers requires - ;; absolute paths to commands. - "%wheel ALL=(ALL) NOPASSWD: " - "/run/current-system/profile/sbin/halt, " - "/run/current-system/profile/sbin/reboot, " - "/run/current-system/profile/sbin/shutdown\n"))) + (plain-file "sudoers" + (string-append + ;; We need to preserve $TERMINFO so that programs under sudo can + ;; find kitty's terminfo files. This is possibly unsafe; sudo + ;; explicitly deletes this variable by default. + "Defaults env_keep += \"TERMINFO\"\n" + (plain-file-content %sudoers-specification) + ;; In addition to the default rules, allow admins to power off + ;; the computer. They'll have to use the system binaries, not + ;; those from their user profile, as /etc/sudoers requires + ;; absolute paths to commands. + "%wheel ALL=(ALL) NOPASSWD: " + "/run/current-system/profile/sbin/halt, " + "/run/current-system/profile/sbin/reboot, " + "/run/current-system/profile/sbin/shutdown\n"))) ;; This is where we specify system-wide packages. (packages @@ -366,7 +365,7 @@ support extra features (acr, pmu, gr).") " --fstab --verbose")))) (extra-special-file "/etc/NetworkManager/dispatcher.d/09-set-timezone" - (program-file "set-timezone" set-timezone-script)) + (program-file "set-timezone" set-timezone-script)) (modify-services (append %system-channel-services %desktop-services) (gdm-service-type |