diff --git a/dotfiles/black.png b/dotfiles/hypr/black.png
similarity index 100%
rename from dotfiles/black.png
rename to dotfiles/hypr/black.png
diff --git a/dotfiles/waybar/config b/dotfiles/waybar/config
new file mode 100644
index 0000000..2f97696
--- /dev/null
+++ b/dotfiles/waybar/config
@@ -0,0 +1,177 @@
+{
+ // "layer": "top", // Waybar at top layer
+ // "position": "bottom", // Waybar position (top|bottom|left|right)
+ "height": 24, // 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", "cpu", "memory", "temperature", "backlight", "keyboard-state", "battery", "battery#bat2", "clock", "tray"],
+ "modules-right": ["mpd", "idle_inhibitor", "temperature", "cpu", "memory","network", "pulseaudio", "backlight", "keyboard-state", "battery", "battery#bat2", "tray", "clock"],
+ // 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": "<span style=\"italic\">{}</span>"
+ },
+ "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": " {title} - {artist} {stateIcon} [{elapsedTime:%M:%S}/{totalTime:%M:%S}] {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}[{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": "<span color=\"#f53c3c\"></span> ",
+ "on": " "
+ },
+ "repeat-icons": {
+ "on": " "
+ },
+ "single-icons": {
+ "on": "1 "
+ },
+ "state-icons": {
+ "paused": "",
+ "playing": ""
+ },
+ "tooltip-format": "MPD (connected)",
+ "tooltip-format-disconnected": "MPD (disconnected)",
+ "on-click": "mpc toggle",
+ "on-click-right": "foot -a ncmpcpp ncmpcpp",
+ "on-scroll-up": "mpc volume +2",
+ "on-scroll-down": "mpc volume -2"
+
+ },
+ "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}"
+ "format": "{:L%Y-%m-%d<small>[%a]</small> <tt><small>%p</small></tt>%I:%M}"
+ //"format": "{:%Y-%m-%d %H:%M}"
+ },
+ "cpu": {
+ "format": " {usage}%",
+// "tooltip": false
+ },
+ "memory": {
+ "format": " {}%"
+ },
+ "temperature": {
+ "thermal-zone": 2,
+ "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
+ "critical-threshold": 80,
+ "format-critical": "{icon} {temperatureC}°C",
+ "format": "{icon} {temperatureC}°C",
+ "format-icons": ["", "", ""]
+ },
+ "backlight": {
+ // "device": "acpi_video1",
+ "format": "{icon} {percent}%",
+ "format-icons": ["", "", "", "", "", "", "", "", ""]
+ },
+ "battery": {
+ "states": {
+ // "good": 95,
+ "warning": 30,
+ "critical": 15
+ },
+ "format": "{icon} {capacity}%",
+ "format-charging": " {capacity}%",
+ "format-plugged": " {capacity}%",
+ "format-alt": "{icon} {time}",
+ // "format-good": "", // An empty format will hide the module
+ // "format-full": "",
+ "format-icons": ["", "", "", "", ""]
+ },
+ "battery#bat2": {
+ "bat": "BAT2"
+ },
+ "network": {
+ // "interface": "wlp2*", // (Optional) To force the use of this interface
+ "format-wifi": "{essid} ({signalStrength}%) ",
+ "format-ethernet": " {ifname}",
+ "tooltip-format": " {ifname} via {gwaddr}",
+ "format-linked": " {ifname} (No IP)",
+ "format-disconnected": "Disconnected ⚠ {ifname}",
+ "format-alt": " {ifname}: {ipaddr}/{cidr}"
+ },
+ "pulseaudio": {
+ "scroll-step": 5, // %, can be a float
+ "format": "{icon} {volume}% {format_source}",
+ "format-bluetooth": " {icon} {volume}% {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",
+ "on-click-right": "foot -a pw-top pw-top"
+ },
+ "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
+ }
+}
+
diff --git a/dotfiles/waybar/style.css b/dotfiles/waybar/style.css
new file mode 100644
index 0000000..4186d8d
--- /dev/null
+++ b/dotfiles/waybar/style.css
@@ -0,0 +1,189 @@
+* {
+ /* `otf-font-awesome` is required to be installed for icons */
+ font-family: "Noto Sans CJK KR Regular";
+ font-size: 13px;
+ min-height: 0;
+}
+
+window#waybar {
+ background: transparent;
+ /* background-color: rgba(43, 48, 59, 0.5); */
+ /* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */
+ color: #ffffff;
+ transition-property: background-color;
+ transition-duration: .5s;
+}
+
+window#waybar.hidden {
+ opacity: 0.2;
+}
+
+#waybar.empty #window {
+ background-color: transparent;
+}
+
+#workspaces {
+}
+
+#window {
+ margin: 2;
+ padding-left: 8;
+ padding-right: 8;
+ background-color: rgba(0,0,0,0.3);
+ font-size:14px;
+ font-weight: bold;
+}
+
+button {
+ /* Use box-shadow instead of border so the text isn't offset */
+ box-shadow: inset 0 -3px transparent;
+ /* Avoid rounded borders under each button name */
+ border: none;
+ border-radius: 0;
+}
+
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+button:hover {
+ background: inherit;
+ border-top: 2px solid #c9545d;
+}
+
+#workspaces button {
+ padding: 0 4px;
+ /* background-color: rgba(0,0,0,0.3); */
+}
+
+#workspaces button:hover {
+}
+
+#workspaces button.focused {
+ /* box-shadow: inset 0 -2px #c9545d; */
+ background-color: rgba(0,0,0,0.3);
+ color:#c9545d;
+ border-top: 2px solid #c9545d;
+}
+
+#workspaces button.urgent {
+ background-color: #eb4d4b;
+}
+
+#mode {
+ background-color: #64727D;
+ border-bottom: 3px solid #ffffff;
+}
+
+#clock,
+#battery,
+#cpu,
+#memory,
+#disk,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#wireplumber,
+#custom-media,
+#tray,
+#mode,
+#idle_inhibitor,
+#scratchpad,
+#mpd {
+ margin: 2px;
+ padding-left: 4px;
+ padding-right: 4px;
+ background-color: rgba(0,0,0,0.3);
+ color: #ffffff;
+}
+
+/* If workspaces is the leftmost module, omit left margin */
+.modules-left > widget:first-child > #workspaces {
+ margin-left: 0;
+}
+
+/* If workspaces is the rightmost module, omit right margin */
+.modules-right > widget:last-child > #workspaces {
+ margin-right: 0;
+}
+
+#clock {
+ font-size:14px;
+ font-weight: bold;
+}
+
+#battery icon {
+ color: red;
+}
+
+#battery.charging, #battery.plugged {
+ color: #ffffff;
+ background-color: #26A65B;
+}
+
+@keyframes blink {
+ to {
+ background-color: #ffffff;
+ color: #000000;
+ }
+}
+
+#battery.warning: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;
+}
+
+#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;
+}
+
+#network.disconnected {
+ background-color: #f53c3c;
+}
+
+#temperature.critical {
+ background-color: #eb4d4b;
+}
+
+#idle_inhibitor.activated {
+ background-color: #ecf0f1;
+ color: #2d3436;
+}
+
+#tray > .passive {
+ -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+ -gtk-icon-effect: highlight;
+ background-color: #eb4d4b;
+}
+
+/*
+
+window#waybar.solo {
+background-color: #FFFFFF;
+}
+
+window#waybar.termite {
+background-color: #3F3F3F;
+}
+
+window#waybar.chromium {
+background-color: #000000;
+border: none;
+}
+ */
diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index e945bf1..b93ae4f 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -191,6 +191,7 @@ home-manager = {
xdg-desktop-portal-hyprland
rofi-wayland
pavucontrol
+ blueman
hyprlock
# gnomeExtensions.appindicator
@@ -201,7 +202,7 @@ home-manager = {
eza
bat
ripgrep
- git
+ gitFull
rustup
helix
thunderbird