From d82a7fa5fbdf2c4f42a91f34dbb76455653c8afd Mon Sep 17 00:00:00 2001
From: ayham <altffour@protonmail.com>
Date: Fri, 8 Apr 2022 07:39:56 +0300
Subject: [PATCH] switch to pipewire

---
 .config/X11/common.sh | 19 +++++++++++++++++++
 .config/X11/dwm-xinit | 19 +------------------
 .config/emacs/init.el |  2 +-
 3 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 .config/X11/common.sh

diff --git a/.config/X11/common.sh b/.config/X11/common.sh
new file mode 100644
index 0000000..c8bc801
--- /dev/null
+++ b/.config/X11/common.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+source ~/.config/env &
+
+/usr/bin/pipewire & /usr/bin/pipewire-pulse & /usr/bin/wireplumber &
+
+xset s 300 5 &
+xss-lock -n /usr/lib/xsecurelock/dimmer -l -- xsecurelock &
+keynav &
+light -S 100 &
+xset r rate 300 50 &
+umask 002 &
+keychain --absolute --dir "$XDG_RUNTIME_DIR"/keychain --eval --quiet id_ed25519
+unclutter --timeout 2 --start-hidden &
+xsetroot -xcf /usr/share/icons/WhiteSur-cursors/cursors/left_ptr 24 &
+xmodmap ~/.config/Xmodmap &
+toggle_touchpad &
+xhost +si:localuser:"$USER" &
+mpd &
diff --git a/.config/X11/dwm-xinit b/.config/X11/dwm-xinit
index 48a1d22..d2a31fb 100644
--- a/.config/X11/dwm-xinit
+++ b/.config/X11/dwm-xinit
@@ -7,25 +7,8 @@ exec xrdb ~/.cache/wal/colors.Xresources &
 exec xrdb -merge ~/.config/Xresources &
 exec slstatus &
 exec picom -CG --config ~/.config/picom.conf &
-#setxkbmap -model -layout us,us -variant ,workman -option grp:lctrl_rshift_toggle &
-xmodmap ~/.config/Xmodmap &
-sleep 0.5s
-exec mpd &
-source ~/.config/env &
-exec xset s 300 5 &
-exec xss-lock -n /usr/lib/xsecurelock/dimmer -l -- xsecurelock &
-exec keynav &
-exec light -S 100 &
-xset r rate 300 50 &
-umask 002 &
-eval $(keychain --absolute --dir "$XDG_RUNTIME_DIR"/keychain --eval --quiet id_ed25519)
+sh ~/.config/X11/common.sh
 exec dstartup &
-exec xhost +si:localuser:"$USER" &
-exec unclutter --timeout 2 --start-hidden &
-exec toggle_touchpad &
-exec xsetroot -xcf /usr/share/icons/WhiteSur-cursors/cursors/left_ptr 24 &
-#exec xsnow &
-exec emacs --daemon &
 # relaunch DWM if the binary changes, otherwise bail
 csum=""
 new_csum=$(sha1sum $(which dwm))
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 9fadae0..1f15b2d 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -28,7 +28,7 @@
  '(company-quickhelp-color-foreground "#ABB2BF")
  '(custom-enabled-themes '(xresources))
  '(custom-safe-themes
-   '("e5dc5b39fecbeeb027c13e8bfbf57a865be6e0ed703ac1ffa96476b62d1fae84" "dad622637530638a2140b83812e159a06b4791eb2f67ffd4abb4ff671b062d0b" "aa72e5b41780bfff2ff55d0cc6fcd4b42153386088a4025fed606c1099c2d9b8" "5d6cc3e22172f051d68c0c95d79f3dff0e800f2d107f6f6b9220ed5380285c50" "b89a4f5916c29a235d0600ad5a0849b1c50fab16c2c518e1d98f0412367e7f97" "0dd2666921bd4c651c7f8a724b3416e95228a13fca1aa27dc0022f4e023bf197" "b73a23e836b3122637563ad37ae8c7533121c2ac2c8f7c87b381dd7322714cd0" "d0fb0c463d5d61e93f920e0fd1aa4c023bf719874b4d08f7f473b46c4adc0682" "6fc03df7304728b1346091dd6737cb0379f348ddc9c307f8b410fba991b3e475" "9f1d0627e756e58e0263fe3f00b16d8f7b2aca0882faacdc20ddd56a95acb7c2" "7397cc72938446348521d8061d3f2e288165f65a2dbb6366bb666224de2629bb" default))
+   '("02fff7eedb18d38b8fd09a419c579570673840672da45b77fde401d8708dc6b5" "e5dc5b39fecbeeb027c13e8bfbf57a865be6e0ed703ac1ffa96476b62d1fae84" "dad622637530638a2140b83812e159a06b4791eb2f67ffd4abb4ff671b062d0b" "aa72e5b41780bfff2ff55d0cc6fcd4b42153386088a4025fed606c1099c2d9b8" "5d6cc3e22172f051d68c0c95d79f3dff0e800f2d107f6f6b9220ed5380285c50" "b89a4f5916c29a235d0600ad5a0849b1c50fab16c2c518e1d98f0412367e7f97" "0dd2666921bd4c651c7f8a724b3416e95228a13fca1aa27dc0022f4e023bf197" "b73a23e836b3122637563ad37ae8c7533121c2ac2c8f7c87b381dd7322714cd0" "d0fb0c463d5d61e93f920e0fd1aa4c023bf719874b4d08f7f473b46c4adc0682" "6fc03df7304728b1346091dd6737cb0379f348ddc9c307f8b410fba991b3e475" "9f1d0627e756e58e0263fe3f00b16d8f7b2aca0882faacdc20ddd56a95acb7c2" "7397cc72938446348521d8061d3f2e288165f65a2dbb6366bb666224de2629bb" default))
  '(exwm-floating-border-color "#646464")
  '(flymake-error-bitmap '(flymake-double-exclamation-mark modus-themes-fringe-red))
  '(flymake-note-bitmap '(exclamation-mark modus-themes-fringe-cyan))