Skip to content

Commit

Permalink
22.04: Fixing bt-agent
Browse files Browse the repository at this point in the history
  • Loading branch information
marigostra committed Nov 25, 2022
1 parent 8f3d0a8 commit bc9125c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 19 deletions.
4 changes: 2 additions & 2 deletions ubuntu/22.04/dist/profile/.xbindkeysrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

"pactl set-sink-volume 0 -10%"
"pactl set-sink-volume @DEFAULT_SINK@ -10%"
XF86AudioLowerVolume
"pactl set-sink-volume 0 +10%"
"pactl set-sink-volume @DEFAULT_SINK@ +10%"
XF86AudioRaiseVolume
7 changes: 4 additions & 3 deletions ubuntu/22.04/scripts/scripts.d/10-packages
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
install-pkg acpi ntfs-3g smartmontools udisks2 cpufrequtils
install-pkg unrar zip p7zip-full
install-pkg curl wget net-tools openssh-server fetchmail procmail unattended-upgrades bluez-tools
#install-pkg dvd+rw-tools growisofs
install-pkg openjfx #openjdk-18-jre
install-pkg dvd+rw-tools growisofs
install-pkg openjfx
install-pkg gcc gdb make git
install-pkg yasr xterm
install-pkg lame sox mpg123 mplayer xbindkeys vorbis-tools geeqie
install-pkg ffmpeg lame sox mpg123 mplayer xbindkeys vorbis-tools geeqie
install-pkg language-pack-en language-pack-en-base
install-pkg texlive-latex-recommended texlive-latex-extra texlive-metapost texlive-lang-cyrillic texlive-fonts-recommended
install-pkg cm-super poppler-utils tesseract-ocr-rus
install-pkg lilypond timidity
install-pkg python3-pip yt-dlp
2 changes: 1 addition & 1 deletion ubuntu/22.04/scripts/scripts.d/11-dist
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ find ./dist -name .gitignore -delete
[ -d ./dist/sbin ] && cp -r ./dist/sbin/. $LWRISO_ROOT/sbin/ ||:

install-pkg luwrain
ln -s luwrain-base-1.9.3.jar $LWRISO_ROOT/usr/share/luwrain/jar/luwrain-base.jar
#ln -s luwrain-base-1.9.3.jar $LWRISO_ROOT/usr/share/luwrain/jar/luwrain-base.jar
4 changes: 2 additions & 2 deletions ubuntu/22.04/scripts/scripts.d/21-system-start
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
mkdir $LWRISO_ROOT/etc/luwrain
cat <<EOF > $LWRISO_ROOT/etc/luwrain/system-start
#!/bin/bash
# Copyright 2022 Michael Pozhidaev <[email protected]>
# Copyright $(date +%Y) Michael Pozhidaev <[email protected]>

bt-agent-d --capability=NoInputNoOutput
bt-agent -d --capability=NoInputNoOutput

if [ -r /etc/luwrain/default-user ]; then
USER="\$(cat /etc/luwrain/default-user)"
Expand Down
19 changes: 8 additions & 11 deletions ubuntu/22.04/scripts/scripts.d/60-xinitrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ chmod 755 $LWRISO_ROOT/home/$LWRISO_USER/.local/bin/dwm-autolaunch

if [ "$LWRISO_LANG" == en ]; then
cat <<EOF > $LWRISO_ROOT/home/$LWRISO_ROOT/.xinitrc
# Copyright 2022 Michael Pozhidaev <[email protected]>
# Copyright $(date +%Y) Michael Pozhidaev <[email protected]>

export PATH=~/.local/bin:$PATH
export LANG=en_US.UTF-8
Expand All @@ -24,24 +24,21 @@ fi

if [ "$LWRISO_LANG" == ru ]; then
cat <<EOF > $LWRISO_ROOT/home/$LWRISO_USER/.xinitrc
# Copyright 2022 Michael Pozhidaev <[email protected]>
# Copyright $(date +%Y) Michael Pozhidaev <[email protected]>

export PATH=~/.local/bin:$PATH
export LANG=ru_RU.UTF-8
export VOICEMAN_EMACSPEAK_RATE_FRACTION=2
#export PULSE_SERVER=/run/pulse/native
export VOICEMAN_LIBAO_DRIVER=alsa

pulseaudio -D ||:

if ! [ -e /tmp/voiceman.socket ]; then
/usr/bin/voicemand -d
fi

setxkbmap -layout "us,ru"
setxkbmap -option "grp:caps_toggle,grp_led:scroll"
xbindkeys


pulseaudio -D ||:
export VOICEMAN_EMACSPEAK_RATE_FRACTION=2
export VOICEMAN_LIBAO_DRIVER=alsa
if ! [ -e /tmp/voiceman.socket ]; then /usr/bin/voicemand -d; fi

exec dwm-luwrain
EOF
fi

0 comments on commit bc9125c

Please sign in to comment.