From 64be233740efd241c9ff105b634745cdce068bf0 Mon Sep 17 00:00:00 2001
From: Gregory Eremin <g@erem.in>
Date: Wed, 22 Feb 2023 15:33:55 +0100
Subject: [PATCH] Updates

---
 bash/alias.sh                                |  3 +++
 bash/bashrc.sh                               |  2 ++
 bash/secrets.bash                            |  1 +
 bin/log-display-standby-state                |  5 +++++
 bin/pulseaudio-setup.sh                      |  5 +++++
 git/gitignore                                |  1 +
 sway/config                                  |  4 ++--
 sway/config.d/displays                       | 10 +++++-----
 systemd/autocutsel.service                   | 12 ++++++++++++
 systemd/display-standby-state-logger.service |  8 ++++++++
 systemd/display-standby-state-logger.timer   | 11 +++++++++++
 systemd/display-switch.service               |  9 +++++++++
 systemd/swayidle.service                     |  7 ++++---
 systemd/wl-clipsync.service                  |  2 +-
 14 files changed, 69 insertions(+), 11 deletions(-)
 create mode 100644 bash/secrets.bash
 create mode 100755 bin/log-display-standby-state
 create mode 100755 bin/pulseaudio-setup.sh
 create mode 100644 systemd/autocutsel.service
 create mode 100644 systemd/display-standby-state-logger.service
 create mode 100644 systemd/display-standby-state-logger.timer
 create mode 100644 systemd/display-switch.service

diff --git a/bash/alias.sh b/bash/alias.sh
index ac9122a..4080f61 100644
--- a/bash/alias.sh
+++ b/bash/alias.sh
@@ -1,6 +1,8 @@
 # General
 alias ll="ls -lAFh --color"
 alias dedup="awk '!visited[$0]++'"
+alias dfh="df -h | grep -v '/var/lib/docker\|/snap/\|tmpfs'"
+alias ,ssh-agent-forwarding="eval \`ssh-agent\` && ssh-add ~/.ssh/id_rsa"
 
 # Git
 alias ga="git add -u; git add .; git status -sb"
@@ -27,5 +29,6 @@ alias goi="go install ./..."
 alias gg='rg -g "*.go"'
 
 alias ytdl="youtube-dl -f 'bestvideo+bestaudio'"
+#alias ytdl="youtube-dl -f 'bestvideo[ext=mp4]+bestaudio[ext=m4a]'"
 alias cr="cargo run --quiet --"
 
diff --git a/bash/bashrc.sh b/bash/bashrc.sh
index a128475..8ea7f97 100644
--- a/bash/bashrc.sh
+++ b/bash/bashrc.sh
@@ -42,3 +42,5 @@ export PATH="$HOME/.local/bin:$PATH"
 # Disable Ruby 2.7 deprecation warnings
 # export RUBYOPT='-W:no-deprecated -W:no-experimental'
 export RUBYOPT=
+
+alias sysupdate="sudo pacman -Sy archlinux-keyring && sudo pacman -Su && PATH=/usr/bin:$PATH yay -Syu"
diff --git a/bash/secrets.bash b/bash/secrets.bash
new file mode 100644
index 0000000..a9bf588
--- /dev/null
+++ b/bash/secrets.bash
@@ -0,0 +1 @@
+#!/bin/bash
diff --git a/bin/log-display-standby-state b/bin/log-display-standby-state
new file mode 100755
index 0000000..bd42be0
--- /dev/null
+++ b/bin/log-display-standby-state
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+DISPLAY=:0.0 xset -q | grep -q "Monitor is Off"
+echo $? > $HOME/.cache/node-exporter/display-standby-state
+
diff --git a/bin/pulseaudio-setup.sh b/bin/pulseaudio-setup.sh
new file mode 100755
index 0000000..fd0fa4e
--- /dev/null
+++ b/bin/pulseaudio-setup.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+pactl unload-module 7
+pactl unload-module 8
+pactl set-card-profile 0 'output:iec958-stereo+input:iec958-stereo'
diff --git a/git/gitignore b/git/gitignore
index 3d9e8b4..54b1f38 100644
--- a/git/gitignore
+++ b/git/gitignore
@@ -14,3 +14,4 @@ vendor/gems
 
 # VSCode
 *.code-workspace
