fix gdm autologin and installer installation

.gitignore

@@ -1,3 +1,5 @@
 Containerfile
 sources/
 downloads/
+.*~undo-tree~
+*~

genimg/stage2.conf

@@ -1,6 +1,6 @@
 image vanilla_installer.iso {
     iso {
-        extraargs = "-e /efi.img -no-emul-boot -boot-load-size 4 -efi-boot-part --efi-boot-image -sysid LINUX -publisher bonsai"
+        extraargs = "-e /efi.img -no-emul-boot -boot-load-size 4 -efi-boot-part --efi-boot-image -sysid LINUX -publisher vanillaos"
         volume-id = "vanilla-orchid"
     }
 }

includes.container/efi/loader/entries/.installer.conf.~undo-tree~

@@ -0,0 +1,12 @@
+(undo-tree-save-format-version . 1)
+"361980844add8c76a0425193f9b2ec1783b008cd"
+[nil nil nil nil (26300 48849 375573 304000) 0 nil]
+([nil nil ((#("archtest" 0 8 (fontified t)) . 66) (undo-tree-id0 . -5) (undo-tree-id1 . -8) (undo-tree-id2 . -5) (undo-tree-id3 . -5) (undo-tree-id4 . -5) (undo-tree-id5 . -5) (undo-tree-id6 . -5) (undo-tree-id7 . -5) (undo-tree-id8 . -8) (undo-tree-id9 . -8) (t 26299 21303 853808 608000)) nil (26300 48849 375571 341000) 0 nil])
+([nil nil ((66 . 78)) nil (26300 48849 375554 261000) 0 nil])
+([nil nil ((#("l" 0 1 (fontified t)) . -74) (undo-tree-id10 . -1) (undo-tree-id11 . -1) (undo-tree-id12 . -1) (undo-tree-id13 . -1) (undo-tree-id14 . -1) (undo-tree-id15 . -1) (undo-tree-id16 . -1) (undo-tree-id17 . -1) (undo-tree-id18 . -1) (undo-tree-id19 . -1) (undo-tree-id20 . -1) (undo-tree-id21 . -1) (#("i" 0 1 (fontified t)) . -75) (undo-tree-id22 . -1) (undo-tree-id23 . -1) (undo-tree-id24 . -1) (undo-tree-id25 . -1) (undo-tree-id26 . -1) (undo-tree-id27 . -1) (undo-tree-id28 . -1) (undo-tree-id29 . -1) (undo-tree-id30 . -1) (undo-tree-id31 . -1) (undo-tree-id32 . -1) (undo-tree-id33 . -1) (#("v" 0 1 (fontified t)) . -76) (undo-tree-id34 . -1) (undo-tree-id35 . -1) (undo-tree-id36 . -1) (undo-tree-id37 . -1) (undo-tree-id38 . -1) (undo-tree-id39 . -1) (undo-tree-id40 . -1) (undo-tree-id41 . -1) (undo-tree-id42 . -1) (undo-tree-id43 . -1) (undo-tree-id44 . -1) (undo-tree-id45 . -1) (#("e" 0 1 (fontified t)) . -77) (undo-tree-id46 . -1) (undo-tree-id47 . -1) (undo-tree-id48 . -1) (undo-tree-id49 . -1) (undo-tree-id50 . -1) (undo-tree-id51 . -1) (undo-tree-id52 . -1) (undo-tree-id53 . -1) (undo-tree-id54 . -1) (undo-tree-id55 . -1) 78 (t 26300 48849 379186 762000)) nil (26300 48855 644737 366000) 0 nil])
+([nil nil ((74 . 80)) nil (26300 48855 644703 242000) 0 nil])
+([nil nil ((#("arch linux" 0 10 (fontified t)) . 7) (undo-tree-id58 . -10) (undo-tree-id59 . -10) (undo-tree-id60 . -10) (undo-tree-id61 . -10) (undo-tree-id62 . -10) (undo-tree-id63 . -10) (undo-tree-id64 . -10) (undo-tree-id65 . -10) (undo-tree-id66 . -10) (undo-tree-id67 . -10) (t 26300 48855 643196 803000)) nil (26300 65462 158862 192000) 0 nil])
+([nil nil ((7 . 23)) nil (26300 65462 158855 269000) 0 nil])
+([nil nil ((#("Orxhi" 0 5 (fontified t)) . -18) (undo-tree-id57 . -5) 23) nil (26300 65462 158853 879000) 0 nil])
+([nil current ((#(" " 0 1 (fontified t)) . -17) (undo-tree-id56 . -1) 18) nil (26300 65462 158849 793000) 0 nil])
+nil

includes.container/efi/loader/entries/installer.conf

@@ -1,6 +1,6 @@
-title arch linux
+title Vanilla OS
 version 1
-options rw loglevel=4 root=live:LABEL=archtest console=tty systemd.firstboot=no
+options rw loglevel=4 root=live:LABEL=vanilla-orchid console=tty systemd.firstboot=no
 linux /vmlinuz
 initrd /initramfs.img
 

includes.container/etc/environment

@@ -0,0 +1 @@
+PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"

includes.container/etc/gdm/daemon.conf

@@ -0,0 +1,4 @@
+[daemon]
+AutomaticLogin=vanilla
+AutomaticLoginEnable=True
+

includes.container/etc/hostname

@@ -0,0 +1 @@
+vanillaos

includes.container/etc/hosts

@@ -0,0 +1,9 @@
+127.0.0.1 localhost
+
+# The following lines are desirable for IPv6 capable hosts
+::1 ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts

includes.container/etc/tmpfiles.d/vanilla-installer.conf

@@ -0,0 +1 @@
+C	/etc/xdg/autostart/installer.desktop	-	-	-	-	/usr/local/share/applications/org.vanillaos.Installer.desktop

includes.container/usr/share/glib-2.0/schemas/90-vanilla-os-default-settings.gschema.override

@@ -0,0 +1,46 @@
+[org.gnome.desktop.screensaver]
+lock-enabled=false
+[org.gnome.desktop.lockdown]
+disable-lock-screen=true
+
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-type='nothing'
+sleep-inactive-battery-type='nothing'
+
+[org.gnome.shell]
+favorite-apps = [ 'org.vanillaos.Installer.desktop', 'org.gnome.Epiphany.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'yelp.desktop' ]
+
+[org.gnome.desktop.app-folders.folders.Utilities]
+apps = ['gnome-abrt.desktop', 'gnome-system-log.desktop', 'nm-connection-editor.desktop', 'org.gnome.baobab.desktop', 'org.gnome.Connections.desktop', 'org.gnome.DejaDup.desktop', 'org.gnome.Dictionary.desktop', 'org.gnome.DiskUtility.desktop', 'org.gnome.eog.desktop', 'org.gnome.Evince.desktop', 'org.gnome.FileRoller.desktop', 'org.gnome.fonts.desktop', 'org.gnome.seahorse.Application.desktop', 'org.gnome.tweaks.desktop', 'org.gnome.Usage.desktop', 'vinagre.desktop', 'yelp.desktop', 'com.mattjakeman.ExtensionManager.desktop', 'gnome-system-monitor.desktop', 'im-config.desktop', 'nvidia-settings.desktop', 'ca.desrt.dconf-editor.desktop', 'org.gnome.Console']
+
+[org.gnome.desktop.background]
+picture-uri = 'file:///usr/share/backgrounds/vanilla/petals_light.webp'
+picture-uri-dark = 'file:///usr/share/backgrounds/vanilla/petals_dark.webp'
+
+[org.gnome.desktop.screensaver]
+picture-uri = 'file:///usr/share/backgrounds/vanilla/petals_light.webp'
+
+[org.gnome.desktop.sound]
+theme-name = 'freedesktop'
+
+[org.gnome.desktop.session]
+session-name="gnome"
+
+[org.gnome.desktop.datetime]
+automatic-timezone = true
+
+[org.gnome.desktop.peripherals.touchpad]
+tap-to-click = true
+click-method = 'default'
+
+[org.gnome.eog.ui:GNOME]
+sidebar=false
+
+[org.gnome.nautilus.icon-view:GNOME]
+default-zoom-level='standard'
+
+[org.gnome.settings-daemon.plugins.power:GNOME]
+power-button-action = 'interactive'
+
+[org.gnome.software:GNOME]
+packaging-format-preference = ['flatpak']

includes.container/usr/usr/share/glib-2.0/schemas/.90-vanilla-os-lock.gschema.override.~undo-tree~

@@ -0,0 +1,4 @@
+(undo-tree-save-format-version . 1)
+"cab8b88df4a19d0a2c4aa0cf4c9c6b8c0ee508e2"
+[nil current nil nil (26300 49736 138329 348000) 0 nil]
+nil

modules/00-vanilla-installer.yml

@@ -1,13 +1,20 @@
 name: vanilla-installer
-type: dpkg-buildpackage
+type: meson
 source:
   type: git
   url: https://github.com/Vanilla-OS/vanilla-installer.git
-  branch: main
-  commit: latest
+  tag: v2.3.9
   paths:
   - vanilla-installer
 modules:
+  - name: vanilla-installer-etc
+    type: shell
+    commands:
+      - cd /sources/vanilla-installer
+      - mkdir -p /etc/vanilla
+      - mkdir -p etc/vanilla-installer
+      - install -Dm655 recipe.json /etc/vanilla-installer/recipe.json
+      - touch /etc/vanilla/installer.log
   - name: vanilla-installer-deps-install
     type: apt
     source:
@@ -18,13 +25,15 @@ modules:
       - dpkg-dev
       - gettext
       - gir1.2-nma4-1.0
+      - gir1.2-vte-3.91
       - libadwaita-1-dev
       - libjpeg-dev
       - libnm0
       - libnm-dev
       - libnma0
       - libnma-gtk4-0
       - libnma-gtk4-dev
+      - libvte-dev
       - make
       - meson
       - python3

modules/200-configs.yml

@@ -1,5 +1,5 @@
 name: configs
 type: shell
 commands:
-- cp /usr/share/applications/org.vanillaos.Installer.desktop /etc/skel/.config/autostart/
-- useradd -m -G sudo -s /bin/bash vanilla -p '*'
+  - mkdir -p /etc/skel/.config/autostart/
+  - cp /usr/share/applications/org.vanillaos.Installer.desktop /etc/skel/.config/autostart/

recipe.yml

@@ -35,7 +35,6 @@ stages:
           - modules/00-vanilla-desktop-base.yml
           - modules/00-vanilla-backgrounds.yml
           - modules/00-vanilla-installer.yml
-          - modules/00-vanilla-gnome-default-settings.yml
           - modules/20-gnome-core.yml
           - modules/30-gnome-essentials.yml
           - modules/40-gnome-appearance.yml
@@ -47,12 +46,21 @@ stages:
           - modules/998-vanilla-cleanup.yml
           - modules/999-pkg-cleanup.yml
 
+      - name: user
+        type: shell
+        commands:
+          - useradd -m vanilla
+          - usermod -aG sudo vanilla
+          - passwd -d vanilla
+          - mv /etc/gdm/* /etc/gdm3/.
+          - rm -r /etc/gdm
+
       - name: bootloader
         type: shell
         commands:
-           - cp /boot/vmlinuz-$(ls -1 /usr/lib/modules | head -n1) /efi/vmlinuz
-           - dracut  --no-machineid --kernel-image /efi/vmlinuz --kver "$(ls -1 /usr/lib/modules | head -n1)" --kernel-cmdline 'rw quiet root=live:LABEL=vanilla-orchid console=tty0' --add dmsquash-live --install plymouth --install head --install tail --install less --install lsof /efi/initramfs.img
-           - SYSTEMD_ESP_PATH=/efi bootctl install --no-variables
+          - cp /boot/vmlinuz-$(ls -1 /usr/lib/modules | head -n1) /efi/vmlinuz
+          - dracut  --no-machineid --kernel-image /efi/vmlinuz --kver "$(ls -1 /usr/lib/modules | head -n1)" --kernel-cmdline 'rw quiet root=live:LABEL=vanilla-orchid console=tty0' --add dmsquash-live --install plymouth --install head --install tail --install less --install lsof /efi/initramfs.img
+          - SYSTEMD_ESP_PATH=/efi bootctl install --no-variables
 
       - name: cleanup
         type: shell
@@ -63,19 +71,22 @@ stages:
       - name: cleanup2
         type: shell
         commands:
+          - rm -rf /usr/share/gocode/src
           - rm -rf /tmp/*
           - rm -rf /var/tmp/*
           - rm -rf /sources
 
 finalize:
   - name: genimage stage1
     type: genimage
+    genimagepath: "/home/lain/.local/bin/genimage"
     config: "$PROJROOT/genimg/stage1.conf"
     rootpath: "$FSROOT"
     inputpath: "$PROJROOT/genimg/build"
     outputpath: "$PROJROOT/genimg/stage2"
   - name: genimage stage2
     type: genimage
+    genimagepath: "/home/lain/.local/bin/genimage"
     config: "$PROJROOT/genimg/stage2.conf"
     rootpath: "$PROJROOT/genimg/stage2"
     inputpath: "$PROJROOT/genimg/build"