Update os config for newer Guix
modules/config/os.scm
42 | 42 | #:use-module (gnu system) | |
43 | 43 | #:use-module (gnu system accounts) | |
44 | 44 | #:use-module (gnu system file-systems) | |
45 | + | #:use-module (gnu system keyboard) | |
45 | 46 | #:use-module (gnu system locale) | |
46 | 47 | #:use-module (gnu system shadow) | |
47 | 48 | #:use-module (guix gexp) | |
… | |||
52 | 53 | ||
53 | 54 | (define (server-services host-name) | |
54 | 55 | (cons* | |
55 | - | (console-keymap-service "fr-bepo") | |
56 | 56 | (service ntp-service-type) | |
57 | 57 | (service openssh-service-type | |
58 | 58 | (openssh-configuration | |
… | |||
69 | 69 | (substitute-urls '("https://berlin.guixsd.org" | |
70 | 70 | "https://mirror.hydra.gnu.org"))))))) | |
71 | 71 | ||
72 | - | (define bepo-evdev | |
73 | - | "Section \"InputClass\" | |
74 | - | Identifier \"evdev keyboard catchall\" | |
75 | - | Driver \"evdev\" | |
76 | - | MatchIsKeyboard \"on\" | |
77 | - | Option \"xkb_layout\" \"fr\" | |
78 | - | Option \"xkb_variant\" \"bepo\" | |
79 | - | EndSection | |
80 | - | ||
81 | - | Section \"InputClass\" | |
82 | - | Identifier \"touchpad\" | |
83 | - | MatchIsTouchpad \"on\" | |
84 | - | Driver \"synaptics\" | |
85 | - | EndSection") | |
86 | - | ||
87 | 72 | (define desktop-services | |
88 | 73 | (cons* | |
89 | - | (console-keymap-service "fr-bepo") | |
90 | 74 | (simple-service 'dconf dbus-root-service-type (list dconf)) | |
91 | 75 | (service tor-service-type) | |
92 | 76 | (service qemu-binfmt-service-type | |
… | |||
99 | 83 | (inherit config) | |
100 | 84 | (rules (cons* android-udev-rules | |
101 | 85 | (udev-configuration-rules config))))) | |
102 | - | (slim-service-type config => | |
103 | - | (slim-configuration | |
86 | + | (gdm-service-type config => | |
87 | + | (gdm-configuration | |
104 | 88 | (inherit config) | |
105 | - | (startx (xorg-start-command | |
106 | - | #:configuration-file | |
107 | - | (xorg-configuration-file | |
108 | - | #:extra-config | |
109 | - | (list bepo-evdev)))))) | |
89 | + | (xorg-configuration | |
90 | + | (xorg-configuration | |
91 | + | (keyboard-layout (keyboard-layout "fr" "bepo")))))) | |
110 | 92 | (guix-service-type config => | |
111 | 93 | (guix-configuration | |
112 | 94 | (inherit config) | |
… | |||
118 | 100 | (host-name host-name) | |
119 | 101 | (timezone "Europe/Paris") | |
120 | 102 | (locale "fr_FR.UTF-8") | |
103 | + | (keyboard-layout (keyboard-layout "fr" "bepo")) | |
121 | 104 | (bootloader #f) | |
122 | 105 | (file-systems %base-file-systems) | |
123 | 106 | (users (cons (user-account |