updates all round

5 files changed, 19 insertions, 196 deletions

diff --git a/tofi/config b/tofi/config
index 9c3770c..ead4395 100644
--- a/tofi/config
+++ b/tofi/config
@@ -17,3 +17,4 @@ input-background-padding = 7
 input-background-corner-radius = 3
 clip-to-padding = false
 corner-radius = 8
+matching-algorithm=fuzzy
diff --git a/waybar/config b/waybar/config
index 1e25cef..2a7b97c 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,43 +1,21 @@
 {
-    // "layer": "top", // Waybar at top layer
-    // "position": "bottom", // Waybar position (top|bottom|left|right)
     "height": 30, // Waybar height (to be removed for auto height)
-    // "width": 1280, // Waybar width
     "spacing": 4, // Gaps between modules (4px)
+
     // Choose the order of the modules
     "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad", "custom/media"],
     "modules-center": ["sway/window"],
-    "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "backlight", "network", "temperature", "keyboard-state", "sway/language", "battery", "battery#bat2", "clock", "tray"],
-    // "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "battery#bat2", "clock", "tray"],
+    "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "backlight", "network", "temperature", "battery", "clock", "tray"],
+
     // Modules configuration
-    // "sway/workspaces": {
-    //     "disable-scroll": true,
-    //     "all-outputs": true,
-    //     "format": "{name}: {icon}",
-    //     "format-icons": {
-    //         "1": "",
-    //         "2": "",
-    //         "3": "",
-    //         "4": "",
-    //         "5": "",
-    //         "urgent": "",
-    //         "focused": "",
-    //         "default": ""
-    //     }
-    // },
+    "sway/workspaces": {
+        "disable-scroll": true,
+        "all-outputs": true,
+    },
     "sway/window": {
         "max-length": 60,
         "icon": true
     },
-    "keyboard-state": {
-        "numlock": true,
-        "capslock": true,
-        "format": "{name} {icon}",
-        "format-icons": {
-            "locked": "",
-            "unlocked": ""
-        }
-    },
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
@@ -48,32 +26,6 @@
         "tooltip": true,
         "tooltip-format": "{app}: {title}"
     },
-    "mpd": {
-        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
-        "format-disconnected": "Disconnected ",
-        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
-        "unknown-tag": "N/A",
-        "interval": 2,
-        "consume-icons": {
-            "on": " "
-        },
-        "random-icons": {
-            "off": "<span color=\"#f53c3c\"></span> ",
-            "on": " "
-        },
-        "repeat-icons": {
-            "on": " "
-        },
-        "single-icons": {
-            "on": "1 "
-        },
-        "state-icons": {
-            "paused": "",
-            "playing": ""
-        },
-        "tooltip-format": "MPD (connected)",
-        "tooltip-format-disconnected": "MPD (disconnected)"
-    },
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {
@@ -82,72 +34,52 @@
         }
     },
     "tray": {
-        // "icon-size": 21,
         "spacing": 10
     },
     "clock": {
-        // "timezone": "America/New_York",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
         "format-alt": "{:%Y-%m-%d}"
     },
-    "cpu": {
-        "format": "{usage}% ",
-        "tooltip": false
-    },
-    "memory": {
-        "format": "{}% "
-    },
     "temperature": {
-        // "thermal-zone": 2,
-        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
         "critical-threshold": 80,
-        // "format-critical": "{temperatureC}°C {icon}",
         "format": "{temperatureC}°C {icon}",
-        "format-icons": ["", "", ""]
+        "format-icons": ["", "", ""]
     },
     "backlight": {
-        // "device": "acpi_video1",
         "format": "{percent}% {icon}",
         "format-icons": ["", "", "", "", "", "", "", "", ""]
     },
     "battery": {
         "states": {
-            // "good": 95,
             "warning": 30,
             "critical": 15
         },
         "format": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
+        "format-charging": "{capacity}% 󰃨",
         "format-plugged": "{capacity}% ",
         "format-alt": "{time} {icon}",
-        // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
         "format-icons": ["", "", "", "", ""]
     },
-    "battery#bat2": {
-        "bat": "BAT2"
-    },
     "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ipaddr}/{cidr} ",
-        "tooltip-format": "{ifname} via {gwaddr} ",
-        "format-linked": "{ifname} (No IP) ",
+        "format-ethernet": "{ipaddr}/{cidr} 󰈀",
+        "tooltip-format": "{ifname} via {gwaddr} 󰈀",
+        "format-linked": "{ifname} (No IP) 󰈀",
         "format-disconnected": "Disconnected ⚠",
         "format-alt": "{ifname}: {ipaddr}/{cidr}"
     },
     "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
+        "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-bluetooth-muted": "󰝟 {icon} {format_source}",
+        "format-muted": "󰝟 {format_source}",
         "format-source": "{volume}% ",
         "format-source-muted": "",
         "format-icons": {
             "headphone": "",
-            "hands-free": "",
-            "headset": "",
+            "hands-free": "󰋎",
+            "headset": "󰋎",
             "phone": "",
             "portable": "",
             "car": "",
@@ -155,20 +87,4 @@
         },
         "on-click": "pavucontrol"
     },
-    "custom/media": {
-        "format": "{icon} {}",
-        "return-type": "json",
-        "max-length": 40,
-        "format-icons": {
-            "spotify": "",
-            "default": "🎜"
-        },
-        "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
-    },
-    "sway/language" : {
-        "format": "{shortDescription}"
-    }
 }
