diff --git a/hypr/.config/hypr/hyprpaper.conf b/hypr/.config/hypr/hyprpaper.conf
new file mode 100644
index 0000000..599fd73
--- /dev/null
+++ b/hypr/.config/hypr/hyprpaper.conf
@@ -0,0 +1,2 @@
+preload = ~/wallpapers/camp.jpg
+wallpaper = DP-1, ~/wallpapers/camp.jpg
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index dedbbc7..b2c7884 100644
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -1,196 +1,140 @@
{
- "layer": "top", // Waybar at top layer
- "position": "top", // Waybar position (top|bottom|left|right)
- "height": 34, // 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": ["hyprland/workspaces", "idle_inhibitor", "pulseaudio", "backlight", "network", "custom/updates"],
- "modules-center": ["hyprland/window"],
- "modules-right": ["hyprland/submap", "hyprland/language", "cpu", "memory", "temperature", "battery", "tray", "clock"],
- // Modules configuration
- "hyprland/workspaces": {
- "disable-scroll": true,
- "on-click": "activate",
- // "all-outputs": false,
- // "format": "{name}: {icon}",
- "format": "{name}",
- "on-scroll-up": "hyprctl dispatch workspace m-1 > /dev/null",
- "on-scroll-down": "hyprctl dispatch workspace m+1 > /dev/null",
- "format-icons": {
- "1": "",
- "2": "",
- "3": "",
- "4": "",
- "5": "",
- "urgent": "",
- "focused": "",
- "default": ""
- }
- },
- "keyboard-state": {
- "numlock": false,
- "capslock": false,
- "format": "{name} {icon}",
- "format-icons": {
- "locked": "",
- "unlocked": ""
- }
+ "layer": "top",
+ "position": "top",
+ "spacing": 0,
+ "height": 34,
+ "modules-left": [
+ "custom/logo",
+ "hyprland/workspaces"
+ ],
+ "modules-center": [
+ "clock"
+ ],
+ "modules-right": [
+ "tray",
+ "memory",
+ "network",
+ "wireplumber",
+ "battery",
+ "custom/power"
+ ],
+ "wlr/taskbar": {
+ "format": "{icon}",
+ "on-click": "activate",
+ "on-click-right": "fullscreen",
+ "icon-theme": "WhiteSur",
+ "icon-size": 25,
+ "tooltip-format": "{title}"
},
- "hyprland/window": {
- "max-length": 50,
- "separate-outputs": true
- },
- "hyprland/language": {
- "format": "{}",
- "max-length": 18
- },
- "sway/mode": {
- "format": "{}"
- },
- "sway/scratchpad": {
- "format": "{icon} {count}",
- "show-empty": false,
- "format-icons": ["", ""],
- "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": " ",
- "on": " "
- },
- "repeat-icons": {
- "on": " "
- },
- "single-icons": {
- "on": "1 "
- },
- "state-icons": {
- "paused": "",
- "playing": ""
- },
- "tooltip-format": "MPD (connected)",
- "tooltip-format-disconnected": "MPD (disconnected)"
- },
- "idle_inhibitor": {
+ "hyprland/workspaces": {
+ "on-click": "activate",
"format": "{icon}",
"format-icons": {
- "activated": "",
- "deactivated": ""
+ "default": "",
+ "1": "1",
+ "2": "2",
+ "3": "3",
+ "4": "4",
+ "5": "5",
+ "6": "6",
+ "7": "7",
+ "8": "8",
+ "9": "9",
+ "active": "",
+ "urgent": ""
+ },
+ "persistent-workspaces": {
+ "1": [],
+ "2": [],
+ "3": [],
+ "4": [],
+ "5": []
}
},
+ "memory": {
+ "interval": 5,
+ "format": " {}%",
+ "max-length": 10
+ },
"tray": {
- // "icon-size": 21,
- "spacing": 0
+ "spacing": 10
},
"clock": {
- // "timezone": "America/New_York",
- "tooltip-format": "{:%Y %B}\n{calendar}",
- "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": "BAT2"
+ "tooltip-format": "{calendar}",
+ "format-alt": " {:%a, %d %b %Y}",
+ "format": " {:%I:%M %p}"
},
"network": {
- // "interface": "wlan0", // (Optional) To force the use of this interface
- // "format-wifi": "{essid} ",
- "format-ethernet": "{ipaddr}/{cidr} ",
- "tooltip-format": "{ifname} via {gwaddr} ",
- "format-linked": "{ifname} (No IP) ",
- "format-disconnected": "Disconnected ⚠",
- "format-alt": "{ifname}: {ipaddr}/{cidr}"
+ "format-wifi" : "{icon}",
+ "format-icons": ["","","","",""],
+ "format-ethernet": "",
+ "format-alt" : "",
+ "format-disconnected" : "",
+ "tooltip-format-wifi": "{icon} {essid}\n⇣{bandwidthDownBytes} ⇡{bandwidthUpBytes}",
+ "tooltip-format-ethernet": " {ifname}\n⇣{bandwidthDownBytes} ⇡{bandwidthUpBytes}",
+ "tooltip-format-disconnected": "Disconnected",
+ "on-click": "~/.config/rofi/wifi/wifi.sh &",
+ "on-click-right": "~/.config/rofi/wifi/wifinew.sh &",
+ "interval": 5,
+ "nospacing": 1,
},
- "pulseaudio": {
- // "scroll-step": 10, // %, 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": "",
+ "wireplumber": {
+ "format": "{icon}",
+ "format-bluetooth": "",
+ "nospacing": 1,
+ "tooltip-format": "Volume : {volume}%",
+ "format-muted": "",
"format-icons": {
- "headphone": "",
- "hands-free": "",
- "headset": "",
- "phone": "",
- "portable": "",
- "car": "",
- "default": ["", "", ""]
+ "headphone": "",
+ "default": ["","",""]
},
- "on-click": "wiremix"
+ "on-click": "pamixer -t",
+ "scroll-step": 1
},
- "custom/notification": {
+ "custom/logo": {
+ "format": " ",
"tooltip": false,
- "format": "{} {icon}",
- "format-icons": {
- "notification": " ",
- "none": "",
- "dnd-notification": " ",
- "dnd-none": "",
- "inhibited-notification": " ",
- "inhibited-none": "",
- "dnd-inhibited-notification": " ",
- "dnd-inhibited-none": ""
- },
- "return-type": "json",
- "exec-if": "which swaync-client",
- "exec": "swaync-client -swb",
- "on-click": "sleep 0.1 && swaync-client -t -sw",
- "on-click-right": "swaync-client -d -sw",
- "escape": true
+ "on-click": "~/.config/rofi/launchers/misc/launcher.sh &"
},
- "custom/updates": {
- "format": "{} {icon}",
- "return-type": "json",
+ "battery": {
+ "format": "{capacity}% {icon}",
"format-icons": {
- "has-updates": "",
- "updated": ""
+ "charging": [
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ ""
+ ],
+ "default": [
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ ""
+ ]
},
- "exec-if": "which waybar-module-pacman-updates",
- "exec": "waybar-module-pacman-updates --interval-seconds 5 --network-interval-seconds 300 --tooltip-align-columns 'Source Code Pro' --color-semver-updates F15D22,FFCE51,73C48F,48B9C7,88807C"
+ "format-full": "Charged ",
+ "interval": 5,
+ "states": {
+ "warning": 20,
+ "critical": 10
+ },
+ "tooltip": false
+ },
+ "custom/power": {
+ "format": "",
+ "tooltip": false,
+ "on-click": "~/.config/rofi/powermenu/type-2/powermenu.sh &"
}
}
-
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index d5f79ce..d473c0c 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -1,104 +1,133 @@
-@define-color base00 #181818;
-@define-color base01 #2b2e37;
-@define-color base02 #3b3e47;
-@define-color base03 #585858;
-@define-color base04 #b8b8b8;
-@define-color base05 #d8d8d8;
-@define-color base06 #e8e8e8;
-@define-color base07 #f8f8f8;
-@define-color base08 #ab4642;
-@define-color base09 #dc9656;
-@define-color base0A #f7ca88;
-@define-color base0B #a1b56c;
-@define-color base0C #86c1b9;
-@define-color base0D #7cafc2;
-@define-color base0E #ba8baf;
-@define-color base0F #a16946;
-
* {
- transition: none;
- box-shadow: none;
+ border: none;
+ border-radius: 0;
+ min-height: 0;
+ font-family: JetBrainsMono Nerd Font;
+ font-size: 13px;
}
-#waybar {
- font-family: 'Source Code Pro', sans-serif;
- font-size: 1.2em;
- font-weight: 400;
- color: @base04;
- background: @base01;
+window#waybar {
+ background-color: #181825;
+ transition-property: background-color;
+ transition-duration: 0.5s;
+}
+
+window#waybar.hidden {
+ opacity: 0.5;
}
#workspaces {
- margin: 0 4px;
-}
-
-#workspaces button {
- margin: 4px 0;
- padding: 0 4px;
- color: @base05;
-}
-
-#workspaces button.visible {
-}
-
-#workspaces button.active {
- border-radius: 4px;
- background-color: @base02;
-}
-
-#workspaces button.urgent {
- color: rgba(238, 46, 36, 1);
-}
-
-#tray {
- margin: 4px 4px 4px 4px;
- border-radius: 4px;
- background-color: @base02;
-}
-
-#tray * {
- padding: 0 6px;
- border-left: 1px solid @base00;
-}
-
-#tray *:first-child {
- border-left: none;
-}
-
-#mode, #battery, #cpu, #memory, #network, #pulseaudio, #idle_inhibitor, #backlight, #custom-storage, #custom-updates, #custom-weather, #custom-mail, #clock, #temperature, #language{
- margin: 4px 2px;
- padding: 0 6px;
- background-color: @base02;
- border-radius: 4px;
- min-width: 20px;
-}
-
-#pulseaudio.muted {
- color: @base0F;
-}
-
-#pulseaudio.bluetooth {
- color: @base0C;
-}
-
-#clock {
- margin-left: 0px;
- margin-right: 4px;
background-color: transparent;
}
-#temperature.critical {
- color: @base0F;
+#workspaces button {
+ all: initial;
+ /* Remove GTK theme values (waybar #1351) */
+ min-width: 0;
+ /* Fix weird spacing in materia (waybar #450) */
+ box-shadow: inset 0 -3px transparent;
+ /* Use box-shadow instead of border so the text isn't offset */
+ padding: 6px 18px;
+ margin: 6px 3px;
+ border-radius: 4px;
+ background-color: #1e1e2e;
+ color: #cdd6f4;
}
-#window {
- font-size: 0.9em;
- font-weight: 400;
- font-family: sans-serif;
+#workspaces button.active {
+ color: #1e1e2e;
+ background-color: #cdd6f4;
}
-#language {
- font-size: 0.9em;
- font-weight: 500;
- letter-spacing: -1px;
+#workspaces button:hover {
+ box-shadow: inherit;
+ text-shadow: inherit;
+ color: #1e1e2e;
+ background-color: #cdd6f4;
+}
+
+#workspaces button.urgent {
+ background-color: #f38ba8;
+}
+
+#memory,
+#custom-power,
+#battery,
+#backlight,
+#wireplumber,
+#network,
+#clock,
+#tray {
+ border-radius: 4px;
+ margin: 6px 3px;
+ padding: 6px 12px;
+ background-color: #1e1e2e;
+ color: #181825;
+}
+
+#custom-power {
+ margin-right: 6px;
+}
+
+#custom-logo {
+ padding-right: 7px;
+ padding-left: 7px;
+ margin-left: 5px;
+ font-size: 15px;
+ border-radius: 8px 0px 0px 8px;
+ color: #1793d1;
+}
+
+#memory {
+ background-color: #fab387;
+}
+
+#battery {
+ background-color: #f38ba8;
+}
+
+#battery.warning,
+#battery.critical,
+#battery.urgent {
+ background-color: #ff0000;
+ color: #FFFF00;
+}
+
+#battery.charging {
+ background-color: #a6e3a1;
+ color: #181825;
+}
+
+#backlight {
+ background-color: #fab387;
+}
+
+#wireplumber {
+ background-color: #f9e2af;
+}
+
+#network {
+ background-color: #94e2d5;
+ padding-right: 17px;
+}
+
+#clock {
+ font-family: JetBrainsMono Nerd Font;
+ background-color: #cba6f7;
+}
+
+#custom-power {
+ background-color: #f2cdcd;
+}
+
+
+tooltip {
+ border-radius: 8px;
+ padding: 15px;
+ background-color: #131822;
+}
+
+tooltip label {
+ padding: 5px;
+ background-color: #131822;
}