diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 60c0715..477b4fb 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -19,7 +19,7 @@ $menu = wofi --show drun
### AUTOSTART ###
#################
-exec-once = waybar & hyprpaper & nm-applet --indicator & blueman-applet
+exec-once = waybar & hyprpaper & nm-applet --indicator & blueman-applet & swww-daemon
#############################
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index e97d824..469e37f 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -2,7 +2,7 @@ hide_cursor = true
background {
monitor =
- path = ~/.config/hypr/wallpapers/makima.jpg
+ path = ~/.config/hypr/wallpapers/osaka.png
# color = rgba(25, 20, 20, 1.0)
# all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf
deleted file mode 100644
index 3a01b84..0000000
--- a/.config/hypr/hyprpaper.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-preload = ~/.config/hypr/wallpapers/makima.jpg
-
-wallpaper = eDP-1, ~/.config/hypr/wallpapers/makima.jpg
-
-splash = false
diff --git a/.config/hypr/wallpapers/frieren1.jpeg b/.config/hypr/wallpapers/frieren1.jpeg
new file mode 100644
index 0000000..722cbcc
Binary files /dev/null and b/.config/hypr/wallpapers/frieren1.jpeg differ
diff --git a/.config/hypr/wallpapers/frieren2.jpeg b/.config/hypr/wallpapers/frieren2.jpeg
new file mode 100644
index 0000000..a23e768
Binary files /dev/null and b/.config/hypr/wallpapers/frieren2.jpeg differ
diff --git a/.config/hypr/wallpapers/frieren3.jpeg b/.config/hypr/wallpapers/frieren3.jpeg
new file mode 100644
index 0000000..10e1f17
Binary files /dev/null and b/.config/hypr/wallpapers/frieren3.jpeg differ
diff --git a/.config/hypr/wallpapers/osaka.jpg b/.config/hypr/wallpapers/osaka.jpg
new file mode 100644
index 0000000..c6331f1
Binary files /dev/null and b/.config/hypr/wallpapers/osaka.jpg differ
diff --git a/.config/hypr/wallpapers/osaka.png b/.config/hypr/wallpapers/osaka.png
new file mode 100644
index 0000000..a0c778f
Binary files /dev/null and b/.config/hypr/wallpapers/osaka.png differ
diff --git a/.config/hypr/wallpapers/rocket.gif b/.config/hypr/wallpapers/rocket.gif
new file mode 100644
index 0000000..f8f1ca3
Binary files /dev/null and b/.config/hypr/wallpapers/rocket.gif differ
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 5906285..6ea0fb2 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -1,60 +1,27 @@
// -*- mode: jsonc -*-
{
- "layer": "top", // Waybar at top layer
- "height": 30, // Waybar height (to be removed for auto height)
- "spacing": 4, // Gaps between modules (4px)
+ "layer": "top",
+ "height": 30,
+ "spacing": 4,
"margin": 10,
"modules-left": [
- "hyprland/workspaces",
- "custom/media"
+ "clock",
+ "cpu",
+ "temperature",
+ "memory",
+ "disk",
],
"modules-center": [
- "clock"
+ "hyprland/workspaces",
],
"modules-right": [
- "pulseaudio",
"network",
- "cpu",
- "memory",
+ "pulseaudio",
"backlight",
"battery",
- "battery#bat2",
"tray",
- "custom/power"
+ "group/group-power"
],
- "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": 5,
- "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": {
- "format": "{icon}",
- "format-icons": {
- "activated": "",
- "deactivated": ""
- }
- },
"tray": {
// "icon-size": 21,
"spacing": 10
@@ -72,9 +39,10 @@
"format": "{}% "
},
"temperature": {
- // "thermal-zone": 2,
- // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+ // "thermal-zone": 8,
+ "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input",
"critical-threshold": 80,
+ "interval": 10,
// "format-critical": "{temperatureC}°C {icon}",
"format": "{temperatureC}°C {icon}",
"format-icons": ["", "", ""]
@@ -86,7 +54,7 @@
},
"battery": {
"states": {
- // "good": 95,
+ "good": 95,
"warning": 30,
"critical": 15
},
@@ -99,17 +67,18 @@
// "format-full": "",
"format-icons": ["", "", "", "", ""]
},
- "battery#bat2": {
- "bat": "BAT2"
+ "disk": {
+ "interval": 30,
+ "format": "{percentage_free}% ",
+ "path": "/home"
},
"network": {
// "interface": "wlp2*", // (Optional) To force the use of this interface
- "format-wifi": "{essid} ({signalStrength}%) ",
+ "format-wifi": "{ipaddr}/{cidr} ({signalStrength}%) ",
"format-ethernet": "{ipaddr}/{cidr} ",
"tooltip-format": "{ifname} via {gwaddr} ",
"format-linked": "{ifname} (No IP) ",
"format-disconnected": "Disconnected ⚠",
- "format-alt": "{ifname}: {ipaddr}/{cidr}",
"tooltip": true
},
"pulseaudio": {
@@ -131,21 +100,46 @@
},
"on-click": "pavucontrol"
},
- "custom/media": {
- "format": "{icon} {}",
- "return-type": "json",
- "max-length": 40,
- "format-icons": {
- "spotify": "",
- "default": "🎜"
+ "group/group-power": {
+ "orientation": "inherit",
+ "drawer": {
+ "transition-duration": 500,
+ "children-class": "not-power",
+ "transition-left-to-right": false,
},
- "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
+ "modules": [
+ "custom/power", // First element is the "group leader" and won't ever be hidden
+ "custom/quit",
+ "custom/lock",
+ "custom/reboot",
+ ]
+ },
+ "custom/quit": {
+ "format": "",
+ "tooltip": false,
+ "on-click": "hyprctl dispatch exit"
+ },
+ "custom/lock": {
+ "format": "",
+ "tooltip": false,
+ "on-click": "hyprlock"
+ },
+ "custom/reboot": {
+ "format": "",
+ "tooltip": false,
+ "on-click": "reboot"
},
"custom/power": {
- "format" : "⏻",
- "tooltip": false,
- "on-click": "wlogout -b 2"
- }
+ "format": "",
+ "tooltip": false,
+ "on-click": "shutdown now"
+ },
+ "hyprland/workspaces": {
+ "format": "{icon}",
+ "on-click": "activate",
+ "format-icons": {
+ "default": ""
+ },
+ "sort-by-number": true
+ },
}
diff --git a/.config/waybar/config.jsonc.save b/.config/waybar/config.jsonc.save
deleted file mode 100644
index 7e0771f..0000000
--- a/.config/waybar/config.jsonc.save
+++ /dev/null
@@ -1,215 +0,0 @@
-// -*- mode: jsonc -*-
-{
- // "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",
- "network",
- "power-profiles-daemon",
- "cpu",
- "memory",
- "temperature",
- "backlight",
- "keyboard-state",
- "sway/language",
- "battery",
- "battery#bat2",
- "clock",
- "tray",
- "custom/power"
- ],
- // Modules configuration
- // "sway/workspaces": {
- // "disable-scroll": true,
- // "all-outputs": true,
- // "warp-on-scroll": false,
- // "format": "{name}: {icon}",
- // "format-icons": {
- // "1": "",
- // "2": "",
- // "3": "",
- // "4": "",
- // "5": "",
- // "urgent": "",
- // "focused": "",
- // "default": ""
- // }
- // },
- "keyboard-state": {
- "numlock": true,
- "capslock": true,
- "format": "{name} {icon}",
- "format-icons": {
- "locked": "",
- "unlocked": ""
- }
- },
- "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": 5,
- "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": {
- "format": "{icon}",
- "format-icons": {
- "activated": "",
- "deactivated": ""
- }
- },
- "tray": {
- // "icon-size": 21,
- "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-full": "{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"
- },
- "power-profiles-daemon": {
- "format": "{icon}",
- "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
- "tooltip": true,
- "format-icons": {
- "default": "",
- "performance": "",
- "balanced": "",
- "power-saver": ""
- }
- },
- "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-disconnected": "Disconnected ⚠",
- "format-alt": "{ifname}: {ipaddr}/{cidr}"
- },
- "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
- },
- "custom/power": {
- "format" : "⏻ ",
- "tooltip": false,
- "menu": "on-click",
- "menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder
- "menu-actions": {
- "shutdown": "shutdown",
- "reboot": "reboot",
- "suspend": "systemctl suspend",
- "hibernate": "systemctl hibernate"
- }
- }
-}
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 6adb527..0ad1546 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,62 +1,50 @@
+@define-color rosewater #f5e0dc;
+@define-color flamingo #f2cdcd;
+@define-color pink #f5c2e7;
+@define-color mauve #cba6f7;
+@define-color red #f38ba8;
+@define-color maroon #eba0ac;
+@define-color peach #fab387;
+@define-color yellow #f9e2af;
+@define-color green #a6e3a1;
+@define-color teal #94e2d5;
+@define-color sky #89dceb;
+@define-color sapphire #74c7ec;
+@define-color blue #89b4fa;
+@define-color lavender #b4befe;
+@define-color text #cdd6f4;
+@define-color subtext1 #bac2de;
+@define-color subtext0 #a6adc8;
+@define-color overlay2 #9399b2;
+@define-color overlay1 #7f849c;
+@define-color overlay0 #6c7086;
+@define-color surface2 #585b70;
+@define-color surface1 #45475a;
+@define-color surface0 #313244;
+@define-color base #1e1e2e;
+@define-color mantle #181825;
+@define-color crust #11111b;
+
* {
- font-family: jetbrains-mono-nerd, FontAwesome, Roboto, Helvetica, Arial, sans-serif;
- font-size: 15px;
- font-weight: 600;
+ font-family: jetbrains-mono-nerd, FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+ font-size: 15px;
+ font-weight: 600;
}
window#waybar {
- background-color: #32312e;
- color: white;
- transition-property: background-color;
- transition-duration: .5s;
- border-radius: 25px;
- opacity: 1;
-}
-
-window#waybar.hidden {
- opacity: 0.2;
-}
-
-window#waybar.termite {
- background-color: #3F3F3F;
-}
-
-window#waybar.chromium {
- background-color: #000000;
- border: none;
+ color: white;
+ background-color: #32312e;
+ transition-property: background-color;
+ transition-duration: .5s;
+ opacity: 1;
+ border-radius: 20px;
+ margin-bottom: 0px;
}
.modules-left,
-.modules-right {
- padding: 0px 10px;
-}
-
-#workspaces {
- font-size: 10px;
-}
-
-#workspaces button {
- border-radius: 0;
- color: white;
- margin: 0px 5px;
- padding: 0px;
-}
-
-#workspaces button.active {
- color: #E6C873;
- text-decoration: none;
-}
-
-#workspaces button.urgent {
- color: #eb4d4b;
-}
-
-#workspaces button:hover {
- border: none;
- outline: none;
- box-shadow: none;
- background: none;
- transition: none;
+.modules-right,
+.modules-center {
+ padding: 0px 10px;
}
#clock,
@@ -68,35 +56,108 @@ window#waybar.chromium {
#backlight,
#network,
#pulseaudio,
-#custom-media,
#power,
#tray,
+#custom-power,
+#custom-quit,
+#custom-lock,
+#custom-reboot,
+#workspaces {
+ padding: 7px 10px;
+ opacity: 1;
+}
+
+#network {
+ color: @sky;
+}
+
+#backlight {
+ color: @yellow;
+}
+
+#battery {
+ color: @green;
+}
+
+#pulseaudio {
+ color: @rosewater;
+}
+
+#cpu {
+ color: @teal;
+}
+
+#temperature {
+ color: @lavender;
+}
+
+#memory {
+ color: @yellow;
+}
+
+#disk {
+ color: @pink;
+}
+
+#clock {
+ color: @green;
+}
+
#custom-power {
- padding: 7px 10px;
- color: #E6C873;
- opacity: 1;
+ color: @red;
+}
+
+#custom-lock {
+ color: @lavender;
+}
+
+#custom-quit {
+ color: @green;
+}
+
+#custom-reboot {
+ color: @yellow;
+}
+
+#workspaces button {
+ color: #cfcfcf;
+ margin: 0px 5px;
+ padding: 0px;
+}
+
+#workspaces button.active {
+ color: #E6C873;
+}
+
+#workspaces button.urgent {
+ color: #eb4d4b;
+}
+
+#workspaces button:hover {
+ border: none;
+ outline: none;
+ box-shadow: none;
+ text-shadow: none;
+ background: none;
+ transition: none;
}
.modules-left > widget:first-child > #workspaces {
- margin-left: 0;
+ margin-left: 0;
}
.modules-right > widget:last-child > #workspaces {
- margin-right: 0;
-}
-
-#custom-media {
- min-width: 100px;
+ margin-right: 0;
}
#battery.charging, #battery.plugged {
- color: #26A65B;
+ color: #26A65B;
}
#temperature.critical {
- color: #eb4d4b;
+ color: #eb4d4b;
}
#battery.critical:not(.charging) {
- color: #f53c3c;
+ color: #f53c3c;
}