merge wayland and master

4 files changed, 709 insertions, 0 deletions

diff --git a/waybar/config b/waybar/config
new file mode 100644
index 0000000..6be1ce2
--- /dev/null
+++ b/waybar/config
@@ -0,0 +1,126 @@
+{
+    "layer": "top",
+    "position": "top",
+    "height": 36,
+    "output": "%%DISPLAY%%",
+    "spacing": 4,
+    //"margin-top": 5,
+    //"margin-bottom":5,
+
+    // Choose the order of the modules
+
+    "modules-left":[ "custom/launcher"],
+    "modules-center":[],
+    "modules-right":[ "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight",  "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"],
+
+    // Modules configuration
+
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": " {name} {icon}",
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        }
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+    },
+    "tray": {
+        "icon-size": 20,
+        "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}%",
+        "format-charging": "{capacity}% +",
+        "format-plugged": "{capacity}% =",
+        "format-alt": "{time}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        //"format-icons": ["", "", "", "", ""]
+    },
+    "battery#bat0": {
+        "bat": "BAT0"
+    },
+    "battery#bat1": {
+        "bat": "BAT1"
+    },
+    "network": {
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "Connected  ",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu"
+    },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{volume}% {icon}",
+        "format-bluetooth": "{volume}% {icon}",
+        "format-bluetooth-muted": "{icon} {format_source}",
+        "format-muted": "{format_source}",
+        "format-source": "",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+    "custom/launcher":{
+        "format": "",
+        "on-click": "exec $(tofi-drun)",
+        "on-click-right": "killall tofi"
+    },
+    "custom/power":{
+        "format": "  ",
+        "on-click": "nwg-bar",
+        "on-click-right": "killall nwg-bar"
+    },
+    "custom/snip":{
+        "format": " ",
+        "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')"
+    }
+}
diff --git a/waybar/config-Hyprland b/waybar/config-Hyprland
new file mode 100644
index 0000000..903fcc7
--- /dev/null
+++ b/waybar/config-Hyprland
@@ -0,0 +1,137 @@
+{
+    "layer": "top",
+    "position": "top",
+    "height": 36,
+    "output": "%%DISPLAY%%",
+    "spacing": 4,
+    //"margin-top": 5,
+    //"margin-bottom":5,
+
+    // Choose the order of the modules
+
+    "modules-left":[ "wlr/workspaces", "custom/launcher", "hyprland/window"],
+    "modules-center":[],
+    "modules-right":[ "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight",  "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"],
+
+    // Modules configuration
+
+    "wlr/workspaces": {
+      "format": "{name}",
+      "active-only": false,
+      "all-outputs": true,
+      "on-scroll-up": "hyprctl dispatch workspace e+1",
+      "on-scroll-down": "hyprctl dispatch workspace e-1"
+    },
+    "hyprland/window": {
+      "separate-outputs": true,
+      "format": "{}"
+    },
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": " {name} {icon}",
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        }
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+    },
+    "tray": {
+        "icon-size": 20,
+        "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}%",
+        "format-charging": "{capacity}% +",
+        "format-plugged": "{capacity}% =",
+        "format-alt": "{time}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        //"format-icons": ["", "", "", "", ""]
+    },
+    "battery#bat0": {
+        "bat": "BAT0"
+    },
+    "battery#bat1": {
+        "bat": "BAT1"
+    },
+    "network": {
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "Connected  ",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu"
+    },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{volume}% {icon}",
+        "format-bluetooth": "{volume}% {icon}",
+        "format-bluetooth-muted": "{icon} {format_source}",
+        "format-muted": "{format_source}",
+        "format-source": "",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+    "custom/launcher":{
+        "format": "",
+        "on-click": "exec $(tofi-drun)",
+        "on-click-right": "killall tofi"
+    },
+    "custom/power":{
+        "format": "  ",
+        "on-click": "nwg-bar",
+        "on-click-right": "killall nwg-bar"
+    },
+    "custom/snip":{
+        "format": " ",
+        "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')"
+    }
+}
diff --git a/waybar/config-river b/waybar/config-river
new file mode 100644
index 0000000..3e84358
--- /dev/null
+++ b/waybar/config-river
@@ -0,0 +1,129 @@
+{
+    "layer": "top",
+    "position": "top",
+    "OUTPUT": "%%DISPLAY%%",
+    "height": 36,
+    "spacing": 4,
+    //"margin-top": 5,
+    //"margin-bottom":5,
+
+    // Choose the order of the modules
+
+    "modules-left":[ "river/tags", "custom/launcher"],
+    "modules-center":[],
+    "modules-right":[ "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight",  "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"],
+
+    // Modules configuration
+
+    "river/tags": {
+        "num-tags": 9,
+    },
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": " {name} {icon}",
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        }
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+    },
+    "tray": {
+        "icon-size": 20,
+        "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}%",
+        "format-charging": "{capacity}% +",
+        "format-plugged": "{capacity}% =",
+        "format-alt": "{time}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        //"format-icons": ["", "", "", "", ""]
+    },
+    "battery#bat0": {
+        "bat": "BAT0"
+    },
+    "battery#bat1": {
+        "bat": "BAT1"
+    },
+    "network": {
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "Connected  ",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu"
+    },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{volume}% {icon}",
+        "format-bluetooth": "{volume}% {icon}",
+        "format-bluetooth-muted": "{icon} {format_source}",
+        "format-muted": "{format_source}",
+        "format-source": "",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+    "custom/launcher":{
+        "format": "",
+        "on-click": "exec $(tofi-drun)",
+        "on-click-right": "killall tofi"
+    },
+    "custom/power":{
+        "format": "  ",
+        "on-click": "nwg-bar",
+        "on-click-right": "killall nwg-bar"
+    },
+    "custom/snip":{
+        "format": " ",
+        "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')"
+    }
+}
diff --git a/waybar/style.css b/waybar/style.css
new file mode 100644
index 0000000..8333fb6
--- /dev/null
+++ b/waybar/style.css
@@ -0,0 +1,317 @@
+* {
+    border: 0px;
+    margin: 0px;
+    border-radius: 0px;
+    /* `otf-font-awesome` is required to be installed for icons */
+    font-family: mononoki Nerd Font Mono;
+    font-size: 18px;
+    min-height: 0px;
+    min-width: 0px;
+}
+
+window#waybar {
+    background-color: transparent;
+    color: #ffffff;
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+window#waybar.hidden {
+    opacity: 0.2;
+}
+
+
+#workspaces button {
+    background: #1f1f1f;
+    color: #ffffff;
+    border-radius: 20px;
+
+}
+
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+
+#workspaces button {
+    background: #2b55b2;
+    color: white;
+    border-bottom: 3px solid #000000;
+}
+
+#workspaces button:hover {
+    background: #39c1ed;
+    color: black;
+    border-bottom: 3px solid #ffffff;
+
+}
+
+#workspaces button.active {
+    background: #39c1ed;
+}
+
+#workspaces button.active:hover {
+    background: #39c1ed;
+    color: black;
+    border-bottom: 3px solid #ffffff;
+
+}
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
+}
+
+#mode {
+    background-color: #64727D;
+    border-bottom: 3px solid #ffffff;
+}
+
+#clock,
+#battery,
+#cpu,
+#memory,
+#disk,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#custom-media,
+#custom-launcher,
+#custom-power,
+#custom-layout,
+#custom-updater,
+#custom-snip,
+#custom-wallpaper,
+#tags,
+#taskbar,
+#tray,
+#mode,
+#idle_inhibitor,
+#mpd {
+    padding: 0px 9px;
+    margin: 0px;
+    color: #ffffff;
+}
+
+#window,
+#workspaces {
+    margin: 0px 4px;
+}
+
+/* If workspaces is the leftmost module, omit left margin */
+.modules-left > widget:first-child > #workspaces {
+    margin-left: 0px;
+}
+
+/* If workspaces is the rightmost module, omit right margin */
+.modules-right > widget:last-child > #workspaces {
+    margin-right: 0px;
+}
+
+#clock {
+    background-color: #171717;
+    color: #ffffff;
+}
+
+#battery {
+    background-color: #ffffff;
+    color: #000000;
+}
+
+#battery.charging, #battery.plugged {
+    color: #ffffff;
+    background-color: #26A65B;
+}
+
+@keyframes blink {
+    to {
+        background-color: #ffffff;
+        color: #000000;
+    }
+}
+
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: #ffffff;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+label:focus {
+    background-color: #000000;
+}
+
+#cpu {
+    background-color: #171717;
+    color: #ffffff;
+}
+
+#memory {
+    background-color: #171717;
+    color: #ffffff;
+}
+
+#disk {
+    background-color: #171717;
+    color: #ffffff;
+}
+
+#backlight {
+    background-color: #90b1b1;
+}
+
+#network {
+    background-color: #171717;
+    color: #ffffff;
+}
+
+#network.disconnected {
+    background-color: #171717;
+    color: red;
+}
+
+#pulseaudio {
+    background-color: #171717;
+    color: #ffffff;
+}
+
+#pulseaudio.muted {
+    background-color: #171717;
+    color: red;
+}
+
+#custom-media {
+    background-color: #171717;
+    color: white;
+}
+
+#custom-media.custom-spotify {
+    background-color: #171717;
+    color: white;
+
+}
+
+#custom-media.custom-vlc {
+    background-color: #171717;
+    color: white;
+}
+
+#custom-power{
+    background-color: #171717;
+    font-size: 18px;
+    margin-right: 5px;
+
+}
+
+#custom-launcher{
+    background-color: #171717;
+    font-size: 20px;
+    margin-left: 5px;
+
+}
+
+#custom-layout{
+    background-color: #171717;
+    color: white;
+    font-size:20px;
+}
+
+#custom-updater {
+    background-color: #171717;
+    color: white;
+}
+
+#custom-snip {
+    background-color: #171717;
+    color: skyblue;
+    font-size: 20px;
+}
+
+#custom-wallpaper {
+    background-color: #171717;
+    color: pink;
+    font-size: 20px;
+}
+
+#tags{
+    background-color: #171717;
+    font-size: 20px;
+}
+
+#tags button.occupied {
+    color: skyblue;
+    background-color: #272727;
+}
+#tags button.focused {
+    color: black;
+    background-color: white;
+}
+#tags button.urgent{
+    color: red;
+    background-color:white;
+}
+
+
+#taskbar{
+    background-color: #171717;
+    border-radius: 0px 20px 20px 0px;
+}
+
+#temperature {
+    background-color: #171717;
+    color: #ffffff;
+}
+
+#temperature.critical {
+    background-color: #eb4d4b;
+}
+
+#tray {
+    background-color: #171717;
+    color: #ffffff;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+    background-color: #171717;
+    color: #ffffff;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #171717;
+    color: #ffffff;
+}
+
+#idle_inhibitor {
+    background-color: #171717;
+    border-radius: 20px 0px 0px 20px;
+
+}
+
+#idle_inhibitor.activated {
+    background-color: #198844;
+    color: #ffffff;
+    border-radius: 20px 0px 0px 20px;
+
+}
+
+#language {
+    background-color: #171717;
+    color: #ffffff;
+    min-width: 16px;
+}
+
+#keyboard-state {
+    background: #97e1ad;
+    color: #000000;
+    min-width: 16px;
+}
+
+#keyboard-state > label {
+    padding: 0px 5px;
+}
+
+#keyboard-state > label.locked {
+    background: rgba(0, 0, 0, 0.2);
+}