Squashed commit of the following:

commit 89ec61f2cc24238dbccf2890235fab7a66efdc5b
Author: AdaShoelace <adashoelace@gmail.com>
Date:   Fri Jan 8 01:49:19 2021 +0100

    Support pulseaudio

commit b4bc05538b22d86a53e4461bbee2c8c4d33b0f80
Author: AdaShoelace <adashoelace@gmail.com>
Date:   Fri Jan 8 01:06:32 2021 +0100

    Display volume in percent

commit 14570efeebeb127494509534886dd521a23f24f0
Author: AdaShoelace <adashoelace@gmail.com>
Date:   Thu Jan 7 14:22:34 2021 +0100

    Programmatically rename root and get alsa volume

commit 391b2ec7360fd9ae462a87c0a3ae86d39f695c3f
Author: AdaShoelace <adashoelace@gmail.com>
Date:   Mon Jan 4 22:26:57 2021 +0100

    Remove usage of 'Command' from get_disk

commit 0625be6e822e18cf4e2fd212695ddd1592161a97
Author: AdaShoelace <adashoelace@gmail.com>
Date:   Mon Jan 4 22:25:01 2021 +0100

    Add nix dependency

commit c66e1cc09031f0a7ddf40016855a6d7457d9d65f
Author: AdaShoelace <adashoelace@gmail.com>
Date:   Mon Jan 4 16:14:55 2021 +0100

    ignore

commit 32dbdc5f3d636551c64e2f303365a5a5e3d94994
Author: AdaShoelace <adashoelace@gmail.com>
Date:   Mon Jan 4 02:21:51 2021 +0100

    Add breadx to dependencies

commit 4d23c36552b461b06127705964e1a16dd395e658
Author: AdaShoelace <adashoelace@gmail.com>
Date:   Mon Jan 4 01:13:55 2021 +0100

    Add exclusion to gitignore

Cargo.lock

