Compare commits

..

7 Commits

9 changed files with 51 additions and 22 deletions

View File

@@ -38,3 +38,5 @@ environment:
MACHINE_HAS_NEXTCLOUD: "true" MACHINE_HAS_NEXTCLOUD: "true"
MACHINE_HAS_RESTIC_BACKUP: "false" MACHINE_HAS_RESTIC_BACKUP: "false"
MACHINE_DEFAULT_SCREENPROFILE: "ares" MACHINE_DEFAULT_SCREENPROFILE: "ares"
MACHINE_RESOLUTION_X: "2560"
MACHINE_RESOLUTION_Y: "1440"

View File

@@ -51,3 +51,5 @@ environment:
MACHINE_TYPE: "laptop" MACHINE_TYPE: "laptop"
MACHINE_HAS_KEEPASSX: "true" MACHINE_HAS_KEEPASSX: "true"
MACHINE_HAS_RESTIC_BACKUP: "true" MACHINE_HAS_RESTIC_BACKUP: "true"
MACHINE_RESOLUTION_X: "1920"
MACHINE_RESOLUTION_Y: "1080"

View File

@@ -1,5 +1,6 @@
[Unit] [Unit]
Wants=blueman.service Wants=blueman.service
Wants=dpms.service
Wants=dunst.service Wants=dunst.service
Wants=firefox.service Wants=firefox.service
Wants=gpg-agent.service Wants=gpg-agent.service

View File

@@ -0,0 +1,7 @@
[Unit]
BindsTo=autostart.target
[Service]
Type=oneshot
ExecStart=xset s off
ExecStart=xset dpms 0 0 300

View File

@@ -49,6 +49,8 @@ systemd redshift {
user = true user = true
format = "  " format = "  "
on_click 1 = "exec $HOME/.i3/scripts/toggle-app redshift" on_click 1 = "exec $HOME/.i3/scripts/toggle-app redshift"
color_bad = '#F4Bf75'
color_degraded = '#F4Bf75'
} }
systemd spotify { systemd spotify {
@@ -56,6 +58,8 @@ systemd spotify {
user = true user = true
format = "  " format = "  "
on_click 1 = "exec $HOME/.i3/scripts/toggle-app spotify" on_click 1 = "exec $HOME/.i3/scripts/toggle-app spotify"
color_bad = '#F4Bf75'
color_degraded = '#F4Bf75'
} }
yubikey { yubikey {
@@ -71,6 +75,7 @@ wifi {
bitrate_bad = 0 bitrate_bad = 0
bitrate_degraded = 0 bitrate_degraded = 0
format = "  {signal_percent} {ssid} |  down " format = "  {signal_percent} {ssid} |  down "
down_color = "good"
} }
spotify { spotify {

View File

@@ -3,7 +3,7 @@
### From http://www.archlinux.org/index.php/i3 ### From http://www.archlinux.org/index.php/i3
_logfile="$LOGDIR/i3/i3exit.log" _logfile="$LOGDIR/i3/i3exit.log"
LOCKSCREEN="$LIBDIR/wallpaper/lockscreen" LOCKSCREEN="$LIBDIR/lockscreen"
_fallback_color="000000" _fallback_color="000000"
@@ -19,29 +19,34 @@ lock()
{ {
set -x set -x
playing=0 playing=0
# if dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' string:'PlaybackStatus'|grep -q Playing ; then if [[ "$(playerctl status)" == "Playing" ]] ; then
# playing=1 playing=1
# fi fi
# echo $playing if (( $playing )) ; then
# (( $playing )) && dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Pause playerctl pause
fi
if [[ -f "$LOCKSCREEN" ]] ; then if [[ -f "$LOCKSCREEN" ]] ; then
resized_lockscreen=$(mktemp)
convert "${LOCKSCREEN}" -resize "${MACHINE_RESOLUTION_X}x${MACHINE_RESOLUTION_Y}" "${resized_lockscreen}"
i3lock --nofork --show-failed-attempts --ignore-empty-password \ i3lock --nofork --show-failed-attempts --ignore-empty-password \
--image "$LOCKSCREEN" --image "${resized_lockscreen}"
rm "${resized_lockscreen}"
else else
i3lock --nofork --show-failed-attempts --ignore-empty-password \ i3lock --nofork --show-failed-attempts --ignore-empty-password \
--color "$_fallback_color" --color "$_fallback_color"
fi fi
# (( $playing )) && dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Play if (( $playing )) ; then
playerctl play
fi
} }
screen_off() { screen_off() {
:
xset dpms force off xset dpms force off
} }
reset_screen() { reset_screen() {
xset -dpms systemctl --user restart dpms.service
xset s off
} }
lock_and_screen_off() { lock_and_screen_off() {
@@ -49,16 +54,11 @@ lock_and_screen_off() {
_pid=$! _pid=$!
dunstctl disable dunstctl disable
screen_off screen_off
xset dpms 0 0 5
wait $_pid wait $_pid
dunstctl enable dunstctl enable
reset_screen reset_screen
} }
disable_lid_switch() {
grep "^${ACPI_LID_NAME}.*enabled" /proc/acpi/wakeup && echo " ${ACPI_LID_NAME}" | sudo tee /proc/acpi/wakeup
}
signal="$1" signal="$1"
log "[I] Received signal \"$signal\"." log "[I] Received signal \"$signal\"."
@@ -74,13 +74,11 @@ case "$signal" in
suspend) suspend)
log "[I] Suspending." log "[I] Suspending."
lock & lock &
disable_lid_switch
sleep 0.1 sleep 0.1
systemctl suspend systemctl suspend
;; ;;
hibernate) hibernate)
log "[I] Hibernating." log "[I] Hibernating."
disable_lid_switch
sudo systemctl hibernate sudo systemctl hibernate
;; ;;
reboot) reboot)

