~mil/sxmo-utils

5f82699014d481b367af8b982c05a427979e1bf8 — Maarten van Gompel 8 months ago 7bbb567
Added a more detailed xinit_template and added some default media resources (wallpaper,startup tune,keypress sound) that are preconfigured in the template
M Makefile => Makefile +3 -1
@@ 37,6 37,8 @@ clean:
install: $(PROGRAMS)
	cd configs && find . -type f -exec install -D -m 0644 "{}" "$(DESTDIR)$(PREFIX)/share/sxmo/{}" \; && cd ..

	cd resources && find . -type f -exec install -D -m 0644 "{}" "$(DESTDIR)$(PREFIX)/share/sxmo/{}" \; && cd ..

	# Configs
	install -D -m 0755 -t $(DESTDIR)/etc/init.d configs/openrc/sxmo-setpermissions



@@ 48,7 50,7 @@ install: $(PROGRAMS)

	install -D -m 0644 -t $(DESTDIR)$(PREFIX)/share/applications/ configs/xdg/mimeapps.list

	install -D -m 0644 -T configs/xorg/monitor.conf $(DESTDIR)$(PREFIX)/share/X11/xorg.conf.d/90-monitor.conf 
	install -D -m 0644 -T configs/xorg/monitor.conf $(DESTDIR)$(PREFIX)/share/X11/xorg.conf.d/90-monitor.conf

	mkdir -p $(DESTDIR)/etc/NetworkManager/dispatcher.d
	install -D -m 0755 -T configs/networkmanager/updatestatusbar.sh $(DESTDIR)/etc/NetworkManager/dispatcher.d/10-updatestatusbar.sh

A configs/appcfg/conky24h.conf => configs/appcfg/conky24h.conf +37 -0
@@ 0,0 1,37 @@
conky.config = {
    alignment = 'middle_middle',
    background = false,
    border_width = 0.5,
    cpu_avg_samples = 4,
    default_color = 'white',
    default_outline_color = 'grey',
    default_shade_color = 'black',
    draw_borders = true,
    draw_graph_borders = true,
    draw_outline = false,
    draw_shades = true,
    use_xft = true,
    font = 'DejaVu Sans Mono:size=10',
    gap_x = 5,
    gap_y = 50,
    minimum_height = 5,
    minimum_width = 5,
    net_avg_samples = 2,
    double_buffer = true,
    out_to_console = false,
    out_to_stderr = false,
    extra_newline = false,
    own_window = false,
    stippled_borders = 1,
    update_interval = 60,
    uppercase = false,
    use_spacer = 'none',
    show_graph_scale = false,
    show_graph_range = false
}

conky.text = [[
  ${font Latin Modern Mono Caps:size=60}${alignc}${exec date +"%H:%M"}
  ${font Latin Modern Mono Caps:size=10}${alignc}${exec date +"%d %b %Y"}
  ${font}
]]

A configs/appcfg/xinit_template => configs/appcfg/xinit_template +68 -0
@@ 0,0 1,68 @@
#!/usr/bin/env sh

# Please modify this file to your liking

# Important Instructions:
#  All processes you launch from this script must
#  be non-blocking: launch them in the background (using &)
#  or ensure they return quickly. Only after this script
#  finishes will the window manager be loaded

# Set a pretty wallpaper
feh --bg-fill /usr/share/sxmo/background.jpg

# Show conky (the clock)
conky -c /usr/share/sxmo/appcfg/conky.conf -d #12 hour clock (am/pm)
#conky -c /usr/share/sxmo/appcfg/conky24h.conf -d  #24 hour clock

# Force audio over the main speaker
# and set a sane default volume
sxmo_audioout.sh Speaker
amixer sset 'Line Out Source' 'Mono Differential','Mono Differential'
amixer set "Line Out" 50%

# Play a funky startup tune
mpv --quiet --no-video /usr/share/sxmo/startup.wav &

# enter SIM PIN (WARNING! SECURITY RISK!)
#  the sleep is there because the modem
#  might take a bit to be available
#  after first boot.
#sleep 20 && mmcli -i 0 --pin 1234

# turn on modemmonitor on login
# Note: if the modemmonitor is not on you can
# not receive texts/calls!
#sleep 22 && sxmo_modemmonitortoggle.sh on &



### Configuration Parameters ###

# Note that this is just a subset of all available
# parameters, see the sxmo documentation for more.

# Use firefox as default browser
[ -z "$BROWSER" ] && export BROWSER=firefox

# Prepopulate Subreddits menu with custom subreddits
#export SXMO_SUBREDDITS="postmarketos pinephoneOfficial pinephone unixporn"

# Temporarily wake every 5 minutes during sleep
#(useful for getting notifications)
#export SXMO_RTCWAKEINTERVAL=300

# Immediately turn the screen off when locking the device
#export SXMO_LOCK_SCREEN_OFF=1

# Immediately suspend the phone when locking
#export SXMO_LOCK_SUSPEND=1

# When scrolling past the beginning or end of a menu, wrap it around:
#export DMENU_WRAP_AROUND=1

# Enable audio feedback on keypress
#export KEYBOARD_ARGS="-o | clickclack -f /usr/share/sxmo/keypress.wav"

# Or, enable vibration feedback on keypress
#export KEYBOARD_ARGS="-o | clickclack -v"

A resources/background.jpg => resources/background.jpg +0 -0
A resources/keypress.wav => resources/keypress.wav +0 -0
A resources/startup.ogg => resources/startup.ogg +0 -0
M scripts/core/sxmo_xinit.sh => scripts/core/sxmo_xinit.sh +3 -6
@@ 67,17 67,14 @@ daemonsneedingdbus() {

defaultconfig() {
	mkdir -p "$XDG_CONFIG_HOME/sxmo"

	echo '#!/usr/bin/env sh

conky -c /usr/share/sxmo/appcfg/conky.conf -d
' > "$XDG_CONFIG_HOME/sxmo/xinit"
	cp /usr/share/sxmo/appcfg/xinit_template "$XDG_CONFIG_HOME/sxmo/xinit"
	chmod u+rx "$XDG_CONFIG_HOME/sxmo/xinit"
}

customxinit() {
	set -o allexport
	# shellcheck disable=SC1090
	[ ! -f "$XDG_CONFIG_HOME/sxmo/xinit" ] && defaultconfig
	[ ! -e "$XDG_CONFIG_HOME/sxmo/xinit" ] && defaultconfig

	# shellcheck disable=SC1090
	. "$XDG_CONFIG_HOME/sxmo/xinit"