jab2870/sxmo-utils
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Restructure configs into seperate folder

Browse source
This commit is contained in:
Miles Alan 2020-07-12 11:50:30 -05:00
parent d713b19199
commit 0801bb1adb
16 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -22,13 +22,13 @@ programs/sxmo_vibratepine:
install: programs/sxmo_setpineled programs/sxmo_setpinebacklight programs/sxmo_screenlock programs/sxmo_megiaudioroute programs/sxmo_vibratepine install: programs/sxmo_setpineled programs/sxmo_setpinebacklight programs/sxmo_screenlock programs/sxmo_megiaudioroute programs/sxmo_vibratepine
mkdir -p $(PREFIX)/usr/share/sxmo mkdir -p $(PREFIX)/usr/share/sxmo
cp configs/* $(PREFIX)/usr/share/sxmo cp -r configs/* $(PREFIX)/usr/share/sxmo
mkdir -p $(PREFIX)/etc/alsa/conf.d/ mkdir -p $(PREFIX)/etc/alsa/conf.d/
cp configs/alsa_sxmo_enable_dmix.conf $(PREFIX)/etc/alsa/conf.d/ cp configs/alsa/alsa_sxmo_enable_dmix.conf $(PREFIX)/etc/alsa/conf.d/
mkdir -p $(PREFIX)/etc/polkit-1/rules.d mkdir -p $(PREFIX)/etc/polkit-1/rules.d
cp configs/00-sxmo.rules $(PREFIX)/etc/polkit-1/rules.d/ cp configs/polkit/00-sxmo.rules $(PREFIX)/etc/polkit-1/rules.d/
mkdir -p $(PREFIX)/usr/bin mkdir -p $(PREFIX)/usr/bin
cp scripts/*/* $(PREFIX)/usr/bin cp scripts/*/* $(PREFIX)/usr/bin

0
configs/alsa_sxmo_enable_dmix.conf → configs/alsa/alsa_sxmo_enable_dmix.conf
View file

0
configs/default_alsa_sound.conf → configs/alsa/default_alsa_sound.conf
View file

0
configs/conky.conf → configs/appcfg/conky.conf
View file

0
configs/dunst.conf → configs/appcfg/dunst.conf
View file

0
configs/places_for_gps.tsv → configs/appcfg/places_for_gps.tsv
View file

Can't render this file because it has a wrong number of fields in line 2.

0
configs/sxmo_sfeedrc → configs/appcfg/sxmo_sfeedrc
View file

0
configs/xmodmap_caps_esc → configs/appcfg/xmodmap_caps_esc
View file

0
configs/xresources_xcalc.xr → configs/appcfg/xresources_xcalc.xr
View file

0
configs/00-sxmo.rules → configs/polkit/00-sxmo.rules
View file

2
scripts/appscripts/sxmo_rss.sh
View file

@ -4,7 +4,7 @@ if [ -f "$XDG_CONFIG_HOME/sxmo/sfeedrc" ]; then
elif [ -f "$HOME/.sfeed/sfeedrc" ]; then elif [ -f "$HOME/.sfeed/sfeedrc" ]; then
SFEEDCONF="$HOME/.sfeed/sfeedrc" SFEEDCONF="$HOME/.sfeed/sfeedrc"
else else
SFEEDCONF=/usr/share/sxmo/sxmo_sfeedrc SFEEDCONF=/usr/share/sxmo/appcfg/sxmo_sfeedrc
fi fi
die() { die() {

2
scripts/appscripts/sxmo_weather.sh
View file

@ -1,5 +1,5 @@
#!/usr/bin/env sh #!/usr/bin/env sh
[ -z "$SXMO_GPSLOCATIONSFILES" ] && SXMO_GPSLOCATIONSFILES="/usr/share/sxmo/places_for_gps.tsv" [ -z "$SXMO_GPSLOCATIONSFILES" ] && SXMO_GPSLOCATIONSFILES="/usr/share/sxmo/appcfg/places_for_gps.tsv"
ROWHOURS=12 ROWHOURS=12
WEATHERXML="" WEATHERXML=""

2
scripts/core/sxmo_gpsutil.sh
View file

@ -1,5 +1,5 @@
#!/usr/bin/env sh #!/usr/bin/env sh
[ -z "$SXMO_GPSLOCATIONSFILES" ] && SXMO_GPSLOCATIONSFILES="/usr/share/sxmo/places_for_gps.tsv" [ -z "$SXMO_GPSLOCATIONSFILES" ] && SXMO_GPSLOCATIONSFILES="/usr/share/sxmo/appcfg/places_for_gps.tsv"
CTILESIZE=256 CTILESIZE=256
CLN2=0.693147180559945309417 CLN2=0.693147180559945309417
CPI=3.14159265358979323846 CPI=3.14159265358979323846

2
scripts/core/sxmo_statusbarupdate.sh Executable file
View file

@ -0,0 +1,2 @@
#!/usr/bin/env sh
pgrep -f "$(command -v sxmo_statusbar.sh)" | xargs kill -USR1 &

10
scripts/core/sxmo_xinit.sh
View file

@ -8,11 +8,11 @@ command -v "$BROWSER" || export BROWSER=surf
[ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME=~/.config [ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME=~/.config
# Setup audio and a few sensible X defaults # Setup audio and a few sensible X defaults
alsactl --file /usr/share/sxmo/default_alsa_sound.conf restore alsactl --file /usr/share/sxmo/alsa/default_alsa_sound.conf restore
xmodmap /usr/share/sxmo/xmodmap_caps_esc xmodmap /usr/share/sxmo/appcfg/xmodmap_caps_esc
xsetroot -mod 3 2 -fg '#000000' -bg '#888888' xsetroot -mod 3 2 -fg '#000000' -bg '#888888'
xset s off -dpms xset s off -dpms
xrdb /usr/share/sxmo/xresources_xcalc.xr xrdb /usr/share/sxmo/appcfg/xresources_xcalc.xr
synclient TapButton1=1 TapButton2=3 TapButton3=2 MinSpeed=0.25 synclient TapButton1=1 TapButton2=3 TapButton3=2 MinSpeed=0.25
# Start daemons # Start daemons
@ -20,7 +20,7 @@ pkill conky
if [ -e "$XDG_CONFIG_HOME/sxmo/conky.conf" ]; then if [ -e "$XDG_CONFIG_HOME/sxmo/conky.conf" ]; then
conky -c $XDG_CONFIG_HOME/sxmo/conky.conf -d conky -c $XDG_CONFIG_HOME/sxmo/conky.conf -d
else else
conky -c /usr/share/sxmo/conky.conf -d conky -c /usr/share/sxmo/appcfg/conky.conf -d
fi fi
keynav & keynav &
autocutsel & autocutsel &
@ -34,7 +34,7 @@ set +o allexport
# Startup dbus, dunst in dbus path, lisgd in dbus path, and finally dwm # Startup dbus, dunst in dbus path, lisgd in dbus path, and finally dwm
exec dbus-run-session sh -c " exec dbus-run-session sh -c "
dunst -conf /usr/share/sxmo/dunst.conf & dunst -conf /usr/share/sxmo/appcfg/dunst.conf &
sxmo_lisgdstart.sh & sxmo_lisgdstart.sh &
dwm 2> ~/.dwm.log dwm 2> ~/.dwm.log
" "

2
scripts/modem/sxmo_modemcall.sh
View file

@ -7,7 +7,7 @@ fatalerr() {
# E.g. hangup all calls, switch back to default audio, notify user, and die # E.g. hangup all calls, switch back to default audio, notify user, and die
sxmo_vibratepine 1000 & sxmo_vibratepine 1000 &
mmcli -m "$(mmcli -L | grep -oE 'Modem\/([0-9]+)' | cut -d'/' -f2)" --voice-hangup-all mmcli -m "$(mmcli -L | grep -oE 'Modem\/([0-9]+)' | cut -d'/' -f2)" --voice-hangup-all
alsactl --file /usr/share/sxmo/default_alsa_sound.conf restore alsactl --file /usr/share/sxmo/alsa/default_alsa_sound.conf restore
notify-send "$1" notify-send "$1"
setsid -f sh -c 'sleep 2; smxo_statusbarupdate.sh' setsid -f sh -c 'sleep 2; smxo_statusbarupdate.sh'
kill -9 0 kill -9 0