+.vscode
diff --git a/sway/config b/sway/config
index 3042ac8..96075f4 100644
--- a/sway/config
+++ b/sway/config
@@ -21,8 +21,8 @@ include @sysconfdir@/sway/config.d/*
 include $HOME/.config/sway/config.d/*
 
 # Color Scheme
-include $HOME/.config/sway/themes/dracula2
-# include $HOME/.config/sway/themes/default
+# include $HOME/.config/sway/themes/dracula2
+include $HOME/.config/sway/themes/default
 
 exec wl-clipsync
 exec mako
diff --git a/sway/config.d/displays b/sway/config.d/displays
index 8664b20..279b86f 100644
--- a/sway/config.d/displays
+++ b/sway/config.d/displays
@@ -12,13 +12,13 @@ output "Unknown U2790B 0x000007CE" scale 1.5
 # Office Dell 24"
 # output "Dell Inc. DELL U2412M YPPY07AV1AHB" position 0 0
 output "Dell Inc. DELL U2421HE CD8LV83" position 0 0
-
 # Office Dell 27" 1080p
 output "Dell Inc. DELL P2719HC 6T1Y223" position 0 0
-
-# Maison n9 TV
-output "Samsung Electric Company SAMSUNG 0x00000701" res 3840x2160 scale 2 position 0 0
-
 # Current office 4K LG screen
 output "LG Electronics LG HDR 4K 0x0000E7EC" position 0 0 scale 1.5 res 3840x2160
 
+# Maison n9 TV
+output "Samsung Electric Company SAMSUNG 0x00000701" res 3840x2160 scale 2 position 0 0
+# Dom Perignon TV
+output "BenQ Corporation ZOWIE RL LCD 94H02169SL0" pos 4920 0 transform 270
+
diff --git a/systemd/autocutsel.service b/systemd/autocutsel.service
new file mode 100644
index 0000000..8044221
--- /dev/null
+++ b/systemd/autocutsel.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Autocutsel
+
+[Service]
+Type = forking
+Restart = on-failure
+RestartSec = 10
+ExecStartPre = /usr/bin/autocutsel -fork
+ExecStart = /usr/bin/autocutsel -selection PRIMARY -fork
+
+[Install]
+WantedBy=default.target
diff --git a/systemd/display-standby-state-logger.service b/systemd/display-standby-state-logger.service
new file mode 100644
index 0000000..8d100db
--- /dev/null
+++ b/systemd/display-standby-state-logger.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Logs display standby state to a file
+
+[Service]
+ExecStart=%h/dotfiles/bin/log-display-standby-state
+
+[Install]
+WantedBy=default.target
diff --git a/systemd/display-standby-state-logger.timer b/systemd/display-standby-state-logger.timer
new file mode 100644
index 0000000..d55a61b
--- /dev/null
+++ b/systemd/display-standby-state-logger.timer
@@ -0,0 +1,11 @@
+[Unit]
+Description=Log display standby state every minute
+Requires=display-standby-state-logger.service
+
+[Timer]
+Unit=display-standby-state-logger.service
+OnCalendar=*-*-* *:*:00
+
+[Install]
+WantedBy=timers.target
+
diff --git a/systemd/display-switch.service b/systemd/display-switch.service
new file mode 100644
index 0000000..95c4d47
--- /dev/null
+++ b/systemd/display-switch.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Automatic display switch
+
+[Service]
+ExecStart=display_switch
+
+[Install]
+WantedBy=default.target
+
diff --git a/systemd/swayidle.service b/systemd/swayidle.service
index 6decdaa..02398e2 100644
--- a/systemd/swayidle.service
+++ b/systemd/swayidle.service
@@ -3,9 +3,10 @@ Description=swayidle: Manages lockscreen and display
 
 [Service]
 ExecStart=/sbin/swayidle \
-    timeout 300 /home/gregory/dotfiles/bin/screens-lock \
-    timeout 10 /home/gregory/dotfiles/bin/screens-off \
-    resume /home/gregory/dotfiles/bin/screens-on
+    timeout 300 %h/dotfiles/bin/screens-lock \
+    timeout 60 %h/dotfiles/bin/screens-off \
+    resume %h/dotfiles/bin/screens-on \
+    before-sleep %h/dotfiles/bin/screens-lock
 
 [Install]
 WantedBy=default.target
diff --git a/systemd/wl-clipsync.service b/systemd/wl-clipsync.service
index 2b40b11..9bb67c4 100644
--- a/systemd/wl-clipsync.service
+++ b/systemd/wl-clipsync.service
@@ -2,7 +2,7 @@
 Description=wl-clipsync: Synchronizes primary and clipboard paste buffers
 
 [Service]
-ExecStart=/home/gregory/go/path/bin/wl-clipsync -i 300ms
+ExecStart=%h/go/path/bin/wl-clipsync -i 300ms
 
 [Install]
 WantedBy=default.target