fix .zshenv to work with more than just zsh, plus delete pipewire.conf

6 files changed, 53 insertions, 275 deletions

diff --git a/Serenity/Ladybird.conf b/Serenity/Ladybird.conf
new file mode 100644
index 0000000..07f1519
--- /dev/null
+++ b/Serenity/Ladybird.conf
@@ -0,0 +1,2 @@
+[General]
+homepage=https://search.brave.com/
diff --git a/autostart.sh b/autostart.sh
index 16eebdc..d892e27 100755
--- a/autostart.sh
+++ b/autostart.sh
@@ -20,8 +20,7 @@ runifnot mpd-notification
 runifnot transmission-daemon
 #runifnot dbus-daemon --session --address=unix:path=$XDG_RUNTIME_DIR/bus
 runifnot openrazer-daemon
-runifnot lxqt-policykit-agent
-razer-cli -e static &
+razer-cli -e static
 #runifnot nextcloud
 if [ -z "$WAYLAND_DISPLAY" ]; then
   runifnot xss-lock -n notify-send slockd
diff --git a/swhkd/swhkdrc b/swhkd/swhkdrc
index 2042b69..94e5bed 100755
--- a/swhkd/swhkdrc
+++ b/swhkd/swhkdrc
@@ -12,19 +12,19 @@ alt + Escape
 
 # program launcher
 alt + d
-        tofi_run
+        barmenu_run -h 24
 
 # desktop application launcher
 alt + r
-        tofi-drun --drun-launch true
+        j4-dmenu-desktop --dmenu="barmenu -h 24 -l 15"
 
 # dmenu prompt for recording
 alt + control + r
-        tofirecord
+        dmenurecord
 
 # run dmenu interface for keepassxc
 alt + p
-        tofikeepass --height 24
+        dmenu_keepass -h 24
 
 # run dmenu interface for pass
 alt + super + p
@@ -32,56 +32,56 @@ alt + super + p
 
 # run dmenu interface for mpv
 alt + v
-        tofimpv
+        dmpv
 
 # run dmenu interface for ytfzf
 alt + y
-        ytfzf-launcher -D 'tofi --height 24'
+        ytfzf-launcher -D 'barmenu -h 24 -l 15'
 
 # run dmenu interface to spawn browsers
 alt + super + 1
-        browser-tofi
+        browser
 
 # run dmenu interface for qutebrowser profile chooser
 alt + super + q
-        qbc-tofi
+        qbc
 	#qbpm choose
 
 # run dmenu interface for librewolf profile chooser
 alt + super + w
-        lwc-tofi
+        lwc
 
 # run dmenu interface for librewolf profile chooser
 alt + super + e
-        fdc-tofi
+        fdc
 
 # run dmenu interface to open book
 alt + super + b
-        tofi_books
+        dmenu_books
 
 # run dmenu interface for mpris
 alt + super + u
-        mprisctl-tofi
+        mprisctl
 
 # run dmenu interface for monattach
 alt + super + m
-        monattach-tofi right
+        monattach right
 
 # run dmenu interface for mondetach
 alt + super + n
-        mondetach-tofi
+        mondetach
 
 # run dmenu interface for mount
 alt + super + comma
-        tofimount
+        dmenumount
 
 # run dmenu interface for umount
 alt + super + period
-        tofiumount
+        dmenuumount
 
 #run dmenu prompt for unicode chars
 alt + super + u
-        tofiunicode
+        dmenuunicode
 
 #
 # utilities
@@ -89,7 +89,7 @@ alt + super + u
 
 # toggle x idle state
 alt + c
-        swayidletog
+        xidletog
 
 # toggle waybar
 alt + w
@@ -103,6 +103,14 @@ alt + super + {Left,Right}
 alt + q
 	loginctl lock-session self
 
+# restart dwmblocks
+alt + super + 9
+        toggle dwmblocks
+
+# signal all dwmblocks modules
+alt + super + 0
+        sigdwmb all
+
 # spawn file manager
 alt + super + f
         $TERMINAL -e lfrun
