From c0f0e0ee7e34780f2a9bdb9bc6b9756f4f5b8122 Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Sun, 11 Jun 2023 23:34:38 -0400
Subject: [PATCH] Use the dejavu nerfont instead of liberation, and don't
 duplicate the package list in the check script

---
 check-pkg               | 50 +++--------------------------------------
 config/mako/config      |  2 +-
 config/sway/config      |  2 +-
 config/waybar/config    | 18 +++++++--------
 config/waybar/style.css |  8 +++----
 packages                |  3 +--
 6 files changed, 18 insertions(+), 65 deletions(-)

diff --git a/check-pkg b/check-pkg
index 5d499bc..e9a8dcc 100644
--- a/check-pkg
+++ b/check-pkg
@@ -1,49 +1,5 @@
 #!/usr/bin/env bash
 
-packages=(
-    gnome-themes-extra
-    autotiling
-    blueman
-    bluez
-    bluez-utils
-    dconf-editor
-    eog
-    file-roller
-    gnome-keyring
-    grim
-    groff
-    mako
-    network-manager-applet
-    networkmanager
-    noto-fonts-emoji
-    nwg-bar
-    nwg-displays
-    papirus-icon-theme
-    pavucontrol
-    pipewire-alsa
-    pipewire-pulse
-    playerctl
-    qt5-wayland
-    seahorse
-    slurp
-    sway
-    swaybg
-    swayidle
-    swaylock
-    ttf-liberation
-    ttf-nerd-fonts-symbols-2048-em
-    waybar
-    wl-clipboard
-    xdg-user-dirs
-    xfce4-appfinder
-    xfce4-terminal
-    xfconf
-    xorg-server
-    xorg-xkill
-    xorg-xprop
-    xorg-xwayland
-)
-
-for pkg in "${packages[@]}"; do
-    pacman -Qi "$pkg" >/dev/null 2>&1 || echo "$pkg"
-done
+while read -r pkg; do
+    pacman -Qi "$pkg" >/dev/null 2>&1 || printf '%s\n' "$pkg"
+done < packages
diff --git a/config/mako/config b/config/mako/config
index 27e67a3..8ff1f66 100644
--- a/config/mako/config
+++ b/config/mako/config
@@ -8,7 +8,7 @@ padding=10
 border-size=0
 border-color=#285577
 border-radius=5
-font=Liberation Sans 12
+font=DejaVuSansMNerdFont 12
 icons=1
 max-icon-size=64
 default-timeout=5000
diff --git a/config/sway/config b/config/sway/config
index 32c0048..fb2d3c4 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -6,7 +6,7 @@
 #xwayland disable
 
 # Font
-font Liberation Mono 12
+font DejaVuSansMNerdFont 12
 
 # Background
 output "*" bg ~/.config/sway/wallpapers/wallpaper.jpg fill
diff --git a/config/waybar/config b/config/waybar/config
index 97edb62..99ea7b5 100644
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -37,21 +37,21 @@
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
         "reverse-scrolling": 0,
-        "format": "{volume}% {icon} {format_source}",
+        "format": "{volume}% {icon}  {format_source}",
         "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": "婢 {format_source}",
+        "format-bluetooth-muted": "󰗿 {icon} {format_source}",
+        "format-muted": " {format_source}",
         "format-source": "{volume}% ",
         "format-source-muted": "0% ",
 
         "format-icons": {
             "headphone": "",
-            "hands-free": "",
-            "headset": "",
+            "hands-free": "󰋎",
+            "headset": "󰋎",
             "phone": "",
             "portable": "",
             "car": "",
-            "default": ["奄", "奔", "墳"]
+            "default": ["", "", ""]
         },
 
         "on-click": "pavucontrol",
@@ -59,7 +59,7 @@
     },
 
     "custom/mem": {
-        "format": "{} ",
+        "format": "{} 󰍛",
         "interval": 3,
         "exec": "free -h | awk '/Mem:/{printf $3}'",
         "tooltip": false
@@ -68,7 +68,7 @@
     "backlight": {
         "device": "intel_backlight",
         "format": "{percent}% {icon}",
-        "format-icons": ["","","","", "", "", ""],
+        "format-icons": ["","","","","","","","",""],
         "min-length": 7
     },
 
@@ -82,7 +82,7 @@
         "format-charging": "{capacity}% ",
         "format-plugged": "{capacity}% ",
         "format-alt": "{time} {icon}",
-        "format-icons": ["🪫", "🪫", "🪫", "🔋", "🔋", "🔋", "🔋", "🔋", "🔋", "🔋"],
+        "format-icons": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󱟢"],
         "on-update": "$HOME/.config/waybar/scripts/battery.sh"
     },
 
diff --git a/config/waybar/style.css b/config/waybar/style.css
index a88b840..7a3f7f2 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -1,8 +1,7 @@
 * {
     border: none;
     border-radius: 0;
-    /* `otf-font-awesome` is required to be installed for icons */
-    font-family: Liberation Mono;
+    font-family: DejaVuSansMNerdFont;
     min-height: 20px;
     padding-top: 1px;
 }
@@ -30,7 +29,6 @@ window#waybar.hidden {
     font-size: 18px;
 }
 
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 #workspaces button:hover {
     transition: none;
     box-shadow: inherit;
@@ -95,9 +93,9 @@ window#waybar.empty #window {
     padding-left: 16px;
     padding-right: 16px;
     border-radius: 10px;
-    transition: none;
-    color: #ffffff;
     background: #3c384a;
+    color: #ffffff;
+    transition: none;
 }
 
 #pulseaudio.muted {
diff --git a/packages b/packages
index 18b97dd..3aee179 100644
--- a/packages
+++ b/packages
@@ -29,8 +29,7 @@ swayidle
 swaylock
 thunar
 thunar-volman
-ttf-liberation
-ttf-nerd-fonts-symbols-2048-em
+ttf-dejavu-nerd
 waybar
 wl-clipboard
 xdg-user-dirs