configs: Update support for AYN Odin 2

Signed-off-by: Xilin Wu <strongtz@yeah.net>

configs/common/alarm-user.yaml

@@ -5,7 +5,6 @@ sysconf:
   - name: alarm
     password: alarm
     groups: wheel
-    shell: /bin/zsh
   - name: root
     uid: 0
     password: root

configs/device/ayn-odin2.yaml

@@ -33,7 +33,6 @@ pacman:
   - yay
   - btop
   - chromium
-  - oh-my-zsh-git
   - box64-sd8g2-git
   - ayn-odin2-meta
   - base-devel
@@ -126,18 +125,6 @@ filesystem:
           </logicalmonitor>
         </configuration>
       </monitors>
-  - path: /etc/skel/.zshrc
-    stage: pre-user
-    content: |
-      ZSH=/usr/share/oh-my-zsh/
-      ZSH_THEME="ys"
-      plugins=(git)
-      ZSH_CACHE_DIR=$$HOME/.cache/oh-my-zsh
-      if [[ ! -d $$ZSH_CACHE_DIR ]]; then
-        mkdir $$ZSH_CACHE_DIR
-      fi
-      source $$ZSH/oh-my-zsh.sh
-      setopt nonomatch
 
 sysconf:
   chassis: handset

configs/locale/multi.yaml

@@ -21,20 +21,7 @@ locale:
 
 filesystem:
   files:
-
+  # Windows NTP Server
-  # Wireless regulatory
-  # - path: /etc/conf.d/wireless-regdom
-  #   content: |
-  #     WIRELESS_REGDOM="CN"
-
-  # China accelerated DNS
-  # - path: /etc/systemd/resolved.conf.d/cn-dns.conf
-  #   content: |
-  #     [Resolve]
-  #     DNS=114.114.114.114 119.29.29.29
-  #     FallbackDNS=114.114.114.114 119.29.29.29
-
-  # China accelerated NTP Server
   - path: /etc/systemd/timesyncd.conf.d/windows-ntp.conf
     content: |
       [Time]
@@ -59,9 +46,5 @@ sysconf:
     GTK_IM_MODULE: ibus
     QT_IM_MODULE: ibus
     XMODIFIERS: '@im=ibus'
-    # COUNTRY: CN
+    TZ: Asia/Shanghai
-    # LANG: zh_CN.UTF-8
-    # LANGUAGE: zh_CN.UTF-8
-    # LC_ALL: zh_CN.UTF-8
-    # TZ: Asia/Shanghai
 timezone: Asia/Shanghai

configs/repo/renegade-project-azure.yaml

@@ -1,9 +0,0 @@
-pacman:
-  repo:
-  - name: renegade-project
-    priority: 200
-    server: https://mollytek.blob.core.windows.net/maoli/mirror/arch/$$arch
-  trust:
-  - renegade-project@classfun.cn
-  install:
-  - renegade-project/renegade-project-keyring

configs/shell/zsh.yaml

@@ -0,0 +1,24 @@
+pacman:
+  install:
+    - zsh
+    - oh-my-zsh-git
+filesystem:
+  files:
+    - path: /etc/skel/.bashrc
+      stage: pre-user
+      content: |
+        if [ -n "$$BASH" ] && [[ "$$-" = *i* ]]; then
+          exec zsh
+        fi
+    - path: /etc/skel/.zshrc
+      stage: pre-user
+      content: |
+        ZSH=/usr/share/oh-my-zsh/
+        ZSH_THEME="ys"
+        plugins=(git)
+        ZSH_CACHE_DIR=$$HOME/.cache/oh-my-zsh
+        if [[ ! -d $$ZSH_CACHE_DIR ]]; then
+          mkdir $$ZSH_CACHE_DIR
+        fi
+        source $$ZSH/oh-my-zsh.sh
+        setopt nonomatch

configs/target/ayn-odin2-sdcard.yaml

@@ -13,7 +13,7 @@ image:
   sector: 512
   partitions:
   - type: filesystem
-    ptype: microsoft-basic-data
+    ptype: efi
     pname: esp
     size: 512MiB
     fsname: ESP