diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index cb60fb8..b94063a 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -8,6 +8,7 @@ source = rules.conf exec-once = nm-applet & exec-once = waybar & exec-once = hyprpm reload -n +exec-once = hyprpaper env = XCURSOR_SIZE,24 env = HYPRCURSOR_SIZE,24 diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf index 292df4f..19e6146 100644 --- a/.config/hypr/hyprlock.conf +++ b/.config/hypr/hyprlock.conf @@ -1,6 +1,6 @@ background { monitor = - path = ~/wallpapers/solace1.jpg + path = ~/wallpapers/japan-street-Dark.png color = rgba(25, 20, 20, 1.0) blur_passes = 2 } @@ -30,7 +30,7 @@ label { text = Hi there, $USER color = rgba(240, 240, 240, 0.8) font_size = 25 - font_family = Fira Sans + font_family = JetBrainsMono Nerd Font shadow_passes = 4 shadow_size = 3 @@ -44,7 +44,7 @@ label { text = $TIME12 color = rgba(255,255,255,1) font_size = 35 - font_family = Fira Sans Bold + font_family = JetBrainsMono Nerd Font shadow_passes = 6 position = 0, 120 diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf new file mode 100644 index 0000000..8e9dfce --- /dev/null +++ b/.config/hypr/hyprpaper.conf @@ -0,0 +1,2 @@ +preload = ~/wallpapers/japan-street-Dark.png +wallpaper = , ~/wallpapers/japan-street-Dark.png \ No newline at end of file diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index e510f51..a73bf2b 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -1,124 +1,62 @@ { "layer": "top", "position": "top", - "mod": "dock", - "exclusive": true, - "passthrough": false, - "gtk-layer-shell": true, - "height": 50, - "modules-left": ["custom/launch_rofi","hyprland/workspaces","cpu","memory","disk","clock"], - "modules-center": ["wlr/taskbar"], - "modules-right": ["network","battery","backlight","pulseaudio","pulseaudio#microphone","tray"], - - - "hyprland/window": { - "format": "{}" - }, - - "custom/launch_rofi": { - "format": "", - "on-click": "sh -c 'rofi -show drun -config ~/.config/rofi/config.rasi' & disown", - "tooltip": false - }, - - "cpu": { - "interval": 10, - "format": " {usage}%", - "max-length": 10 - }, - - "disk": { - "interval": 30, - "format": "󰋊 {percentage_used}%", - "path": "/", - "tooltip": true, - "tooltip-format": "HDD - {used} used out of {total} on {path} ({percentage_used}%)" - }, - - "memory": { - "interval": 30, - "format": " {}%", - "max-length": 10, - "tooltip": true, - "tooltip-format": "Memory - {used:0.1f}GB used" - }, - - "wlr/taskbar": { + "height": 32, + "margin": 0, + "modules-left": [ + "hyprland/workspaces", + "hyprland/window" + ], + "modules-center": [ + "clock" + ], + "modules-right": [ + "tray", + "network", + "pulseaudio", + "custom/lock" + ], + "hyprland/workspaces": { + "disable-scroll": false, + "all-outputs": false, "format": "{icon}", - "icon-size": 18, - "spacing": 0, - "on-click-middle" : "close", - "tooltip-format": "{title}", - "on-click": "activate" - }, - - "tray": { - "icon-size": 18, - "spacing": 10 - }, - - "clock": { - "format": "{:%H:%M}  ", - "tooltip-format": "{:%A, %B %d, %Y}", - }, - - "backlight": { - "device": "intel_backlight", - "format": "{icon} {percent}%", - "format-icons": ["󰃞", "󰃟", "󰃠"], - "on-scroll-up": "~/.config/HyprV/waybar/scripts/brightness --inc", - "on-scroll-down": "~/.config/HyprV/waybar/scripts/brightness --dec", - "min-length": 6 - }, - - "network": { - /* "format-wifi": "直", */ - "format-wifi": " {icon}", - "format-ethernet": " ", - "format-disconnected": "睊", - "tooltip-format": "{essid}", - "on-click": "nm-connection-editor", - "format-icons": ["󰤯 ","󰤟 ","󰤢 ","󰤢 ","󰤨 "] - }, - - "battery": { - "states": { - "good": 95, - "warning": 30, - "critical": 20 - }, - "format": "{icon} {capacity}%", - "format-charging": " {capacity}%", - "format-plugged": " {capacity}%", - "format-alt": "{time} {icon}", - "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"] - }, - - "pulseaudio": { - "format": "{icon} {volume}%", - "format-muted": "", - "on-click": "pavucontrol", - "on-scroll-up": "wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+", - "on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-", - "scroll-step": 5, "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] + "urgent": "", + "active": "", + "default": "" } }, - - "pulseaudio#microphone": { - "format": "{format_source}", - "format-source": " {volume}%", - "format-source-muted": "", - "on-click": "pavucontrol", - "on-scroll-up": "wpctl set-volume -l 1 @DEFAULT_AUDIO_SOURCE@ 5%+", - "on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-", - "scroll-step": 5 + "hyprland/window": { + "format": "{}", + "icon": "true", + "tooltip": false + }, + "clock": { + "format": "{:%I:%M %p}", + "tooltip": false + }, + "network": { + "format-wifi": " {essid} ({signalStrength}%)", + "format-ethernet": "{ifname}: {ipaddr}/{cidr} ", + "format-disconnected": "Disconnected ⚠", + "tooltip": false + }, + "pulseaudio": { + "scroll-step": 5, + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon}", + "format-muted": "", + "format-icons": { + "default": [ + "", + "" + ] + }, + "on-click": "pavucontrol" + }, + "custom/lock": { + "format": "", + "on-click": "hyprlock", + "tooltip": false } -} +} \ No newline at end of file diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 2b7c354..a9424b3 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,195 +1,66 @@ * { - border: none; - border-radius: 0; - font-family: "JetBrainsMono Nerd Font"; - font-weight: bold; - font-size: 15px; + border: 0; + border-radius: 0px; + font-family: "JetBrainsMono Nerd Font, Font Awesome, monospace"; + font-size: 14px; min-height: 0; + border-radius: 0px; + font-weight: 900; } -window#waybar { - background: rgba(0, 0, 0, 0); - color: #cdd6f4; +#waybar { + background: #191414; + color: #ABB2BF; } -tooltip { - background: #1e1e2e; - border-radius: 10px; - border-width: 2px; - border-style: solid; - border-color: #11111b; +#network, +#pulseaudio { + padding-right: 16px; + padding-left: 4px; } -tooltip label{ - color: #cdd6f4; +#workspaces { + margin-right: 16px; } #workspaces button { - padding: 5px; - color: #313244; - margin-right: 5px; + color: rgb(255, 255, 255); + border-bottom: 2px solid transparent; } #workspaces button.active { - color: #a6adc8; -} - -#workspaces button.focused { - color: #a6adc8; - background: #eba0ac; - border-radius: 10px; -} - -#workspaces button.urgent { - color: #11111b; - background: #a6e3a1; - border-radius: 10px; -} - -#workspaces button:hover { - background: #11111b; - color: #cdd6f4; - border-radius: 10px; -} - -#custom-launch_wofi, -#custom-lock_screen, -#custom-light_dark, -#custom-power_btn, -#custom-power_profile, -#custom-weather, -#custom-myhyprv, -#window, -#cpu, -#disk, -#custom-updates, -#memory, -#battery, -#pulseaudio, -#network, -#tray, -#temperature, -#workspaces, -#backlight { - background: #000000; - padding: 0px 10px; - margin: 3px 0px; - margin-top: 7px; - border: 0px; -} - -#network , #backlight, #custom-launch_wofi, #cpu { - border-radius: 10px 0px 0px 10px; -} - -#custom-light_dark, #workspaces, #pulseaudio.microphone, #battery, #disk { - border-radius: 0px 10px 10px 0px; - margin-right: 10px; -} - -#temperature.critical { - color: #e92d4d; -} - - -#workspaces { - padding-right: 0px; - padding-left: 5px; -} - -#window { - border-radius: 10px; - margin-left: 20px; - margin-right: 20px; -} - -#custom-launch_wofi { - color: #cdd6f4; - margin-left: 5px; - border-right: 0px; -} - -#pulseaudio { - color: #cdd6f4; - border-left: 0px; - border-right: 0px; -} - -#pulseaudio.microphone { - color: #cdd6f4; - border-left: 0px; - border-right: 0px; -} - -#battery { - color: #cdd6f4; - border-left: 0px; -} - -#tray{ - background: #000000; - opacity: 0.7; - padding: 0px 10px; - margin: 3px 0px; - margin-right: 5px; - margin-top: 7px; - border: 5px; - border-radius: 10px; - padding-right: 10px; - padding-left: 10px; + border-bottom: 2px solid #ABB2BF; } #clock { - background: #000000; - opacity: 0.7; - padding: 0px 10px; - margin: 3px 0px; - margin-top: 7px; - border: 5px; - border-radius: 10px; - padding-right: 10px; - padding-left: 10px; + border-bottom: 2px solid #ABB2BF; } -#taskbar { - background: #000000; - opacity: 0.7; - padding: 0px 10px; - margin: 3px 0px; - margin-top: 7px; - border: 5px; - border-radius: 10px; - padding-right: 10px; - padding-left: 10px; +#tray { + padding: 0 8px; + border-bottom: 2px solid rgb(198, 120, 221); } -#taskbar button { - box-shadow: none; - text-shadow: none; - padding: 0px; - border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; - padding-left: 3px; - padding-right: 3px; - color: #93cee9; - animation: gradient_f 5s ease-in infinite; - transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); +#network { + border-bottom: 2px solid lightsalmon; + color: lightsalmon; } -#taskbar button:hover { - background: #11111b; - color: #cdd6f4; +#network.disconnected { + background: #E06C75; } - -#taskbar button.active { - background: #93cee9; - color: #ffffff; - margin-left: 3px; - padding-left: 10px; - padding-right: 10px; - margin-right: 3px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); +#pulseaudio { + color: rgb(97, 175, 239); + border-bottom: 2px solid rgb(97, 175, 239); } + +#custom-lock { + transition: all 100ms ease-in-out; + padding-right: 16px; + padding-left: 12px; +} + +#custom-lock:hover { + color: #E06C75; +} \ No newline at end of file