Fix indentation and keyboard layout

Julien LepillerWed Jun 17 17:37:24+0200 2020

e61ea85

Fix indentation and keyboard layout

modules/config/os.scm

5151 
  #:export (server-services
5252 
            desktop-services
5353 
            tyreunom-os
54-
	    tyreunom-desktop-os))
54+
            tyreunom-desktop-os))
5555 
5656 
(define (server-services host-name)
5757 
  (cons*
5858 
    (service ntp-service-type)
5959 
    (service openssh-service-type
60-
	     (openssh-configuration
61-
	       (authorized-keys
62-
		 `(("tyreunom" ,(local-file "../../keys/tyreunom.pub"))))))
60+
             (openssh-configuration
61+
               (authorized-keys
62+
                 `(("tyreunom" ,(local-file "../../keys/tyreunom.pub"))))))
6363 
    (modify-services %base-services
6464 
      (rottlog-service-type config =>
6565 
        server-rotation-service-config)
…
7878 
    (service tor-service-type)
7979 
    (service qemu-binfmt-service-type
8080 
      (qemu-binfmt-configuration
81-
	(platforms (lookup-qemu-platforms "arm" "aarch64" "i686" "ppc"))
82-
	(guix-support? #t)))
81+
        (platforms (lookup-qemu-platforms "arm" "aarch64" "i686" "ppc"))
82+
        (guix-support? #t)))
8383 
    (modify-services %desktop-services
8484 
      (rottlog-service-type config =>
8585 
        desktop-rotation-service-config)
8686 
      (udev-service-type config =>
8787 
        (udev-configuration
88-
	  (inherit config)
89-
	  (rules (cons* android-udev-rules
90-
			(udev-configuration-rules config)))))
88+
          (inherit config)
89+
          (rules (cons* android-udev-rules
90+
                        (udev-configuration-rules config)))))
9191 
      (gdm-service-type config =>
92-
	(gdm-configuration
93-
	  (inherit config)
94-
	  (xorg-configuration
95-
	    (xorg-configuration
96-
	      (keyboard-layout (keyboard-layout "fr" "bepo"))))))
92+
       (gdm-configuration
93+
         (inherit config)
94+
         (xorg-configuration
95+
           (xorg-configuration
96+
             (keyboard-layout (keyboard-layout "fr" "bepo"))))))
9797 
      (guix-service-type config =>
9898 
        (guix-configuration
9999 
          (inherit config)
…
129129 
    (operating-system
130130 
      (inherit system)
131131 
      (users
132-
	(map (lambda (user)
133-
	       (if (equal? (user-account-name user) "tyreunom")
134-
		   (user-account
135-
		     (inherit user)
136-
		     (supplementary-groups '("netdev" "adbusers" "audio" "video")))
137-
		   user))
138-
	     (operating-system-users system)))
132+
        (map (lambda (user)
133+
               (if (equal? (user-account-name user) "tyreunom")
134+
                   (user-account
135+
                     (inherit user)
136+
                     (supplementary-groups '("netdev" "adbusers" "audio" "video")))
137+
                   user))
138+
             (operating-system-users system)))
139139 
      (groups (cons (user-group (system? #t) (name "adbusers"))
140-
		    %base-groups))
140+
                    %base-groups))
141141 
      (hosts-file
142142 
        (plain-file "hosts"
143143 
          (string-append "127.0.0.1 " host-name ".lepiller.eu localhost " host-name "\n"
144144 
                         "::1       " host-name ".lepiller.eu localhost " host-name "\n"
145145 
                         %facebook-host-aliases)))
146146 
      (packages (cons* xlockmore wpa-supplicant gvfs openbox xfce4-terminal
147-
		       (operating-system-packages system))))))
147+
                       (operating-system-packages system))))))
systems/tachikoma.scm
3030 
        (bootloader grub-bootloader)))
3131 
    (mapped-devices
3232 
      (list (mapped-device
33-
	      (source (uuid "c61efb54-dd82-4f94-ba30-344ed71d0783"))
34-
	      (target "cryptroot")
35-
	      (type luks-device-mapping))))
33+
              (source (uuid "c61efb54-dd82-4f94-ba30-344ed71d0783"))
34+
              (target "cryptroot")
35+
              (type luks-device-mapping))))
3636 
    (file-systems (cons (file-system
37-
			  (device "/dev/mapper/cryptroot")
37+
                          (device "/dev/mapper/cryptroot")
3838 
                          (mount-point "/")
3939 
                          (type "ext4")
40-
			  (dependencies mapped-devices))
40+
                          (dependencies mapped-devices))
4141 
                        %base-file-systems))
42-
    (users (map
43-
	     (lambda (user)
44-
	       (if (equal? (user-account-name user) "tyreunom")
45-
		 (user-account
46-
		   (inherit user)
47-
		   (supplementary-groups
48-
		     (cons "libvirt" (user-account-supplementary-groups user))))
49-
		 user))
50-
	     (operating-system-users system)))
42+
    (users (cons
43+
             (user-account
44+
               (name "zoom")
45+
               (group "users")
46+
               (home-directory "/home/zoom"))
47+
             (map
48+
               (lambda (user)
49+
                 (if (equal? (user-account-name user) "tyreunom")
50+
                   (user-account
51+
                     (inherit user)
52+
                     (supplementary-groups
53+
                       (cons "libvirt" (user-account-supplementary-groups user))))
54+
                   user))
55+
               (operating-system-users system))))
5156 
    (services
5257 
      (cons*
53-
	(service libvirt-service-type
54-
		 (libvirt-configuration
55-
		   (unix-sock-group "libvirt")))
56-
	(service virtlog-service-type
57-
		 (virtlog-configuration
58-
		   (max-clients 1000)))
58+
        (service libvirt-service-type
59+
                 (libvirt-configuration
60+
                   (unix-sock-group "libvirt")))
61+
        (service virtlog-service-type
62+
                 (virtlog-configuration
63+
                   (max-clients 1000)))
5964 
        desktop-services))))