diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml
index 7c65a9b0..2808079d 100644
--- a/com.xargon.retrodeck.yml
+++ b/com.xargon.retrodeck.yml
@@ -471,125 +471,29 @@ modules:
- name: retrodeck
buildsystem: simple
build-commands:
- - mkdir -p ~/retrodeck/roms/bios
- - mkdir -p ~/retrodeck/roms/3do
- - mkdir -p ~/retrodeck/roms/amiga
- - mkdir -p ~/retrodeck/roms/amigacd32
- - mkdir -p ~/retrodeck/roms/amstradcpc
- - mkdir -p ~/retrodeck/roms/arcade
- - mkdir -p ~/retrodeck/roms/atari2600
- - mkdir -p ~/retrodeck/roms/atari5200
- - mkdir -p ~/retrodeck/roms/atari7800
- - mkdir -p ~/retrodeck/roms/atarist
- - mkdir -p ~/retrodeck/roms/atari800
- - mkdir -p ~/retrodeck/roms/atomiswave
- - mkdir -p ~/retrodeck/roms/channelf
- - mkdir -p ~/retrodeck/roms/colecovision
- - mkdir -p ~/retrodeck/roms/c64
- - mkdir -p ~/retrodeck/roms/c128
- - mkdir -p ~/retrodeck/roms/vic20
- - mkdir -p ~/retrodeck/roms/laserdisc
- - mkdir -p ~/retrodeck/roms/dreamcast
- - mkdir -p ~/retrodeck/roms/easyrpg
- - mkdir -p ~/retrodeck/roms/famicom
- - mkdir -p ~/retrodeck/roms/fbn
- - mkdir -p ~/retrodeck/roms/gb
- - mkdir -p ~/retrodeck/roms/gbh
- - mkdir -p ~/retrodeck/roms/gameandwatch
- - mkdir -p ~/retrodeck/roms/gba
- - mkdir -p ~/retrodeck/roms/fds
- - mkdir -p ~/retrodeck/roms/c16
- - mkdir -p ~/retrodeck/roms/ggh
- - mkdir -p ~/retrodeck/roms/gbah
- - mkdir -p ~/retrodeck/roms/intellivision
- - mkdir -p ~/retrodeck/roms/gbch
- - mkdir -p ~/retrodeck/roms/atarilynx
- - mkdir -p ~/retrodeck/roms/mame
- - mkdir -p ~/retrodeck/roms/dos
- - mkdir -p ~/retrodeck/roms/snesmsu1
- - mkdir -p ~/retrodeck/roms/msx
- - mkdir -p ~/retrodeck/roms/msx2
- - mkdir -p ~/retrodeck/roms/naomi
- - mkdir -p ~/retrodeck/roms/neogeo
- - mkdir -p ~/retrodeck/roms/ngp
- - mkdir -p ~/retrodeck/roms/nds
- - mkdir -p ~/retrodeck/roms/n64
- - mkdir -p ~/retrodeck/roms/nes
- - mkdir -p ~/retrodeck/roms/nesh
- - mkdir -p ~/retrodeck/roms/ngpc
- - mkdir -p ~/retrodeck/roms/neocd
- - mkdir -p ~/retrodeck/roms/pc-9800
- - mkdir -p ~/retrodeck/roms/pcengine
- - mkdir -p ~/retrodeck/roms/pcenginecd
- - mkdir -p ~/retrodeck/roms/pcfx
- - mkdir -p ~/retrodeck/roms/openbor
- - mkdir -p ~/retrodeck/roms/piece
- - mkdir -p ~/retrodeck/roms/odyssey2
- - mkdir -p ~/retrodeck/roms/psp
- - mkdir -p ~/retrodeck/roms/pspminis
- - mkdir -p ~/retrodeck/roms/pokemini
- - mkdir -p ~/retrodeck/roms/homebrew
- - mkdir -p ~/retrodeck/roms/ports
- - mkdir -p ~/retrodeck/roms/sc-3000
- - mkdir -p ~/retrodeck/roms/scummvm
- - mkdir -p ~/retrodeck/roms/psx
- - mkdir -p ~/retrodeck/roms/segacd
- - mkdir -p ~/retrodeck/roms/sega32x
- - mkdir -p ~/retrodeck/roms/genesis
- - mkdir -p ~/retrodeck/roms/genh
- - mkdir -p ~/retrodeck/roms/mastersystem
- - mkdir -p ~/retrodeck/roms/megadrive
- - mkdir -p ~/retrodeck/roms/megaduck
- - mkdir -p ~/retrodeck/roms/saturn
- - mkdir -p ~/retrodeck/roms/sg-1000
- - mkdir -p ~/retrodeck/roms/x1
- - mkdir -p ~/retrodeck/roms/zxspectrum
- - mkdir -p ~/retrodeck/roms/zx81
- - mkdir -p ~/retrodeck/roms/pc-8800
- - mkdir -p ~/retrodeck/roms/snes
- - mkdir -p ~/retrodeck/roms/supergrafx
- - mkdir -p ~/retrodeck/roms/pico-8
- - mkdir -p ~/retrodeck/roms/megacd
- - mkdir -p ~/retrodeck/roms/snesh
- - mkdir -p ~/retrodeck/roms/satellaview
- - mkdir -p ~/retrodeck/roms/sfc
- - mkdir -p ~/retrodeck/roms/sufami
- - mkdir -p ~/retrodeck/roms/tic-80
- - mkdir -p ~/retrodeck/roms/tg16
- - mkdir -p ~/retrodeck/roms/solarus
- - mkdir -p ~/retrodeck/roms/vectrex
- - mkdir -p ~/retrodeck/roms/gbc
- - mkdir -p ~/retrodeck/roms/videopac
- - mkdir -p ~/retrodeck/roms/virtualboy
- - mkdir -p ~/retrodeck/roms/wonderswan
- - mkdir -p ~/retrodeck/roms/wonderswancolor
- - mkdir -p ~/retrodeck/roms/ecwolf
- - mkdir -p ~/retrodeck/roms/x68000
- - mkdir -p ~/retrodeck/roms/build
- - mkdir -p ~/retrodeck/roms/tools
- - mkdir -p ~/retrodeck/roms/imageviewer
- - mkdir -p ~/retrodeck/roms/gamegear
- - mkdir -p ~/retrodeck/roms/tg16cd
- - mkdir -p ~/retrodeck/roms/j2me
- - mkdir -p ~/retrodeck/roms/uzebox
- - mkdir -p ~/retrodeck/roms/supervision
- - mkdir -p ~/retrodeck/roms/doom
- - mkdir -p ~/retrodeck/roms/switch
- - mkdir -p ~/retrodeck/roms/wii
- - mkdir -p ~/retrodeck/roms/gc
- - mkdir -p ~/retrodeck/roms/3ds
-
- - rm -f ${FLATPAK_DEST}/etc/retroarch.cfg
- - mv retroarch.cfg ${FLATPAK_DEST}/etc/retroarch.cfg
+
+ # RA is already doing this no?
+ #- rm -f ${FLATPAK_DEST}/etc/retroarch.cfg
+ #- mv retroarch.cfg ${FLATPAK_DEST}/etc/retroarch.cfg
# - symlink useful dirs and files in ~/retrodeck
- # TODO: cannot see home folder at this point
+ # TODO: cannot see home folder at this point, same for es_settings.xml
#- ln -s ${FLATPAK_DEST}/etc/retroarch.cfg ~/retrodeck/retroarch.cfg
#- ln -s ${FLATPAK_DEST}/share/emulationstation/themes/ ~/retrodeck/
+ # Remove this when/if commited to ES-DE
+ - rm -rf /app/share/emulationstation/resources/systems/unix/es_find_rules.xml
+ - cp es_find_rules.xml /app/share/emulationstation/resources/systems/unix/
+
+ # Create retrodeck.sh scripts:
+ # sed the es_config to inject the default rom folder
+
+
#cleanup: ['*']
sources:
- - type: file
- path: retroarch.cfg
+ #- type: file
+ # path: retroarch.cfg
+ - type: file # Remove this when/if commited to ES-DE
+ path: es_find_rules.xml
# create desktop entry
\ No newline at end of file
diff --git a/es_find_rules.xml b/es_find_rules.xml
new file mode 100644
index 00000000..8b8c4c08
--- /dev/null
+++ b/es_find_rules.xml
@@ -0,0 +1,181 @@
+
+
+
+
+
+ retroarch
+ org.libretro.RetroArch
+ RetroArch-Linux-x86_64.AppImage
+
+
+ /var/lib/flatpak/exports/bin/org.libretro.RetroArch
+ ~/Applications/RetroArch-Linux-x86_64.AppImage
+ ~/.local/bin/RetroArch-Linux-x86_64.AppImage
+ ~/bin/RetroArch-Linux-x86_64.AppImage
+
+
+
+
+
+ ~/snap/retroarch/current/.config/retroarch/cores
+
+ ~/.var/app/org.libretro.RetroArch/config/retroarch/cores
+
+ ~/.config/retroarch/cores
+
+ /usr/lib/x86_64-linux-gnu/libretro
+
+ /usr/lib64/libretro
+
+ /usr/lib/libretro
+
+ /usr/local/lib/libretro
+
+ /usr/pkg/lib/libretro
+
+ /app/share/libretro/cores
+
+
+
+
+
+ citra-emu.citra-nightly
+ org.citra_emu.citra
+
+
+ /var/lib/flatpak/exports/bin/org.citra_emu.citra
+
+
+
+
+
+ dolphin-emu
+ org.DolphinEmu.dolphin-emu
+
+
+ /var/lib/flatpak/exports/bin/org.DolphinEmu.dolphin-emu
+ ~/Applications/Dolphin_Emulator*.AppImage
+ ~/.local/bin/Dolphin_Emulator*.AppImage
+ ~/bin/Dolphin_Emulator*.AppImage
+
+
+
+
+
+ dosbox-staging
+ io.github.dosbox-staging
+
+
+ /var/lib/flatpak/exports/bin/io.github.dosbox-staging
+
+
+
+
+
+ fs-uae
+ fsuae.fs-uae
+ net.fsuae.FS-UAE
+
+
+ /var/lib/flatpak/exports/bin/net.fsuae.FS-UAE
+
+
+
+
+
+ mame
+
+
+
+
+
+ mgba
+ io.mgba.mGBA
+
+
+ /var/lib/flatpak/exports/bin/io.mgba.mGBA
+ ~/Applications/mGBA*.AppImage
+ ~/.local/bin/mGBA*.AppImage
+ ~/bin/mGBA*.AppImage
+
+
+
+
+
+ m64p
+ io.github.m64p.m64p
+
+
+ /var/lib/flatpak/exports/bin/io.github.m64p.m64p
+
+
+
+
+
+ PCSX2
+ pcsx2
+ net.pcsx2.PCSX2
+
+
+ /var/lib/flatpak/exports/bin/net.pcsx2.PCSX2
+
+
+
+
+
+ ppsspp-emu.ppsspp-sdl
+ org.ppsspp.PPSSPP
+
+
+ /var/lib/flatpak/exports/bin/org.ppsspp.PPSSPP
+
+
+
+
+
+ rpcs3
+ rpcs3-emu.rpcs3
+ net.rpcs3.RPCS3
+ rpcs3.AppImage
+
+
+ /var/lib/flatpak/exports/bin/net.rpcs3.RPCS3
+ ~/Applications/rpcs3*.AppImage
+ ~/.local/bin/rpcs3*.AppImage
+ ~/bin/rpcs3*.AppImage
+
+
+
+
+
+ visualboyadvance-m
+
+
+
+
+
+ xemu
+ app.xemu.xemu
+
+
+ /var/lib/flatpak/exports/bin/app.xemu.xemu
+ ~/Applications/Xemu*.AppImage
+ ~/.local/bin/Xemu*.AppImage
+ ~/bin/Xemu*.AppImage
+
+
+
+
+
+ yuzu
+ org.yuzu_emu.yuzu
+ yuzu.AppImage
+
+
+ /var/lib/flatpak/exports/bin/org.yuzu_emu.yuzu
+ ~/Applications/yuzu*.AppImage
+ ~/.local/bin/yuzu*.AppImage
+ ~/bin/yuzu*.AppImage
+
+
+
diff --git a/es_settings.xml b/es_settings.xml
new file mode 100644
index 00000000..c39165ce
--- /dev/null
+++ b/es_settings.xml
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/retroarch.cfg b/retroarch.cfg
index 04700e21..e93a40ef 100644
--- a/retroarch.cfg
+++ b/retroarch.cfg
@@ -258,6 +258,18 @@ input_pause_toggle_axis = "nul"
input_pause_toggle_btn = "nul"
input_pause_toggle_mbtn = "nul"
input_player1_analog_dpad_mode = "1"
+input_player1_a = "x"
+input_player1_b = "z"
+input_player1_y = "a"
+input_player1_x = "s"
+input_player1_start = "enter"
+input_player1_select = "rshift"
+input_player1_l = "q"
+input_player1_r = "w"
+input_player1_left = "left"
+input_player1_right = "right"
+input_player1_up = "up"
+input_player1_down = "down"
input_poll_type_behavior = "2"
input_recording_toggle = "nul"
input_recording_toggle_axis = "nul"
@@ -360,7 +372,7 @@ memory_show = "false"
memory_update_interval = "256"
menu_battery_level_enable = "true"
menu_core_enable = "true"
-menu_driver = "xmb"
+menu_driver = "ozone"
menu_dynamic_wallpaper_enable = "false"
menu_enable_widgets = "true"
menu_font_color_blue = "255"