diff --git a/.config/cava/config b/.config/cava/config index 7a21506..c277ca4 100755 --- a/.config/cava/config +++ b/.config/cava/config @@ -1,6 +1,5 @@ [color] gradient = 1 gradient_count = 2 -gradient_color_1 = '#23625a' -gradient_color_2 = '#48675b' - +gradient_color_1 = '#8a897e' +gradient_color_2 = '#928d81' \ No newline at end of file diff --git a/.config/cava/shaders/bar_spectrum.frag b/.config/cava/shaders/bar_spectrum.frag deleted file mode 100644 index b078913..0000000 --- a/.config/cava/shaders/bar_spectrum.frag +++ /dev/null @@ -1,79 +0,0 @@ -#version 330 - -in vec2 fragCoord; -out vec4 fragColor; - -// bar values. defaults to left channels first (low to high), then right (high to low). -uniform float bars[512]; - -uniform int bars_count; // number of bars (left + right) (configurable) -uniform int bar_width; // bar width (configurable), not used here -uniform int bar_spacing; // space bewteen bars (configurable) - -uniform vec3 u_resolution; // window resolution - -//colors, configurable in cava config file (r,g,b) (0.0 - 1.0) -uniform vec3 bg_color; // background color -uniform vec3 fg_color; // foreground color - -uniform int gradient_count; -uniform vec3 gradient_colors[8]; // gradient colors - -vec3 normalize_C(float y,vec3 col_1, vec3 col_2, float y_min, float y_max) -{ - //create color based on fraction of this color and next color - float yr = (y - y_min) / (y_max - y_min); - return col_1 * (1.0 - yr) + col_2 * yr; -} - -void main() -{ - // find which bar to use based on where we are on the x axis - float x = u_resolution.x * fragCoord.x; - int bar = int(bars_count * fragCoord.x); - - //calculate a bar size - float bar_size = u_resolution.x / bars_count; - - //the y coordinate and bar values are the same - float y = bars[bar]; - - // make sure there is a thin line at bottom - if (y * u_resolution.y < 1.0) - { - y = 1.0 / u_resolution.y; - } - - //draw the bar up to current height - if (y > fragCoord.y) - { - //make some space between bars basen on settings - if (x > (bar + 1) * (bar_size) - bar_spacing) - { - fragColor = vec4(bg_color,1.0); - } - else - { - if (gradient_count == 0) - { - fragColor = vec4(fg_color,1.0); - } - else - { - //find which color in the configured gradient we are at - int color = int((gradient_count - 1) * fragCoord.y); - - //find where on y this and next color is supposed to be - float y_min = color / (gradient_count - 1.0); - float y_max = (color + 1.0) / (gradient_count - 1.0); - - //make color - fragColor = vec4(normalize_C(fragCoord.y, gradient_colors[color], gradient_colors[color + 1], y_min, y_max), 1.0); - } - } - } - else - { - fragColor = vec4(bg_color,1.0); - } -} \ No newline at end of file diff --git a/.config/cava/shaders/northern_lights.frag b/.config/cava/shaders/northern_lights.frag deleted file mode 100644 index ecd859a..0000000 --- a/.config/cava/shaders/northern_lights.frag +++ /dev/null @@ -1,34 +0,0 @@ -#version 330 - -in vec2 fragCoord; -out vec4 fragColor; - -// bar values. defaults to left channels first (low to high), then right (high to low). -uniform float bars[512]; - -uniform int bars_count; // number of bars (left + right) (configurable) - -uniform vec3 u_resolution; // window resolution, not used here - -//colors, configurable in cava config file -uniform vec3 bg_color; // background color(r,g,b) (0.0 - 1.0), not used here -uniform vec3 fg_color; // foreground color, not used here - -void main() -{ - // find which bar to use based on where we are on the x axis - int bar = int(bars_count * fragCoord.x); - - float bar_y = 1.0 - abs((fragCoord.y - 0.5)) * 2.0; - float y = (bars[bar]) * bar_y; - - float bar_x = (fragCoord.x - float(bar) / float(bars_count)) * bars_count; - float bar_r = 1.0 - abs((bar_x - 0.5)) * 2; - - bar_r = bar_r * bar_r * 2; - - // set color - fragColor.r = fg_color.x * y * bar_r; - fragColor.g = fg_color.y * y * bar_r; - fragColor.b = fg_color.z * y * bar_r; -} diff --git a/.config/cava/shaders/pass_through.vert b/.config/cava/shaders/pass_through.vert deleted file mode 100644 index a4f20e5..0000000 --- a/.config/cava/shaders/pass_through.vert +++ /dev/null @@ -1,14 +0,0 @@ -#version 330 - - -// Input vertex data, different for all executions of this shader. -layout(location = 0) in vec3 vertexPosition_modelspace; - -// Output data ; will be interpolated for each fragment. -out vec2 fragCoord; - -void main() -{ - gl_Position = vec4(vertexPosition_modelspace,1); - fragCoord = (vertexPosition_modelspace.xy+vec2(1,1))/2.0; -} diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index a6b5808..3d1f5fb 100755 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -6,7 +6,6 @@ $terminal = kitty $fileManager = thunar # $menu = wofi --show drun -n $menu = wofi -n - exec-once = hypridle exec-once = waybar exec-once = swww-daemon @@ -72,7 +71,6 @@ decoration { } animations { enabled = true - bezier = fluid, 0.15, 0.85, 0.25, 1 bezier = snappy, 0.3, 1, 0.4, 1 animation = windows, 1, 3, fluid, popin 5% @@ -86,8 +84,8 @@ dwindle { preserve_split = true } misc { - force_default_wallpaper = 1 - disable_hyprland_logo = true + force_default_wallpaper = -1 + disable_hyprland_logo = true focus_on_activate = true } input { @@ -166,8 +164,8 @@ bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow bind = ALT, TAB, exec, wlogout -b 2 bind = ALT, w, exec, ~/.config/hypr/wallpaper.sh -bind = ALT, a, exec, ~/.config/waybar/refresh.sh -bind = ALT, B, exec, ~/.config/waybar/select.sh +bind = ALT, a, exec, ~/.config/waybar/scripts/refresh.sh +bind = ALT, B, exec, ~/.config/waybar/scripts/select.sh bind = ALT, r, exec, ~/.config/swaync/refresh.sh bind = $mainMod, M, exit bind = $mainMod, SPACE, exec, pypr toggle term @@ -177,9 +175,6 @@ bind = $mainMod, T, exec, pypr toggle taskbar layerrule = blur, waybar layerrule = ignorezero, waybar layerrule = ignorealpha 0.5, waybar -layerrule = blur, rofi -layerrule = ignorezero, rofi -layerrule = ignorealpha 0.5, rofi layerrule = blur, swaync-control-center layerrule = blur, swaync-notification-window layerrule = ignorezero, swaync-control-center @@ -187,4 +182,3 @@ layerrule = ignorezero, swaync-notification-window layerrule = ignorealpha 0.5, swaync-control-center layerrule = ignorealpha 0.5, swaync-notification-window layerrule = noanim, selection - diff --git a/.config/hypr/pyprland.toml b/.config/hypr/pyprland.toml index 5179d17..afd8d9d 100644 --- a/.config/hypr/pyprland.toml +++ b/.config/hypr/pyprland.toml @@ -7,7 +7,7 @@ plugins = [ animation = "fromTop" command = "kitty --class kitty-dropterm" class = "kitty-dropterm" -position = "17% 5%" +position = "17% 6%" size = "65% 60%" offset = "200%" diff --git a/.config/kitty/current-theme.conf b/.config/kitty/current-theme.conf index 5178ea9..ea13bee 100755 --- a/.config/kitty/current-theme.conf +++ b/.config/kitty/current-theme.conf @@ -1,30 +1,30 @@ -foreground #bfc6c8 -background #021E25 +foreground #c5c6c2 +background #191c0e background_opacity 1.0 -cursor #bfc6c8 +cursor #c5c6c2 -active_tab_foreground #021E25 -active_tab_background #bfc6c8 -inactive_tab_foreground #bfc6c8 -inactive_tab_background #021E25 +active_tab_foreground #191c0e +active_tab_background #c5c6c2 +inactive_tab_foreground #c5c6c2 +inactive_tab_background #191c0e -active_border_color #bfc6c8 -inactive_border_color #021E25 -bell_border_color #85523a +active_border_color #c5c6c2 +inactive_border_color #191c0e +bell_border_color #83816e -color0 #021E25 -color8 #5b6b6f -color1 #85523a -color9 #B26E4E -color2 #23625a -color10 #2F8379 -color3 #48675b -color11 #608A7A -color4 #7f6f56 -color12 #AA9473 -color5 #bb6b33 -color13 #FA8F44 -color6 #ab7047 -color14 #E5965F -color7 #8f9799 -color15 #bfc6c8 +color0 #191c0e +color8 #6c705c +color1 #83816e +color9 #AFAC93 +color2 #8a897e +color10 #B9B7A8 +color3 #928d81 +color11 #C3BCAD +color4 #8c927c +color12 #BBC3A6 +color5 #a4a26f +color13 #DBD995 +color6 #969489 +color14 #C9C6B7 +color7 #989a8f +color15 #c5c6c2 diff --git a/.config/nvim/lua/plugins/colors.lua b/.config/nvim/lua/plugins/colors.lua index 8cfe5e6..d08ed02 100755 --- a/.config/nvim/lua/plugins/colors.lua +++ b/.config/nvim/lua/plugins/colors.lua @@ -1,23 +1,23 @@ -return { - "ellisonleao/gruvbox.nvim", - lazy = false, - name = "gruvbox", - priority = 997, - config = function() - vim.cmd.colorscheme("gruvbox") - end, -} - - - -- return { --- "AlphaTechnolog/pywal.nvim", --- lazy = false, --- priority = 1000, --- config = function() --- -- Set up pywal and load the colors --- require("pywal").setup() --- --- end, +-- "ellisonleao/gruvbox.nvim", +-- lazy = false, +-- name = "gruvbox", +-- priority = 997, +-- config = function() +-- vim.cmd.colorscheme("gruvbox") +-- end, -- } + + +return { + "AlphaTechnolog/pywal.nvim", + lazy = false, + priority = 1000, + config = function() + -- Set up pywal and load the colors + require("pywal").setup() + + end, +} + diff --git a/.config/wal/colorschemes/dark/ywal16.json b/.config/wal/colorschemes/dark/ywal16.json new file mode 100644 index 0000000..0430b9c --- /dev/null +++ b/.config/wal/colorschemes/dark/ywal16.json @@ -0,0 +1,27 @@ +{ + "wallpaper": "/home/eli/wallpapers/pywallpaper.jpg", + "alpha": "100", + "special": { + "background": "#001E23", + "foreground": "#b4c8be", + "cursor": "#b4c8be" + }, + "colors": { + "color0": "#001E23", + "color1": "#4D726B", + "color2": "#5C8277", + "color3": "#648A7C", + "color4": "#77A17E", + "color5": "#80A67F", + "color6": "#6E9485", + "color7": "#b4c8be", + "color8": "#7d8c85", + "color9": "#4D726B", + "color10": "#5C8277", + "color11": "#648A7C", + "color12": "#77A17E", + "color13": "#80A67F", + "color14": "#6E9485", + "color15": "#b4c8be" + } +} \ No newline at end of file diff --git a/.config/waybar/experimental.png b/.config/waybar/assets/experimental.png similarity index 100% rename from .config/waybar/experimental.png rename to .config/waybar/assets/experimental.png diff --git a/.config/waybar/assets/line.png b/.config/waybar/assets/line.png new file mode 100644 index 0000000..cde5e2b Binary files /dev/null and b/.config/waybar/assets/line.png differ diff --git a/.config/waybar/main.png b/.config/waybar/assets/main.png similarity index 100% rename from .config/waybar/main.png rename to .config/waybar/assets/main.png diff --git a/.config/waybar/assets/zen.png b/.config/waybar/assets/zen.png new file mode 100644 index 0000000..0a98557 Binary files /dev/null and b/.config/waybar/assets/zen.png differ diff --git a/.config/waybar/config b/.config/waybar/config old mode 100755 new mode 100644 index 6656e1f..bf0d267 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -1,5 +1,5 @@ { - "layer": "top", + "layer": "top", "position": "top", "reload_style_on_change": true, "modules-left": ["custom/notification","clock","custom/pacman","tray"], @@ -129,3 +129,4 @@ "spacing": 10 }, } + diff --git a/.config/waybar/refresh.sh b/.config/waybar/scripts/refresh.sh similarity index 100% rename from .config/waybar/refresh.sh rename to .config/waybar/scripts/refresh.sh diff --git a/.config/waybar/scripts/select.sh b/.config/waybar/scripts/select.sh new file mode 100755 index 0000000..5415c7d --- /dev/null +++ b/.config/waybar/scripts/select.sh @@ -0,0 +1,33 @@ +#!/bin/bash +WAYBAR_DIR="$HOME/.config/waybar" +STYLECSS="$WAYBAR_DIR/style.css" +CONFIG="$WAYBAR_DIR/config" +ASSETS="$WAYBAR_DIR/assets" +THEMES="$WAYBAR_DIR/themes" +menu() { + find "${ASSETS}" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" -o -iname "*.gif" \) | awk '{print "img:"$0}' +} +main() { + choice=$(menu | wofi -c ~/.config/wofi/waybar -s ~/.config/wofi/style-waybar.css --show dmenu --prompt " Select Waybar (Scroll with Arrows)" -n) + selected_wallpaper=$(echo "$choice" | sed 's/^img://') + echo $selected_wallpaper + if [[ "$selected_wallpaper" == "$ASSETS/experimental.png" ]]; then + cat $THEMES/experimental/style-experimental.css > $STYLECSS + cat $THEMES/experimental/config-experimental > $CONFIG + pkill waybar && waybar + elif [[ "$selected_wallpaper" == "$ASSETS/main.png" ]]; then + cat $THEMES/default/style-default.css > $STYLECSS + cat $THEMES/default/config-default > $CONFIG + pkill waybar && waybar + elif [[ "$selected_wallpaper" == "$ASSETS/line.png" ]]; then + cat $THEMES/line/style-line.css > $STYLECSS + cat $THEMES/line/config-line > $CONFIG + pkill waybar && waybar + elif [[ "$selected_wallpaper" == "$ASSETS/zen.png" ]]; then + cat $THEMES/zen/style-zen.css > $STYLECSS + cat $THEMES/zen/config-zen > $CONFIG + pkill waybar && waybar + fi + +} +main diff --git a/.config/waybar/select.sh b/.config/waybar/select.sh deleted file mode 100755 index d5a0590..0000000 --- a/.config/waybar/select.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -WAYBAR_DIR="$HOME/.config/waybar" -STYLECSS="$WAYBAR_DIR/style.css" - -menu() { - find "${WAYBAR_DIR}" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" -o -iname "*.gif" \) | awk '{print "img:"$0}' -} - - -main() { - choice=$(menu | wofi -c ~/.config/wofi/waybar -s ~/.config/wofi/style-waybar.css --show dmenu --prompt " Select Waybar (Scroll with Arrows)" -n) - selected_wallpaper=$(echo "$choice" | sed 's/^img://') - echo $selected_wallpaper - if [[ "$selected_wallpaper" == "/home/$USER/.config/waybar/experimental.png" ]]; then - cat $WAYBAR_DIR/style-experimental.css > $STYLECSS - pkill waybar && waybar - elif [[ "$selected_wallpaper" == "/home/$USER/.config/waybar/main.png" ]]; then - cat $WAYBAR_DIR/style-main.css > $STYLECSS - pkill waybar && waybar - fi - -} -main diff --git a/.config/waybar/themes/default/config-default b/.config/waybar/themes/default/config-default new file mode 100755 index 0000000..bf0d267 --- /dev/null +++ b/.config/waybar/themes/default/config-default @@ -0,0 +1,132 @@ +{ + "layer": "top", + "position": "top", + "reload_style_on_change": true, + "modules-left": ["custom/notification","clock","custom/pacman","tray"], + "modules-center": ["hyprland/workspaces"], + "modules-right": ["group/expand","bluetooth","network","battery"], + + + "hyprland/workspaces": { + "format": "{icon}", + "format-icons": { + "active": "", + "default": "", + "empty": "" + }, + "persistent-workspaces": { + "*": [ 1,2,3,4,5 ] + } + }, + "custom/notification": { + "tooltip": false, + "format": "", + "on-click": "swaync-client -t -sw", + "escape": true + }, + "clock": { + "format": "{:%I:%M:%S %p} ", + "interval": 1, + "tooltip-format": "{calendar}", + "calendar": { + "format": { + "today": "{}" + } + }, + "actions": { + "on-click-right": "shift_down", + "on-click": "shift_up" + } + }, + "network": { + "format-wifi": "", + "format-ethernet":"", + "format-disconnected": "", + "tooltip-format-disconnected": "Error", + "tooltip-format-wifi": "{essid} ({signalStrength}%) ", + "tooltip-format-ethernet": "{ifname} 🖧 ", + "on-click": "kitty nmtui" + }, + "bluetooth": { + "format-on": "󰂯", + "format-off": "BT-off", + "format-disabled": "󰂲", + "format-connected-battery": "{device_battery_percentage}% 󰂯", + "format-alt": "{device_alias} 󰂯", + "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected", + "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}", + "tooltip-format-enumerate-connected": "{device_alias}\n{device_address}", + "tooltip-format-enumerate-connected-battery": "{device_alias}\n{device_address}\n{device_battery_percentage}%", + "on-click-right": "blueman-manager", + }, + "battery": { + "interval":30, + "states": { + "good": 95, + "warning": 30, + "critical": 20 + }, + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% 󰂄", + "format-plugged": "{capacity}% 󰂄 ", + "format-alt": "{time} {icon}", + "format-icons": [ + "󰁻", + "󰁼", + "󰁾", + "󰂀", + "󰂂", + "󰁹" + ], + }, + "custom/pacman": { + "format": "󰅢 {}", + "interval": 30, + "exec": "checkupdates | wc -l", + "exec-if": "exit 0", + "on-click": "kitty sh -c 'yay -Syu; echo Done - Press enter to exit; read'; pkill -SIGRTMIN+8 waybar", + "signal": 8, + "tooltip": false, + }, + "custom/expand": { + "format": "", + "tooltip": false + }, + "custom/endpoint":{ + "format": "|", + "tooltip": false + }, + "group/expand": { + "orientation": "horizontal", + "drawer": { + "transition-duration": 600, + "transition-to-left": true, + "click-to-reveal": true + }, + "modules": ["custom/expand", "custom/colorpicker","cpu","memory","temperature","custom/endpoint"], + }, + "custom/colorpicker": { + "format": "{}", + "return-type": "json", + "interval": "once", + "exec": "~/.config/waybar/scripts/colorpicker.sh -j", + "on-click": "~/.config/waybar/scripts/colorpicker.sh", + "signal": 1 + }, + "cpu": { + "format": "󰻠", + "tooltip": true + }, + "memory": { + "format": "" + }, + "temperature": { + "critical-threshold": 80, + "format": "", + }, + "tray": { + "icon-size": 14, + "spacing": 10 + }, +} + diff --git a/.config/waybar/style-main.css b/.config/waybar/themes/default/style-default.css similarity index 100% rename from .config/waybar/style-main.css rename to .config/waybar/themes/default/style-default.css diff --git a/.config/waybar/themes/experimental/config-experimental b/.config/waybar/themes/experimental/config-experimental new file mode 100755 index 0000000..bf0d267 --- /dev/null +++ b/.config/waybar/themes/experimental/config-experimental @@ -0,0 +1,132 @@ +{ + "layer": "top", + "position": "top", + "reload_style_on_change": true, + "modules-left": ["custom/notification","clock","custom/pacman","tray"], + "modules-center": ["hyprland/workspaces"], + "modules-right": ["group/expand","bluetooth","network","battery"], + + + "hyprland/workspaces": { + "format": "{icon}", + "format-icons": { + "active": "", + "default": "", + "empty": "" + }, + "persistent-workspaces": { + "*": [ 1,2,3,4,5 ] + } + }, + "custom/notification": { + "tooltip": false, + "format": "", + "on-click": "swaync-client -t -sw", + "escape": true + }, + "clock": { + "format": "{:%I:%M:%S %p} ", + "interval": 1, + "tooltip-format": "{calendar}", + "calendar": { + "format": { + "today": "{}" + } + }, + "actions": { + "on-click-right": "shift_down", + "on-click": "shift_up" + } + }, + "network": { + "format-wifi": "", + "format-ethernet":"", + "format-disconnected": "", + "tooltip-format-disconnected": "Error", + "tooltip-format-wifi": "{essid} ({signalStrength}%) ", + "tooltip-format-ethernet": "{ifname} 🖧 ", + "on-click": "kitty nmtui" + }, + "bluetooth": { + "format-on": "󰂯", + "format-off": "BT-off", + "format-disabled": "󰂲", + "format-connected-battery": "{device_battery_percentage}% 󰂯", + "format-alt": "{device_alias} 󰂯", + "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected", + "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}", + "tooltip-format-enumerate-connected": "{device_alias}\n{device_address}", + "tooltip-format-enumerate-connected-battery": "{device_alias}\n{device_address}\n{device_battery_percentage}%", + "on-click-right": "blueman-manager", + }, + "battery": { + "interval":30, + "states": { + "good": 95, + "warning": 30, + "critical": 20 + }, + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% 󰂄", + "format-plugged": "{capacity}% 󰂄 ", + "format-alt": "{time} {icon}", + "format-icons": [ + "󰁻", + "󰁼", + "󰁾", + "󰂀", + "󰂂", + "󰁹" + ], + }, + "custom/pacman": { + "format": "󰅢 {}", + "interval": 30, + "exec": "checkupdates | wc -l", + "exec-if": "exit 0", + "on-click": "kitty sh -c 'yay -Syu; echo Done - Press enter to exit; read'; pkill -SIGRTMIN+8 waybar", + "signal": 8, + "tooltip": false, + }, + "custom/expand": { + "format": "", + "tooltip": false + }, + "custom/endpoint":{ + "format": "|", + "tooltip": false + }, + "group/expand": { + "orientation": "horizontal", + "drawer": { + "transition-duration": 600, + "transition-to-left": true, + "click-to-reveal": true + }, + "modules": ["custom/expand", "custom/colorpicker","cpu","memory","temperature","custom/endpoint"], + }, + "custom/colorpicker": { + "format": "{}", + "return-type": "json", + "interval": "once", + "exec": "~/.config/waybar/scripts/colorpicker.sh -j", + "on-click": "~/.config/waybar/scripts/colorpicker.sh", + "signal": 1 + }, + "cpu": { + "format": "󰻠", + "tooltip": true + }, + "memory": { + "format": "" + }, + "temperature": { + "critical-threshold": 80, + "format": "", + }, + "tray": { + "icon-size": 14, + "spacing": 10 + }, +} + diff --git a/.config/waybar/style-experimental.css b/.config/waybar/themes/experimental/style-experimental.css similarity index 91% rename from .config/waybar/style-experimental.css rename to .config/waybar/themes/experimental/style-experimental.css index ac9f639..070b878 100755 --- a/.config/waybar/style-experimental.css +++ b/.config/waybar/themes/experimental/style-experimental.css @@ -1,5 +1,4 @@ @import url('../../.cache/wal/colors-waybar.css'); - * { font-size:15px; font-family: "CodeNewRoman Nerd Font Propo"; @@ -11,23 +10,23 @@ window#waybar{ padding:7px; margin:10 0 5 10; border-radius:10px; - background: alpha(@background,.5); - box-shadow: 0px 0px 2px rgba(0, 0, 0, .5); + background: alpha(@background,.6); + box-shadow: 0px 0px 2px rgba(0, 0, 0, .6); } .modules-center { padding:7px; margin:10 0 5 0; border-radius:10px; - background: alpha(@background,.5); - box-shadow: 0px 0px 2px rgba(0, 0, 0, .5); - min-width: 150.1px; + background: alpha(@background,.6); + box-shadow: 0px 0px 2px rgba(0, 0, 0, .6); + min-width: 150.5px; } .modules-right { padding:7px; margin: 10 10 5 0; border-radius:10px; - background: alpha(@background,.5); - box-shadow: 0px 0px 2px rgba(0, 0, 0, .5); + background: alpha(@background,.6); + box-shadow: 0px 0px 2px rgba(0, 0, 0, .6); } tooltip { background:@background; @@ -35,7 +34,7 @@ tooltip { } #clock:hover, #custom-pacman:hover, #custom-notification:hover,#bluetooth:hover,#network:hover,#battery:hover, #cpu:hover,#memory:hover,#temperature:hover{ transition: all .3s ease; - color:@color1; + color:@color9; } #custom-notification { padding: 0px 5px; @@ -53,6 +52,7 @@ tooltip { color:@color7; } + #workspaces { padding: 0px 5px; text-shadow:none; diff --git a/.config/waybar/themes/line/config-line b/.config/waybar/themes/line/config-line new file mode 100644 index 0000000..6b96758 --- /dev/null +++ b/.config/waybar/themes/line/config-line @@ -0,0 +1,136 @@ +{ + "layer": "top", + "position": "top", + "margin-left": 10, + "margin-right": 10, + "margin-top": 7, + "margin-bottom": 0, + "reload_style_on_change": true, + "modules-left": ["custom/notification","clock","custom/pacman","tray"], + "modules-center": ["hyprland/workspaces"], + "modules-right": ["group/expand","bluetooth","network","battery"], + + + "hyprland/workspaces": { + "format": "{icon}", + "format-icons": { + "active": "", + "default": "", + "empty": "" + }, + "persistent-workspaces": { + "*": [ 1,2,3,4,5 ] + } + }, + "custom/notification": { + "tooltip": false, + "format": "", + "on-click": "swaync-client -t -sw", + "escape": true + }, + "clock": { + "format": "{:%I:%M:%S %p} ", + "interval": 1, + "tooltip-format": "{calendar}", + "calendar": { + "format": { + "today": "{}" + } + }, + "actions": { + "on-click-right": "shift_down", + "on-click": "shift_up" + } + }, + "network": { + "format-wifi": "", + "format-ethernet":"", + "format-disconnected": "", + "tooltip-format-disconnected": "Error", + "tooltip-format-wifi": "{essid} ({signalStrength}%) ", + "tooltip-format-ethernet": "{ifname} 🖧 ", + "on-click": "kitty nmtui" + }, + "bluetooth": { + "format-on": "󰂯", + "format-off": "BT-off", + "format-disabled": "󰂲", + "format-connected-battery": "{device_battery_percentage}% 󰂯", + "format-alt": "{device_alias} 󰂯", + "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected", + "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}", + "tooltip-format-enumerate-connected": "{device_alias}\n{device_address}", + "tooltip-format-enumerate-connected-battery": "{device_alias}\n{device_address}\n{device_battery_percentage}%", + "on-click-right": "blueman-manager", + }, + "battery": { + "interval":30, + "states": { + "good": 95, + "warning": 30, + "critical": 20 + }, + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% 󰂄", + "format-plugged": "{capacity}% 󰂄 ", + "format-alt": "{time} {icon}", + "format-icons": [ + "󰁻", + "󰁼", + "󰁾", + "󰂀", + "󰂂", + "󰁹" + ], + }, + "custom/pacman": { + "format": "󰅢 {}", + "interval": 30, + "exec": "checkupdates | wc -l", + "exec-if": "exit 0", + "on-click": "kitty sh -c 'yay -Syu; echo Done - Press enter to exit; read'; pkill -SIGRTMIN+8 waybar", + "signal": 8, + "tooltip": false, + }, + "custom/expand": { + "format": "", + "tooltip": false + }, + "custom/endpoint":{ + "format": "|", + "tooltip": false + }, + "group/expand": { + "orientation": "horizontal", + "drawer": { + "transition-duration": 600, + "transition-to-left": true, + "click-to-reveal": true + }, + "modules": ["custom/expand", "custom/colorpicker","cpu","memory","temperature","custom/endpoint"], + }, + "custom/colorpicker": { + "format": "{}", + "return-type": "json", + "interval": "once", + "exec": "~/.config/waybar/scripts/colorpicker.sh -j", + "on-click": "~/.config/waybar/scripts/colorpicker.sh", + "signal": 1 + }, + "cpu": { + "format": "󰻠", + "tooltip": true + }, + "memory": { + "format": "" + }, + "temperature": { + "critical-threshold": 80, + "format": "", + }, + "tray": { + "icon-size": 14, + "spacing": 10 + }, +} + diff --git a/.config/waybar/themes/line/style-line.css b/.config/waybar/themes/line/style-line.css new file mode 100644 index 0000000..40406d9 --- /dev/null +++ b/.config/waybar/themes/line/style-line.css @@ -0,0 +1,149 @@ + +@import url('../../.cache/wal/colors-waybar.css'); + +* { + font-size:15px; + font-family: "CodeNewRoman Nerd Font Propo"; +} +window#waybar{ + border-radius:10px; + background: alpha(@background,.6); + box-shadow: 0px 0px 2px rgba(0, 0, 0, .6); +} +tooltip { + background:@background; + color: @color7; +} +#clock:hover, #custom-pacman:hover, #custom-notification:hover,#bluetooth:hover,#network:hover,#battery:hover, #cpu:hover,#memory:hover,#temperature:hover{ + transition: all .3s ease; + color:@color9; +} +#custom-notification { + padding: 0px 5px 0 10; + transition: all .3s ease; + color:@color7; +} +#clock{ + padding: 0px 5px; + color:@color7; + transition: all .3s ease; +} +#custom-pacman{ + padding: 0px 5px; + transition: all .3s ease; + color:@color7; + +} +#workspaces { + padding: 7px 5px; +} +#workspaces button { + all:unset; + padding: 0px 5px; + color: alpha(@color9,.4); + transition: all .2s ease; +} +#workspaces button:hover { + color:rgba(0,0,0,0); + border: none; + text-shadow: 0px 0px 1.5px rgba(0, 0, 0, .5); + transition: all 1s ease; +} +#workspaces button.active { + color: @color9; + border: none; + text-shadow: 0px 0px 2px rgba(0, 0, 0, .5); +} +#workspaces button.empty { + color: rgba(0,0,0,0); + border: none; + text-shadow: 0px 0px 1.5px rgba(0, 0, 0, .2); +} +#workspaces button.empty:hover { + color: rgba(0,0,0,0); + border: none; + text-shadow: 0px 0px 1.5px rgba(0, 0, 0, .5); + transition: all 1s ease; +} +#workspaces button.empty.active { + color: @color9; + border: none; + text-shadow: 0px 0px 2px rgba(0, 0, 0, .5); +} +#bluetooth{ + padding: 0px 5px; + transition: all .3s ease; + color:@color7; + +} +#network{ + padding: 0px 5px; + transition: all .3s ease; + color:@color7; + +} +#battery{ + padding: 0px 10px 0 5; + transition: all .3s ease; + color:@color7; + + +} +#battery.charging { + color: #26A65B; +} + +#battery.warning:not(.charging) { + color: #ffbe61; +} + +#battery.critical:not(.charging) { + color: #f53c3c; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} +#group-expand{ + padding: 0px 5px; + transition: all .3s ease; +} +#custom-expand{ + padding: 0px 5px; + color:alpha(@foreground,.2); + text-shadow: 0px 0px 2px rgba(0, 0, 0, .7); + transition: all .3s ease; +} +#custom-expand:hover{ + color:rgba(255,255,255,.2); + text-shadow: 0px 0px 2px rgba(255, 255, 255, .5); +} +#custom-colorpicker{ + padding: 0px 5px; +} +#cpu,#memory,#temperature{ + padding: 0px 5px; + transition: all .3s ease; + color:@color7; + +} +#custom-endpoint{ + color:transparent; + text-shadow: 0px 0px 1.5px rgba(0, 0, 0, 1); + +} +#tray{ + padding: 0px 5px; + transition: all .3s ease; + +} +#tray menu * { + padding: 0px 5px; + transition: all .3s ease; +} + +#tray menu separator { + padding: 0px 5px; + transition: all .3s ease; +} diff --git a/.config/waybar/themes/zen/config-zen b/.config/waybar/themes/zen/config-zen new file mode 100755 index 0000000..feba2f9 --- /dev/null +++ b/.config/waybar/themes/zen/config-zen @@ -0,0 +1,20 @@ +{ + "layer": "top", + "position": "top", + "reload_style_on_change": true, + "modules-center": ["hyprland/workspaces"], + + + "hyprland/workspaces": { + "format": "{icon}", + "format-icons": { + "active": "", + "default": "", + "empty": "" + }, + "persistent-workspaces": { + "*": [ 1,2,3,4,5 ] + } + } +} + diff --git a/.config/waybar/themes/zen/style-zen.css b/.config/waybar/themes/zen/style-zen.css new file mode 100755 index 0000000..5f9b400 --- /dev/null +++ b/.config/waybar/themes/zen/style-zen.css @@ -0,0 +1,52 @@ +@import url('../../.cache/wal/colors-waybar.css'); + +* { + font-size:15px; + font-family: "CodeNewRoman Nerd Font Propo"; +} +window#waybar{ + all:unset; +} +.modules-center { + padding:7px; + margin:10 0 5 0; + border-radius:10px; + background: alpha(@background,.6); + box-shadow: 0px 0px 2px rgba(0, 0, 0, .6); +} +#workspaces { + padding: 0px 5px; +} +#workspaces button { + all:unset; + padding: 0px 5px; + color: alpha(@color9,.4); + transition: all .2s ease; +} +#workspaces button:hover { + color:rgba(0,0,0,0); + border: none; + text-shadow: 0px 0px 1.5px rgba(0, 0, 0, .5); + transition: all 1s ease; +} +#workspaces button.active { + color: @color9; + border: none; + text-shadow: 0px 0px 2px rgba(0, 0, 0, .5); +} +#workspaces button.empty { + color: rgba(0,0,0,0); + border: none; + text-shadow: 0px 0px 1.5px rgba(0, 0, 0, .2); +} +#workspaces button.empty:hover { + color: rgba(0,0,0,0); + border: none; + text-shadow: 0px 0px 1.5px rgba(0, 0, 0, .5); + transition: all 1s ease; +} +#workspaces button.empty.active { + color: @color9; + border: none; + text-shadow: 0px 0px 2px rgba(0, 0, 0, .5); +} diff --git a/wallpapers/walls/1Sunset.jpg b/wallpapers/walls/1Sunset.jpg deleted file mode 100755 index 9006c98..0000000 Binary files a/wallpapers/walls/1Sunset.jpg and /dev/null differ diff --git a/wallpapers/walls/DSC02292-EDIT.jpg b/wallpapers/walls/DSC02292-EDIT.jpg new file mode 100644 index 0000000..1e613bc Binary files /dev/null and b/wallpapers/walls/DSC02292-EDIT.jpg differ diff --git a/wallpapers/walls/DSC04822.JPG b/wallpapers/walls/DSC04822.JPG new file mode 100644 index 0000000..428215b Binary files /dev/null and b/wallpapers/walls/DSC04822.JPG differ diff --git a/wallpapers/walls/DSC05767.JPG b/wallpapers/walls/DSC05767.JPG new file mode 100644 index 0000000..63e8d18 Binary files /dev/null and b/wallpapers/walls/DSC05767.JPG differ