@@ -1,11 +1,165 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+[[package]]
+name = "ahash"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
+
+[[package]]
+name = "alsa"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb213f6b3e4b1480a60931ca2035794aa67b73103d254715b1db7b70dcb3c934"
+dependencies = [
+ "alsa-sys",
+ "bitflags",
+ "libc",
+ "nix 0.15.0",
+]
+
+[[package]]
+name = "alsa-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
+dependencies = [
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "async-channel"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59740d83946db6a5af71ae25ddf9562c2b176b2ca42cf99a455f09f4a220d6b9"
+dependencies = [
+ "concurrent-queue",
+ "event-listener",
+ "futures-core",
+]
+
+[[package]]
+name = "async-io"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd"
+dependencies = [
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "libc",
+ "log",
+ "nb-connect",
+ "once_cell",
+ "parking",
+ "polling",
+ "vec-arena",
+ "waker-fn",
+ "winapi",
+]
+
+[[package]]
+name = "async-net"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06de475c85affe184648202401d7622afb32f0f74e02192857d0201a16defbe5"
+dependencies = [
+ "async-io",
+ "blocking",
+ "fastrand",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-task"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
+
+[[package]]
+name = "atomic-waker"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
+
 [[package]]
 name = "autocfg"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "blocking"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "atomic-waker",
+ "fastrand",
+ "futures-lite",
+ "once_cell",
+]
+
+[[package]]
+name = "breadx"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bff92e2ec549fe3f20386d73efb30263be7467463def0c2a780d7cee5dbf5e3"
+dependencies = [
+ "async-io",
+ "async-net",
+ "blocking",
+ "bytemuck",
+ "cfg-if 1.0.0",
+ "cty",
+ "futures-lite",
+ "hashbrown",
+ "log",
+ "memchr",
+ "nix 0.19.1",
+ "ref_slice",
+ "tinyvec",
+]
+
+[[package]]
+name = "bytemuck"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41aa2ec95ca3b5c54cf73c91acf06d24f4495d5f1b1c12506ae3483d646177ac"
+
+[[package]]
+name = "cache-padded"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
+
+[[package]]
+name = "cc"
+version = "1.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
 [[package]]
 name = "chrono"
 version = "0.4.19"
@@ -19,6 +173,81 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "concurrent-queue"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
+dependencies = [
+ "cache-padded",
+]
+
+[[package]]
+name = "cty"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7313c0d620d0cb4dbd9d019e461a4beb501071ff46ec0ab933efb4daa76d73e3"
+
+[[package]]
+name = "event-listener"
+version = "2.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
+
+[[package]]
+name = "fastrand"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3"
+dependencies = [
+ "instant",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
+
+[[package]]
+name = "futures-io"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
+
+[[package]]
+name = "futures-lite"
+version = "1.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
+ "pin-project-lite",
+ "waker-fn",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.81"
@@ -31,12 +260,62 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
 
+[[package]]
+name = "log"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+dependencies = [
+ "cfg-if 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+
 [[package]]
 name = "minreq"
 version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2466d0a7e6bfcd54f69e4a17d4a4318985aaaf7fe3df4cd3b6f11ff551129ca3"
 
+[[package]]
+name = "nb-connect"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "nix"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if 0.1.10",
+ "libc",
+ "void",
+]
+
+[[package]]
+name = "nix"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.44"
@@ -56,12 +335,58 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "once_cell"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+
+[[package]]
+name = "parking"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+
+[[package]]
+name = "polling"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "log",
+ "wepoll-sys",
+ "winapi",
+]
+
+[[package]]
+name = "ref_slice"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e1b7878800220a76a08f32c057829511440f65528b63b940f2f2bc145d7ac68"
+
 [[package]]
 name = "rsblocks"
 version = "0.1.3"
 dependencies = [
+ "alsa",
+ "breadx",
  "chrono",
  "minreq",
+ "nix 0.19.1",
  "yaml-rust",
 ]
 
@@ -76,12 +401,54 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "tinyvec"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+
+[[package]]
+name = "vec-arena"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d"
+
+[[package]]
+name = "void"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+
+[[package]]
+name = "waker-fn"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+
 [[package]]
 name = "wasi"
 version = "0.10.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
+[[package]]
+name = "wepoll-sys"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"

Cargo.toml

@@ -13,4 +13,10 @@ description = "a multi threaded status bar for dwm window manager for linux"
 [dependencies]
 chrono = "0.4"
 yaml-rust = "0.4"
-minreq = "2.2.1"
+minreq = "2.2.1"
+alsa = "0.4.3"
+nix = "0.19.1"
+
+[dependencies.breadx]
+version = "0.1.11"
+features = ["async"]

rsblocks.yml

@@ -27,9 +27,10 @@ disk:
 # reads from alsa, alsa-utils package should
 # be installed on the system to make it work.
 volume:
-  enable: false
+  enable: true
   icon: ''
   delay: 0.18
+  card: 'PULSE'
 
 
 # weather format options is available on

src/lib.rs

@@ -1,13 +1,13 @@
+use breadx::{display::*, window::Window};
 use chrono::prelude::*;
 use minreq;
-use std::env;
 use std::fs::File;
 use std::io::Error;
 use std::io::Read;
-use std::process::Command;
 use std::sync::mpsc;
 use std::thread;
 use std::time::Duration;
+use alsa::mixer::{Mixer, SelemChannelId, SelemId};
 use yaml_rust::{yaml, YamlLoader};
 
 #[derive(Debug)]
@@ -54,6 +54,7 @@ pub struct Volume {
     pub icon: String,
     pub enabled: bool,
     pub delay: f64,
+    pub card: String
 }
 
 #[derive(Clone)]
@@ -75,7 +76,7 @@ it will call load_defaults to load a hardcoded default configuration
 it will always return a valid configuration inside a Result.
 */
 pub fn load_config() -> Result<Config, Error> {
-    let yml_source = env::var("HOME").unwrap() + "/.config/rsblocks/rsblocks.yml";
+    let yml_source = std::env::var("HOME").unwrap() + "/.config/rsblocks/rsblocks.yml";
     let mut data = String::new();
     let mut file = match File::open(&yml_source) {
         Ok(file) => file,
@@ -115,6 +116,7 @@ fn load_defaults() -> Config {
             icon: String::from(""),
             enabled: false,
             delay: 0.17,
+            card: String::from("ALSA")
         },
         weather: Weather {
             city: String::from(""),
@@ -157,6 +159,9 @@ fn parse_config(doc: &yaml::Yaml) -> Config {
     let memory_delay = get_or_set_f32(doc, "memory", "delay", 2.0);
     let volume_delay = get_or_set_f32(doc, "volume", "delay", 0.17);
     let weather_delay = get_or_set_f32(doc, "weather", "delay", 7200.0);
+    
+    // parsing card for volume, ALSA or PULSE
+    let volume_card = get_or_set_string(doc, "volume", "card", "ALSA");
 
     Config {
         seperator,
@@ -179,6 +184,7 @@ fn parse_config(doc: &yaml::Yaml) -> Config {
             icon: volume_icon,
             enabled: volume_enabled,
             delay: volume_delay,
+            card: volume_card
         },
         weather: Weather {
             city: weather_city,
@@ -231,18 +237,37 @@ fn get_or_set_string(doc: &yaml::Yaml, parent: &str, child: &str, default_val: &
 TODO: this is sucks, repeated code in threads below, fix me you fucking asshole
  */
 
-pub fn run(config: Config) {
+pub struct Blocks {
-    let (tx, rx) = mpsc::channel();
+    disp: Display<name::NameConnection>,
+    root: Window,
+}
 
+impl Blocks {
+    pub fn new() -> Self {
+        let disp = Display::create(None, None).expect("Failed to create x11 connection");
+        let root = disp.default_screen().root;
+        Self {
+            disp,
+            root,
+        }
+    }
+}
+
+pub fn run(config: Config, mut blocks: Blocks) {
+    let (tx, rx) = mpsc::channel();
     // volume thread
     if config.volume.enabled {
         let volume_tx = tx.clone();
         let configcp = config.clone();
-        let mut vol_data = ThreadsData::Sound(get_volume(&configcp));
+        thread::spawn(move || {
-        thread::spawn(move || loop {
+            let mut vol_data =
-            let _ = volume_tx.send(vol_data);
+                ThreadsData::Sound(get_volume(&configcp));
-            vol_data = ThreadsData::Sound(get_volume(&configcp));
+            loop {
-            thread::sleep(Duration::from_secs_f64(configcp.volume.delay))
+                let _ = volume_tx.send(vol_data);
+                vol_data =
+                    ThreadsData::Sound(get_volume(&configcp));
+                thread::sleep(Duration::from_secs_f64(configcp.volume.delay))
+            }
         });
     }
 
@@ -299,7 +324,6 @@ pub fn run(config: Config) {
     //Main
     {
         // NOTE: order matters to the final format
-
         let mut bar: Vec<String> = vec!["".to_string(); 5];
         //iterating the values recieved from the threads
         for data in rx {
@@ -312,25 +336,22 @@ pub fn run(config: Config) {
             }
 
             // match ends here
-            update(&bar);
+            update(&bar, &mut blocks);
         }
     }
 }
 
-/*
+pub fn update(bar: &Vec<String>, blocks: &mut Blocks) {
-this will call the command 'xsetroot -name <the arg>'
-*/
-pub fn update(bar: &Vec<String>) {
     // TODO: FIX ME, this solution sucks
     let mut x = String::new();
     for i in bar.iter() {
         x.push_str(i.as_str());
     }
-    Command::new("xsetroot")
+
-        .arg("-name")
+    blocks
-        .arg(x)
+        .root
-        .output()
+        .set_title(&mut blocks.disp, &x)
-        .unwrap();
+        .expect("Failed to set title of root");
 }
 
 /*############################ RUNNING THE PROGRAM ENDS HERE ###########################################*/
@@ -379,47 +400,47 @@ fn get_weather(config: &Config) -> String {
 }
 
 pub fn get_disk(config: &Config) -> String {
-    let cmd = Command::new("sh")
+    const GB: u64 = (1024 * 1024) * 1024;
-        .arg("-c")
+    let statvfs = nix::sys::statvfs::statvfs("/").unwrap();
-        .args(&["df -h"])
-        .output()
-        .unwrap();
-    let output = String::from_utf8_lossy(&cmd.stdout);
     let mut disk_used = String::new();
-    for line in output.lines() {
+
-        if line.ends_with('/') {
+    let total = (statvfs.blocks() * statvfs.fragment_size()) / GB;
-            let splited = line.split_whitespace().collect::<Vec<&str>>();
+    let available = (statvfs.blocks_free() * statvfs.fragment_size()) / GB;
-            disk_used = splited[2].to_string();
+    let used = total - available;
-            break;
+
-        }
+    disk_used.push_str(&format!("{}GB", used));
-    }
     format!(
         "  {}  {}  {}",
         config.disk.icon, disk_used, config.seperator
     )
 }
 
-// FIX ME: what a horrible solution to get the sound, i dont like it
-//       find another way
-
 pub fn get_volume(config: &Config) -> String {
-    let cmd_content = Command::new("amixer")
+    let card = if config.volume.card == "PULSE" {
-        .args(&["-D", "pulse", "get", "Master"])
+        "pulse"
-        .output()
+    } else {
-        .expect("Make sure that you have alsa-utils installed on your system");
+        "default"
+    };
 
-    let vol: String = String::from_utf8_lossy(&cmd_content.stdout)
+    let mixer = Mixer::new(card, false).expect("Failed to open mixer");
-        .lines()
+    let selem_id = SelemId::new("Master", 0);
-        .last()
+    let selem = mixer.find_selem(&selem_id).expect("Couldn't find selem");
-        .expect("failed to get sound volume")
+    let selem_chan_id = SelemChannelId::FrontLeft;
-        .split('[')
+    
-        .collect::<Vec<&str>>()[1]
+    let (min, max) = selem.get_playback_volume_range();
-        .split(']')
+    let mut raw_volume = selem
-        .collect::<Vec<&str>>()[0]
+        .get_playback_volume(selem_chan_id)
-        .trim()
+        .expect("Failed to get raw_volume");
-        .to_string();
+    
+    let range = max - min;
+    let vol = if range == 0 {
+       0 
+    } else {
+        raw_volume -= min;
+        ((raw_volume as f64 / range as f64) * 100.) as u64
+    };
 
-    format!("  {}  {}  {}", config.volume.icon, vol, config.seperator)
+    format!("  {}  {}%  {}", config.volume.icon, vol, config.seperator)
 }
 
 /*

src/main.rs

@@ -2,5 +2,6 @@ use rsblocks;
 
 fn main() {
     let config = rsblocks::load_config().unwrap();
-    rsblocks::run(config);
+    let blocks = rsblocks::Blocks::new();
+    rsblocks::run(config, blocks);
 }