Update os config for newer Guix

Julien LepillerSun Mar 31 20:59:12+0200 2019

7073d0b

Update os config for newer Guix

modules/config/os.scm

4242
  #:use-module (gnu system)
4343
  #:use-module (gnu system accounts)
4444
  #:use-module (gnu system file-systems)
45+
  #:use-module (gnu system keyboard)
4546
  #:use-module (gnu system locale)
4647
  #:use-module (gnu system shadow)
4748
  #:use-module (guix gexp)

5253
5354
(define (server-services host-name)
5455
  (cons*
55-
    (console-keymap-service "fr-bepo")
5656
    (service ntp-service-type)
5757
    (service openssh-service-type
5858
	     (openssh-configuration

6969
          (substitute-urls '("https://berlin.guixsd.org"
7070
                             "https://mirror.hydra.gnu.org")))))))
7171
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-
8772
(define desktop-services
8873
  (cons*
89-
    (console-keymap-service "fr-bepo")
9074
    (simple-service 'dconf dbus-root-service-type (list dconf))
9175
    (service tor-service-type)
9276
    (service qemu-binfmt-service-type

9983
	  (inherit config)
10084
	  (rules (cons* android-udev-rules
10185
			(udev-configuration-rules config)))))
102-
      (slim-service-type config =>
103-
        (slim-configuration
86+
      (gdm-service-type config =>
87+
	(gdm-configuration
10488
	  (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"))))))
11092
      (guix-service-type config =>
11193
        (guix-configuration
11294
          (inherit config)

118100
    (host-name host-name)
119101
    (timezone "Europe/Paris")
120102
    (locale "fr_FR.UTF-8")
103+
    (keyboard-layout (keyboard-layout "fr" "bepo"))
121104
    (bootloader #f)
122105
    (file-systems %base-file-systems)
123106
    (users (cons (user-account