From 9743634f3ce286af4f684b4177bbe504c526b002 Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Tue, 28 Apr 2020 13:16:04 +0200
Subject: [PATCH] Embrace Pulseaudio as audio server

---
 fish/.config/fish/config.fish           |  8 ++++++--
 fonts/.config/fontconfig/fonts.conf     |  9 +--------
 redshift/.config/redshift/redshift.conf |  2 +-
 sway/.config/sway/config                |  6 +++---
 waybar/.config/waybar/config            | 24 ++++--------------------
 waybar/.config/waybar/style.css         |  2 +-
 6 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 72e23f8..10af905 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -33,8 +33,12 @@ set PATH $PATH /$HOME/.emacs.d/bin
 # Go workspace
 set -x GOPATH $HOME/.local/share/go/
 
+
+# fff colors [0-9]
+set -x FFF_COL1 4
+set -x FFF_COL2 8
 # fff favourites
 set -x FFF_FAV1 $HOME/Documents/Uni
 set -x FFF_FAV2 $HOME/Documents/Papers
-set -x FFF_FAV3 $HOME/Documents/Books/Academic/
-set -x FFF_FAV4 $HOME/Documents/Education/
+set -x FFF_FAV3 $HOME/Documents/Books/Academic
+set -x FFF_FAV4 $HOME/Documents/Education
diff --git a/fonts/.config/fontconfig/fonts.conf b/fonts/.config/fontconfig/fonts.conf
index ff45fd2..ddb55cd 100644
--- a/fonts/.config/fontconfig/fonts.conf
+++ b/fonts/.config/fontconfig/fonts.conf
@@ -27,13 +27,6 @@
         <https://forums.freebsd.org/threads/howto-nice-fonts.2021/> (2009)
         <https://redd.it/4tb2dt> (2016) -->
     <selectfont>
-        <acceptfont>
-            <pattern>
-                <patelt name="family">
-                    <string>lime</string>
-                </patelt>
-            </pattern>
-        </acceptfont>
         <acceptfont>
             <pattern>
                 <patelt name="family">
@@ -44,7 +37,7 @@
         <acceptfont>
             <pattern>
                 <patelt name="family">
-                    <string>termsyn</string>
+                    <string>cherry</string>
                 </patelt>
             </pattern>
         </acceptfont>
diff --git a/redshift/.config/redshift/redshift.conf b/redshift/.config/redshift/redshift.conf
index 05bcabc..2108154 100644
--- a/redshift/.config/redshift/redshift.conf
+++ b/redshift/.config/redshift/redshift.conf
@@ -17,7 +17,7 @@ transition=1
 ;brightness-night=0.4
 ; Set the screen gamma (for all colors, or each color channel
 ; individually)
-gamma=0.8
+;gamma=0.8
 ;gamma=0.8:0.7:0.8
 ; This can also be set individually for day and night since
 ; version 1.10.
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 08ae391..b7030a7 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -249,9 +249,9 @@ exec swaymsg split vertical
 # Special keys
 #
     # Volume
-    bindsym XF86AudioRaiseVolume exec amixer set Master 5%+
-    bindsym XF86AudioLowerVolume exec amixer set Master 5%-
-    bindsym XF86AudioMute exec amixer set Master toggle
+    bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +5%
+    bindsym XF86AudioLowerVolume exec pactl set-sink-volume 0 -5%
+    bindsym XF86AudioMute exec pactl set-sink-mute 0 toggle
     # Brightness
     bindsym XF86MonBrightnessUp exec brillo -A 10
     bindsym XF86MonBrightnessDown exec brillo -U 10
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index af70423..dcc35b1 100644
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -3,7 +3,7 @@
     "height": 20, // Waybar height (to be removed for auto height)
     "modules-left": ["sway/workspaces"],
     "modules-center": ["clock"],
-    "modules-right": ["mpd", "network", "custom/alsa", "battery"],
+    "modules-right": ["mpd", "network", "pulseaudio", "battery"],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -82,20 +82,10 @@
     },
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
-        "format": "{volume}% {icon} {format_source}",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": " {format_source}",
-        "format-source": "{volume}% ",
-        "format-source-muted": "",
+        "format": "<span foreground='#88C0D0'>{icon}</span>{volume}%",
+        "format-muted": "<span foreground='#88C0D0'></span>",
         "format-icons": {
-            "headphones": "",
-            "handsfree": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
+            "default": ["", "", ""]
         },
         "on-click": "pavucontrol"
     },
@@ -110,11 +100,5 @@
         "escape": true,
         "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
         // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
-    },
-    "custom/alsa": {
-        "exec": "amixer get Master | sed -nre 's/.*\\[off\\].*/muted/p; s/.*\\[(.*%)\\].*/\\1/p'",
-        "signal": 11,
-        "interval": 3,
-        "tooltip": false
     }
 }
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 4b50be0..33fb3e0 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -2,7 +2,7 @@
     border: none;
     border-radius: 0;
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: lime, Siji;
+    font-family: cherry, Siji;
     font-size: 10px;
     min-height: 0px;
 }