-
diff --git a/waybar/style.css b/waybar/style.css
index a0c0a32..d229b86 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -8,7 +8,6 @@
 
 window#waybar {
     background-color: alpha(@base, 0);
-    /* border-bottom: 3px solid alpha(@surface0, 0.5); */
     color: @text;
     transition-property: background-color;
     transition-duration: .5s;
@@ -18,24 +17,6 @@ window#waybar.hidden {
     opacity: 0.2;
 }
 
-/*
-window#waybar.empty {
-    background-color: transparent;
-}
-window#waybar.solo {
-    background-color: #FFFFFF;
-}
-*/
-
-window#waybar.termite {
-    background-color: #3F3F3F;
-}
-
-window#waybar.chromium {
-    background-color: #000000;
-    border: none;
-}
-
 button {
     /* Use box-shadow instead of border so the text isn't offset */
     box-shadow: inset 0 -3px transparent;
@@ -111,13 +92,11 @@ button:hover {
 }
 
 #clock {
-    /* background-color: #64727D; */
     border-top: 3px solid @lavender;
     color: @lavender;
 }
 
 #battery {
-    /* background-color: #ffffff; */
     color: @blue;
     border-top: 3px solid @blue;
     padding-right: 18px;
@@ -152,13 +131,10 @@ label:focus {
 }
 
 #cpu {
-    /* background-color: #2ecc71; */
-    /* color: #000000; */
     border-top: 3px solid @peach;
 }
 
 #memory {
-    /* background-color: #9b59b6; */
     border-top: 3px solid @peach;
     padding-right: 15px;
 }
@@ -168,65 +144,34 @@ label:focus {
 }
 
 #backlight {
-    /* background-color: #90b1b1; */
     border-top: 3px solid @peach;
     color: @peach;
     padding-right: 11px;
 }
 
 #network {
-    /* background-color: #2980b9; */
     border-top: 3px solid @yellow;
     color: @yellow;
     padding-right: 15px;
 }
 
 #network.disconnected {
-    /* background-color: #f53c3c; */
     border-top: 3px solid @red;
     color: @red;
 }
 
 #pulseaudio {
-    /* background-color: #f1c40f; */
-    /* color: #000000; */
     border-top: 3px solid @maroon;
     color: @maroon;
 }
 
 #pulseaudio.muted {
-    /* background-color: #90b1b1; */
-    /* color: #2a5c45; */
     border-top: 3px solid @flamingo;
     background-color: @flamingo;
     color: @mantle;
 }
 
-#wireplumber {
-    background-color: #fff0f5;
-    color: #000000;
-}
-
-#wireplumber.muted {
-    background-color: #f53c3c;
-}
-
-#custom-media {
-    background-color: #66cc99;
-    color: #2a5c45;
-    min-width: 100px;
-}
-
-#custom-media.custom-spotify {
-    background-color: #66cc99;
-}
-
-#custom-media.custom-vlc {
-    background-color: #ffa000;
-}
-
 #temperature {
-    /* background-color: #f0932b; */
     border-top: 3px solid @teal;
     color: @teal;
     padding-right: 12px;
@@ -239,7 +184,6 @@ label:focus {
 }
 
 #tray {
-    /* background-color: #2980b9; */
     border-top: 3px solid @mauve;
 }
 
@@ -253,7 +197,6 @@ label:focus {
 }
 
 #idle_inhibitor {
-    /* background-color: #2d3436; */
     border-top: 3px solid @mantle;
     padding-right: 14px;
 }
@@ -264,48 +207,13 @@ label:focus {
     border-top: 3px solid @subtext0;
 }
 
-#mpd {
-    background-color: #66cc99;
-    color: #2a5c45;
-}
-
-#mpd.disconnected {
-    background-color: #f53c3c;
-}
-
-#mpd.stopped {
-    background-color: #90b1b1;
-}
-
-#mpd.paused {
-    background-color: #51a37a;
-}
-
 #language {
-    /* background: #00b093; */
     color: @sapphire;
     padding: 0 5px;
-    /* margin: 0 5px; */
     min-width: 16px;
     border-top: 3px solid @sapphire;
 }
 
-#keyboard-state {
-    background: #97e1ad;
-    color: #000000;
-    padding: 0 0px;
-    margin: 0 5px;
-    min-width: 16px;
-}
-
-#keyboard-state > label {
-    padding: 0 5px;
-}
-
-#keyboard-state > label.locked {
-    background: rgba(0, 0, 0, 0.2);
-}
-
 #scratchpad {
     background: @mantle;
 }
diff --git a/xplr/init.lua b/xplr/init.lua
index db4f0b5..a60584e 100644
--- a/xplr/init.lua
+++ b/xplr/init.lua
@@ -32,7 +32,6 @@ require("xpm").setup({
     'gitlab:hartan/web-devicons.xplr',
     'sayanarijit/wl-clipboard.xplr',
     'sayanarijit/map.xplr',
-    'sayanarijit/command-mode.xplr',
     'sayanarijit/zoxide.xplr',
     'sayanarijit/zentable.xplr',
   },
@@ -56,7 +55,6 @@ require("fzf").setup({
     enter_dir = true,
 })
 
-require("command-mode").setup()
 require("wl-clipboard").setup()
 require("map").setup()
 require("zoxide").setup()
diff --git a/zathura/zathurarc b/zathura/zathurarc
index 603114f..0da0f16 100644
--- a/zathura/zathurarc
+++ b/zathura/zathurarc
@@ -1,4 +1,4 @@
 include catppuccin-macchiato
 set recolor true
-set font FiraCode
+set font FiraCodeNerdFont
 set selection-clipboard clipboard