From c6f68bcca9c568c57e842fb405ccd4158bdd1e3d Mon Sep 17 00:00:00 2001
From: yuzu-eva <stevenhu@web.de>
Date: Tue, 13 Dec 2022 10:43:56 +0100
Subject: small update

---
 .bash_aliases        |  9 +++++----
 .config/mpd/mpd.conf | 16 +++++++++-------
 .emacs.d/config.el   |  2 ++
 .emacs.d/packages.el |  2 +-
 .xinitrc             | 14 +++++++++-----
 5 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/.bash_aliases b/.bash_aliases
index 46e9dcd..3e8c813 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -19,8 +19,8 @@ alias cwp='xwallpaper --maximize "$(/usr/bin/ls -1 -d /hdd/pics/wallpaper/* | sh
 alias fd='fdfind'
 
 # Control Audio
-alias headset='pactl set-default-sink alsa_output.pci-0000_29_00.0.analog-stereo'
-alias speakers='pactl set-default-sink alsa_output.pci-0000_31_00.4.analog-stereo'
+alias headset="wpctl set-default $(wpctl status | grep 'Headphones' | cut -b11-12)"
+alias speakers="wpctl set-default $(wpctl status | grep 'Speakers' | cut -b11-12)"
 alias setvol='pactl set-sink-volume @DEFAULT_SINK@'
 
 # Monitor / Resolution settings, mainly for playing old-ass games
@@ -37,6 +37,7 @@ alias cn='clear;macchina'
 alias grep='grep --color=auto -i'
 
 alias ls='ls -hl --color=always --group-directories-first'
+alias la='ls -a'
 
 alias nnn='nnn -Hde'
 
@@ -70,7 +71,7 @@ record() {
         -filter_complex amix=inputs=2 \
         -vcodec libx265 -s 1920x1080 \
         -acodec libvorbis -ab 128k \
-        ~/vids/$1.mkv
+        ~/vids/"$1".mkv
 }
 
 #######
@@ -125,4 +126,4 @@ alias flush-dns='sudo /etc/init.d/dns-clean start'
 #############
 
 alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine'
-alias emacs='emacsclient -c --socket-name=/tmp/emacs1000/server'
+alias emacs='emacsclient -c -a "emacs"'
diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
index 3a6a57d..afdcb5a 100755
--- a/.config/mpd/mpd.conf
+++ b/.config/mpd/mpd.conf
@@ -10,15 +10,17 @@ state_file		"~/.config/mpd/mpdstate"
 
 audio_output {
 	type		"pulse"
-	name		"Headphone"
-	sink		"alsa_output.pci-0000_29_00.0.analog-stereo"
+	name		"Default"
+#	sink		"alsa_output.pci-0000_29_00.0.analog-stereo"
 }
 
-audio_output {
-	type		"pulse"
-	name		"Speakers"
-	sink		"alsa_output.pci-0000_31_00.4.analog-stereo"
-}
+# For some reason ncmpcpp now switches correctly, so i'm disabling this.
+#audio_output {
+#	type		"pulse"
+#	name		"Speakers"
+#	sink		"alsa_output.pci-0000_31_00.4.analog-stereo"
+#}
+#
 
 audio_output {
         type            "fifo"
diff --git a/.emacs.d/config.el b/.emacs.d/config.el
index 5e57a07..7634932 100644
--- a/.emacs.d/config.el
+++ b/.emacs.d/config.el
@@ -36,6 +36,8 @@
 (setq ring-bell-function 'ignore)
 (setq history-length 25)
 (setq global-auto-revert-non-file-buffers t)
+(setq native-comp-async-report-warnings-errors 'silent)
+(setq warning-minimum-level :error)
 
 (setq-default tab-width 4)
 (setq-default standard-indent 4)
diff --git a/.emacs.d/packages.el b/.emacs.d/packages.el
index 3e84067..eddb559 100644
--- a/.emacs.d/packages.el
+++ b/.emacs.d/packages.el
@@ -13,7 +13,7 @@
   :config
   (add-hook 'org-mode-hook 'org-indent-mode)
   (add-hook 'org-mode-hook
-            '(lambda ()
+            (lambda ()
                (visual-line-mode 1))))
 
 (use-package org-indent
diff --git a/.xinitrc b/.xinitrc
index 7065cfb..9c5ce38 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -11,22 +11,26 @@ if [ -f $HOME/.local/bin/statusbar ]; then
   . $HOME/.local/bin/statusbar
 fi
 
-# exec ck-launch-session dbus-launch --exit-with-session /usr/local/bin/dwm
+rfkill block all
+xset s off -dpms
+setxkbmap -option "ctrl:nocaps"
 
 # export GTK_IM_MODULE='ibus'
 # export QT_IM_MODULE='ibus'
 # export XMODIFIERS='@im=ibus'
-
-rfkill block all
+export XDG_SESSION_TYPE='x11'
 
 # ibus-daemon -dxrR
 
 xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary
 xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0
 
-xset s off -dpms
 
-setxkbmap -option "ctrl:nocaps"
+dbus-launch --sh-syntax --exit-with-session
+
+pipewire &
+mpd &
+/usr/local/bin/emacs --daemon &
 
 xwallpaper --maximize "$(/usr/bin/ls -d -1 /hdd/pics/wallpaper/* | shuf -n1)" &
 
-- 
cgit v1.2.3