-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
148 additions
and
138 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,6 @@ | ||
(load "../operating-system.scm") ; Cannot use modules with add-to-load-path because (current-filename) is #f under guix system reconfigure. | ||
|
||
(operating-system | ||
(inherit (load "../os.scm"))) | ||
(inherit %operating-system) | ||
;; ... | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,143 @@ | ||
(add-to-load-path (dirname (current-filename))) | ||
(use-modules (services startx) | ||
(gnu) | ||
(gnu bootloader) | ||
(gnu system) | ||
(gnu system nss) | ||
(gnu system keyboard) | ||
(gnu services) | ||
(gnu services networking) | ||
(gnu packages admin) | ||
(gnu packages certs) | ||
(gnu packages xorg) | ||
;; (gnu packages android) | ||
(gnu services xorg) | ||
(gnu packages disk) | ||
(gnu system setuid) | ||
(guix utils) | ||
(guix gexp) | ||
(guix packages) | ||
(ice-9 textual-ports) | ||
(ice-9 pretty-print) | ||
(rnrs io ports) | ||
(srfi srfi-1)) | ||
|
||
(define %operating-system | ||
(operating-system | ||
(host-name "guix") | ||
;; TODO Parse options from (file-append tzdata "/share/zoneinfo/zone.tab") using zonetab->timezones from (gnu installer timezone): | ||
(timezone (let ((current (call-with-port (open-input-file "/etc/timezone") | ||
(lambda (tz) (get-line tz)))) | ||
(stdout (standard-output-port))) ; In case (current-output-port) has been set to something different. | ||
(put-string stdout (string-append "Timezone" | ||
(if (string-null? current) | ||
": " | ||
(string-append " [default " current "]: ")))) | ||
(flush-output-port stdout) | ||
(let ((new (get-line (standard-input-port)))) | ||
(if (string-null? new) current new)))) | ||
(locale "en_US.utf8") | ||
(keyboard-layout (keyboard-layout "us" #:options '("altwin:ctrl_alt_win" | ||
"ctrl:rctrl_ralt" | ||
"caps:menu" | ||
"numpad:mac"))) | ||
(bootloader (bootloader-configuration | ||
(bootloader grub-bootloader) | ||
(targets '("/dev/sda")) | ||
(keyboard-layout keyboard-layout) | ||
(timeout 0))) | ||
(kernel-arguments '("modprobe.blacklist=pcspkr,snd_pcsp" | ||
"mem_sleep_default=deep" | ||
"quiet")) | ||
(file-systems (cons* (file-system | ||
(device (file-system-label "guix")) | ||
(mount-point "/") | ||
(type "btrfs")) | ||
%base-file-systems)) | ||
(swap-devices (list (swap-space | ||
(target (file-system-label "swap"))))) | ||
(users (cons* (user-account | ||
(name "user") | ||
(comment "User") | ||
(group "users") | ||
;; Adding the account to the "wheel" group | ||
;; makes it a sudoer. Adding it to "audio" | ||
;; and "video" allows the user to play sound | ||
;; and access the webcam. | ||
(supplementary-groups '("wheel" | ||
"netdev" | ||
"audio" | ||
"power" | ||
"backlight" | ||
"video" | ||
;; "adbusers" | ||
"input"))) | ||
%base-user-accounts)) | ||
(groups (cons* (user-group | ||
(name "power") | ||
(system? #t)) | ||
%base-groups)) | ||
(packages (cons* wpa-supplicant-minimal | ||
nss-certs | ||
%base-packages)) | ||
(setuid-programs | ||
(cons* (setuid-program | ||
(program (file-append udevil "/bin/udevil"))) | ||
%setuid-programs)) | ||
(sudoers-file (plain-file "sudoers" "\ | ||
root ALL=(ALL) ALL | ||
%wheel ALL=(ALL) ALL | ||
%power ALL=(ALL) NOPASSWD: /run/current-system/profile/sbin/halt,/run/current-system/profile/sbin/shutdown,/run/current-system/profile/sbin/reboot\n")) | ||
(services (cons* (service startx-service-type | ||
(xorg-configuration | ||
(keyboard-layout keyboard-layout) | ||
(server (package | ||
(inherit xorg-server) | ||
(name "xorg-server-no-dbus") | ||
(arguments | ||
(substitute-keyword-arguments | ||
(package-arguments xorg-server) | ||
((#:configure-flags flags) | ||
`(cons* "--disable-systemd-logind" ,flags)))))) | ||
(server-arguments '("-nolisten" "tcp" | ||
"-noreset")) | ||
(extra-config (list " | ||
Section \"InputClass\" | ||
Identifier \"touchpad\" | ||
Driver \"Synaptics\" | ||
MatchIsTouchpad \"on\" | ||
Option \"HorizTwoFingerScroll\" \"on\" | ||
Option \"VertScrollDelta\" \"-75\" | ||
Option \"HorizScrollDelta\" \"35\" | ||
Option \"RightButtonAreaLeft\" \"0\" | ||
Option \"RightButtonAreaTop\" \"0\" | ||
EndSection | ||
")))) | ||
(simple-service 'suspend-permission activation-service-type | ||
#~(begin | ||
(chown "/sys/power/state" 0 (group:gid (getgrnam "power"))) | ||
(chmod "/sys/power/state" #o664))) | ||
(udev-rules-service 'backlight-permission | ||
(file->udev-rule "backlight.rules" | ||
(mixed-text-file "backlight.rules" | ||
"ACTION==\"add\"," | ||
"SUBSYSTEM==\"backlight\"," | ||
"RUN+=\"" coreutils "/bin/chgrp backlight $sys$devpath/brightness\"," | ||
"RUN+=\"" coreutils "/bin/chmod g+w $sys$devpath/brightness\"")) | ||
#:groups '("backlight")) | ||
;; (udev-rules-service 'android android-udev-rules | ||
;; #:groups '("adbusers")) | ||
(modify-services %base-services | ||
(mingetty-service-type | ||
config => (mingetty-configuration | ||
(inherit config) | ||
(auto-login "user") | ||
(login-pause? (not (string=? (mingetty-configuration-tty config) | ||
"tty1"))))) | ||
(console-font-service-type | ||
config => (map (lambda (tty+font) | ||
(cons (car tty+font) | ||
"Lat2-Terminus16")) | ||
config))))))) | ||
|
||
%operating-system |