@@ -123,6 +131,14 @@ alt + super + m
 alt + super + shift + m
         volsv -m
 
+# load sxiv for backgrounds
+alt + super + x
+        sxiv ~/.local/src/wallpapers
+
+# xkill
+alt + x
+	xkill
+
 #
 # xf86 keys
 #
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index 7deb7ca..222425e 100755
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -16,7 +16,7 @@ alt + d
 
 # desktop application launcher
 alt + r
-        j4-dmenu-desktop --dmenu="dmenu -h 24 -l 15"
+        j4-dmenu-desktop --dmenu="barmenu -h 24 -l 15"
 
 # dmenu prompt for recording
 alt + control + r
@@ -36,7 +36,7 @@ alt + v
 
 # run dmenu interface for ytfzf
 alt + y
-        ytfzf-launcher -D 'dmenu -h 24 -l 15'
+        ytfzf-launcher -D 'barmenu -h 24 -l 15'
 
 # run dmenu interface to spawn browsers
 alt + super + 1
diff --git a/waybar/config b/waybar/config
index 8be04aa..aa67c93 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,247 +1,9 @@
-[{
-    "layer": "top", // Waybar at top layer
-    // "position": "bottom", // Waybar position (top|bottom|left|right)
-    "height": 20, // Waybar height (to be removed for auto height)
-    // "width": 1280, // Waybar width
-    // Choose the order of the modules
-    "output": "HDMI-A-1",
-    "modules-left": ["river/tags", "river/window", "custom/dwl_tag#0", "custom/dwl_tag#1", "custom/dwl_tag#2", "custom/dwl_tag#3", "custom/dwl_tag#4", "custom/dwl_tag#5", "custom/dwl_tag#6", "custom/dwl_tag#7", "custom/dwl_tag#8", "custom/dwl_layout", "custom/dwl_title"],
-    "modules-center": [],
-    "modules-right": ["custom/swayidle", "mpd", "pulseaudio", "network", "cpu", "memory", "backlight", "battery", "tray", "clock"],
-    // Modules configuration
-    // "sway/workspaces": {
-    //     "disable-scroll": true,
-    //     "all-outputs": true,
-    //     "format": "{name}: {icon}",
-    //     "format-icons": {
-    //         "1": "",
-    //         "2": "",
-    //         "3": "",
-    //         "4": "",
-    //         "5": "",
-    //         "urgent": "",
-    //         "focused": "",
-    //         "default": ""
-    //     }
-    // },
-    "river/window": {
-      "max-length": 60
-    },
-    "custom/dwl_tag#0": {
-      "exec": "~/.local/bin/waybar-dwl.sh HDMI-A-1 0",
-      "format": "{}",
-      "return-type": "json"
-    },
-    "custom/dwl_tag#1": {
-      "exec": "~/.local/bin/waybar-dwl.sh HDMI-A-1 1",
-      "format": "{}",
-      "return-type": "json"
-    },
-    "custom/dwl_tag#2": {
-      "exec": "~/.local/bin/waybar-dwl.sh HDMI-A-1 2",
-      "format": "{}",
-      "return-type": "json"
-    },
-    "custom/dwl_tag#3": {
-      "exec": "~/.local/bin/waybar-dwl.sh HDMI-A-1 3",
-      "format": "{}",
-      "return-type": "json"
-    },
-    "custom/dwl_tag#4": {
-      "exec": "~/.local/bin/waybar-dwl.sh HDMI-A-1 4",
-      "format": "{}",
-      "return-type": "json"
-    },
-    "custom/dwl_tag#5": {
-      "exec": "~/.local/bin/waybar-dwl.sh HDMI-A-1 5",
-      "format": "{}",
-      "return-type": "json"
-    },
-    "custom/dwl_tag#6": {
-      "exec": "~/.local/bin/waybar-dwl.sh HDMI-A-1 6",
-      "format": "{}",
-      "return-type": "json"
-    },
-    "custom/dwl_tag#7": {
-      "exec": "~/.local/bin/waybar-dwl.sh HDMI-A-1 7",
-      "format": "{}",
-      "return-type": "json"
-    },
-    "custom/dwl_tag#8": {
-      "exec": "~/.local/bin/waybar-dwl.sh HDMI-A-1 8",
-      "format": "{}",
-      "return-type": "json"
-    },
-    "custom/dwl_tag#9": {
-      "exec": "~/.local/bin/waybar-dwl.sh HDMI-A-1 9",
-      "format": "{}",
-      "return-type": "json"
-    },
-    "custom/dwl_layout": {
-      "exec": "~/.local/bin/waybar-dwl.sh HDMI-A-1 layout",
-      "format": "{}",
-      "escape": true,
-      "return-type": "json"
-    },
-    "custom/dwl_title": {
-      "exec": "~/.local/bin/waybar-dwl.sh HDMI-A-1 title",
-      "format": "{}",
-      "escape": true,
-      "return-type": "json"
-    },
-    "custom/swayidle": {
-      "exec": "~/.local/scripts/swayidlechk",
-      "signal": 8,
-      "interval": "once",
-      "format": " {} ",
-      "on-click": "~/.local/scripts/swayidletog"
-    },
-    "sway/mode": {
-        "format": "<span style=\"italic\">{}</span>"
-    },
-    "mpd": {
-        "signal": 7,
-        "server": "/home/zachir/.config/mpd/socket",
-        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist:.15} - {title:.15}",
-        // ({elapsedTime:%M:%S}/{totalTime:%M:%S})
-        "format-disconnected": "Disconnected",
-        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped",
-        "unknown-tag": "N/A",
-        "interval": 2,
-        "consume-icons": {
-            "on": "<span color=\"#dddddd\"></span> "
-        },
-        "random-icons": {
-            "off": " ",
-            "on": "<span color=\"#dddddd\"></span> "
-        },
-        "repeat-icons": {
-            "on": "<span color=\"#dddddd\"></span> "
-        },
-        "single-icons": {
-            "on": "<span color=\"#dddddd\">1</span> "
-        },
-        "state-icons": {
-            "paused": "",
-            "playing": "<span color=\"#dddddd\"></span>"
-        },
-        "tooltip-format": "MPD (connected)",
-        "tooltip-format-disconnected": "MPD (disconnected)",
-//        "max-length": 50
-    },
-    "idle_inhibitor": {
-        "format": "{icon}",
-        "format-icons": {
-            "activated": "",
-            "deactivated": ""
-        }
-    },
-    "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": ["", "", ""]
-    },
-    "backlight": {
-        // "device": "acpi_video1",
-        "format": "{percent}% {icon}",
-        "format-icons": ["", ""]
-    },
-    "battery": {
-        "states": {
-            // "good": 95,
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{capacity}% {icon}",
-        "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": "cw2015-battery",
-        "states": {
-            // "good": 95,
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
-        "format-plugged": "{capacity}% ",
-        "format-alt": "{time} {icon}",
-        // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
-        "format-icons": ["", "", "", "", ""]
-    },
-    "network": {
-        //"interface": "wl*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
-        "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}",
-        "signal": 6
-    },
-    "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-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "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
-    }
-},
 {
     "layer": "top", // Waybar at top layer
     // "position": "bottom", // Waybar position (top|bottom|left|right)
     "height": 20, // Waybar height (to be removed for auto height)
     // "width": 1280, // Waybar width
     // Choose the order of the modules
-    "output": "DP-1",
     "modules-left": ["river/tags", "river/window", "custom/dwl_tag#0", "custom/dwl_tag#1", "custom/dwl_tag#2", "custom/dwl_tag#3", "custom/dwl_tag#4", "custom/dwl_tag#5", "custom/dwl_tag#6", "custom/dwl_tag#7", "custom/dwl_tag#8", "custom/dwl_layout", "custom/dwl_title"],
     "modules-center": [],
     "modules-right": ["custom/swayidle", "mpd", "pulseaudio", "network", "cpu", "memory", "backlight", "battery", "tray", "clock"],
@@ -265,63 +27,63 @@
       "max-length": 60
     },
     "custom/dwl_tag#0": {
-      "exec": "~/.local/bin/waybar-dwl.sh DP-1 0",
+      "exec": "~/.local/bin/waybar-dwl.sh '' 0",
       "format": "{}",
       "return-type": "json"
     },
     "custom/dwl_tag#1": {
-      "exec": "~/.local/bin/waybar-dwl.sh DP-1 1",
+      "exec": "~/.local/bin/waybar-dwl.sh '' 1",
       "format": "{}",
       "return-type": "json"
     },
     "custom/dwl_tag#2": {
-      "exec": "~/.local/bin/waybar-dwl.sh DP-1 2",
+      "exec": "~/.local/bin/waybar-dwl.sh '' 2",
       "format": "{}",
       "return-type": "json"
     },
     "custom/dwl_tag#3": {
-      "exec": "~/.local/bin/waybar-dwl.sh DP-1 3",
+      "exec": "~/.local/bin/waybar-dwl.sh '' 3",
       "format": "{}",
       "return-type": "json"
     },
     "custom/dwl_tag#4": {
-      "exec": "~/.local/bin/waybar-dwl.sh DP-1 4",
+      "exec": "~/.local/bin/waybar-dwl.sh '' 4",
       "format": "{}",
       "return-type": "json"
     },
     "custom/dwl_tag#5": {
-      "exec": "~/.local/bin/waybar-dwl.sh DP-1 5",
+      "exec": "~/.local/bin/waybar-dwl.sh '' 5",
       "format": "{}",
       "return-type": "json"
     },
     "custom/dwl_tag#6": {
-      "exec": "~/.local/bin/waybar-dwl.sh DP-1 6",
+      "exec": "~/.local/bin/waybar-dwl.sh '' 6",
       "format": "{}",
       "return-type": "json"
     },
     "custom/dwl_tag#7": {
-      "exec": "~/.local/bin/waybar-dwl.sh DP-1 7",
+      "exec": "~/.local/bin/waybar-dwl.sh '' 7",
       "format": "{}",
       "return-type": "json"
     },
     "custom/dwl_tag#8": {
-      "exec": "~/.local/bin/waybar-dwl.sh DP-1 8",
+      "exec": "~/.local/bin/waybar-dwl.sh '' 8",
       "format": "{}",
       "return-type": "json"
     },
     "custom/dwl_tag#9": {
-      "exec": "~/.local/bin/waybar-dwl.sh DP-1 9",
+      "exec": "~/.local/bin/waybar-dwl.sh '' 9",
       "format": "{}",
       "return-type": "json"
     },
     "custom/dwl_layout": {
-      "exec": "~/.local/bin/waybar-dwl.sh DP-1 layout",
+      "exec": "~/.local/bin/waybar-dwl.sh '' layout",
       "format": "{}",
       "escape": true,
       "return-type": "json"
     },
     "custom/dwl_title": {
-      "exec": "~/.local/bin/waybar-dwl.sh DP-1 title",
+      "exec": "~/.local/bin/waybar-dwl.sh '' title",
       "format": "{}",
       "escape": true,
       "return-type": "json"
@@ -432,7 +194,7 @@
         "format-icons": ["", "", "", "", ""]
     },
     "network": {
-        //"interface": "wl*", // (Optional) To force the use of this interface
+        "interface": "wl*", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ({signalStrength}%) ",
         "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
         "format-linked": "{ifname} (No IP) ",
@@ -471,4 +233,4 @@
         "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
     }
-}]
+}
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 02e9c8c..baa373d 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1,4 +1,3 @@
-
 unset HISTFILE
 
 # Other XDG paths