View File

@@ -12,6 +12,9 @@ switch_on() {
dunstctl disable & dunstctl disable &
systemctl --user --no-block stop redshift.service systemctl --user --no-block stop redshift.service
systemctl --user --no-block stop spotify.service systemctl --user --no-block stop spotify.service
~/.i3/scripts/bar-update "external_script presentation_mode"
~/.i3/scripts/bar-update "systemd redshift"
~/.i3/scripts/bar-update "systemd spotify"
} }
switch_off() { switch_off() {
@@ -19,6 +22,9 @@ switch_off() {
dunstctl enable & dunstctl enable &
systemctl --user --no-block start redshift.service systemctl --user --no-block start redshift.service
systemctl --user --no-block start spotify.service systemctl --user --no-block start spotify.service
~/.i3/scripts/bar-update "external_script presentation_mode"
~/.i3/scripts/bar-update "systemd redshift"
~/.i3/scripts/bar-update "systemd spotify"
} }

View File

@@ -2,13 +2,13 @@
case "$1" in case "$1" in
toggle) toggle)
cmd="PlayPause" cmd="play-pause"
;; ;;
next) next)
cmd="Next" cmd="next"
;; ;;
previous) previous)
cmd="Previous" cmd="previous"
;; ;;
*) *)
echo "wrong argument $1" echo "wrong argument $1"
@@ -16,5 +16,5 @@ previous)
;; ;;
esac esac
dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player."${cmd}" playerctl "${cmd}"
~/.i3/scripts/bar-update spotify ~/.i3/scripts/bar-update spotify

View File

@@ -485,6 +485,14 @@ packages:
fedora: [] fedora: []
ubuntu: [] ubuntu: []
archlinux: ["stress"] archlinux: ["stress"]
mpris:
fedora: []
ubuntu: []
archlinux: ["playerctl"]
imagemagick:
fedora: []
ubuntu: []
archlinux: ["imagemagick"]
remove: remove:
mousepad: mousepad: