From d7ff1c1dea16619a38f35536a5c00685d848abce Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 10 May 2024 02:03:31 +0900 Subject: [PATCH] Initial Push - Moving to Wallust from Pywal --- config/ags/user/style.css | 5 +- config/cava/config | 368 +++++++++--------- config/cava/shaders/northern_lights.frag | 34 ++ config/hypr/UserConfigs/Startup_Apps.conf | 6 +- config/hypr/UserConfigs/UserSettings.conf | 9 +- config/hypr/UserConfigs/WindowRules.conf | 1 + .../hypr/UserScripts/WallpaperAutoChange.sh | 4 +- config/hypr/UserScripts/WallpaperRandom.sh | 2 +- config/hypr/UserScripts/WallpaperSelect.sh | 2 +- config/hypr/UserScripts/Weather.py | 6 +- config/hypr/hyprlock.conf | 3 +- config/hypr/initial-boot.sh | 11 +- config/hypr/scripts/DarkLight.sh | 31 +- config/hypr/scripts/GameMode.sh | 2 +- config/hypr/scripts/Refresh.sh | 4 +- config/hypr/scripts/RefreshNoWaybar.sh | 8 +- .../scripts/{PywalSwww.sh => WallustSwww.sh} | 11 +- config/hypr/wallust/wallust-hyprland.conf | 18 + config/kitty/kitty.conf | 2 - config/rofi/.current_wallpaper | 2 +- config/rofi/config-search.rasi | 4 +- config/rofi/config-wallpaper.rasi | 2 +- config/rofi/config.rasi | 15 +- config/rofi/pywal-color/Readme.md | 3 - config/rofi/pywal-color/pywal-theme.rasi | 1 - config/rofi/resolution/1080p/config.rasi | 15 +- config/rofi/resolution/1440p/config.rasi | 11 +- config/rofi/wallust/colors-rofi.rasi | 28 ++ config/swaync/style.css | 3 +- config/swaync/wallust/colors-wallust.css | 9 + config/wal/templates/colors-hyprland | 18 - config/wal/templates/colors-rofi-dark.rasi | 166 -------- config/wal/templates/colors-rofi-light.rasi | 166 -------- .../templates/colors-cava} | 19 +- config/wallust/templates/colors-hyprland.conf | 18 + config/wallust/templates/colors-kitty.conf | 37 ++ config/wallust/templates/colors-rofi.rasi | 28 ++ config/wallust/templates/colors-swaync.css | 9 + config/wallust/templates/colors-waybar.css | 20 + config/wallust/wallust.toml | 53 +++ config/waybar/config | 2 +- config/waybar/style.css | 2 +- ...[Wallust Bordered] Chroma Fusion Edge.css} | 6 +- ...> [Wallust Transparent] Crystal Clear.css} | 10 +- ...oma Edge.css => [Wallust] Chroma Edge.css} | 8 +- ...Fusion.css => [Wallust] Chroma Fusion.css} | 6 +- ...a Tally.css => [Wallust] Chroma Tally.css} | 6 +- ...wal] Colored.css => [Wallust] Colored.css} | 8 +- ...Pywal] Simple.css => [Wallust] Simple.css} | 8 +- config/waybar/wallust/colors-waybar.css | 20 + copy.sh | 9 +- 51 files changed, 585 insertions(+), 654 deletions(-) create mode 100644 config/cava/shaders/northern_lights.frag rename config/hypr/scripts/{PywalSwww.sh => WallustSwww.sh} (83%) create mode 100644 config/hypr/wallust/wallust-hyprland.conf delete mode 100644 config/rofi/pywal-color/Readme.md delete mode 100644 config/rofi/pywal-color/pywal-theme.rasi create mode 100644 config/rofi/wallust/colors-rofi.rasi create mode 100644 config/swaync/wallust/colors-wallust.css delete mode 100644 config/wal/templates/colors-hyprland delete mode 100644 config/wal/templates/colors-rofi-dark.rasi delete mode 100644 config/wal/templates/colors-rofi-light.rasi rename config/{wal/templates/cava-colors => wallust/templates/colors-cava} (92%) create mode 100644 config/wallust/templates/colors-hyprland.conf create mode 100644 config/wallust/templates/colors-kitty.conf create mode 100644 config/wallust/templates/colors-rofi.rasi create mode 100644 config/wallust/templates/colors-swaync.css create mode 100644 config/wallust/templates/colors-waybar.css create mode 100644 config/wallust/wallust.toml mode change 100644 => 120000 config/waybar/config mode change 100644 => 120000 config/waybar/style.css rename config/waybar/style/{[Pywal Bordered] Chroma Fusion Edge.css => [Wallust Bordered] Chroma Fusion Edge.css} (97%) rename config/waybar/style/{[Pywal Transparent] Crystal Clear.css => [Wallust Transparent] Crystal Clear.css} (92%) rename config/waybar/style/{[Pywal] Chroma Edge.css => [Wallust] Chroma Edge.css} (97%) rename config/waybar/style/{[Pywal] Chroma Fusion.css => [Wallust] Chroma Fusion.css} (97%) rename config/waybar/style/{[Pywal] Chroma Tally.css => [Wallust] Chroma Tally.css} (97%) rename config/waybar/style/{[Pywal] Colored.css => [Wallust] Colored.css} (96%) rename config/waybar/style/{[Pywal] Simple.css => [Wallust] Simple.css} (97%) create mode 100644 config/waybar/wallust/colors-waybar.css diff --git a/config/ags/user/style.css b/config/ags/user/style.css index 0519fb1..9d4b9c7 100644 --- a/config/ags/user/style.css +++ b/config/ags/user/style.css @@ -2,11 +2,10 @@ all: unset; } -@import '../../../.cache/wal/colors-waybar.css'; -/* @import '../../../.cache/wal/colors-waybar-rgba.css'; */ +@import '../../../.config/wallust/colors-waybar.css'; /* define some colors */ -@define-color border-color @color2; +@define-color border-color @color12; @define-color border-color-alt @color7; @define-color text-color rgba(255, 255, 255, 0.7); @define-color noti-bg rgba(0, 0, 0, 0.4); diff --git a/config/cava/config b/config/cava/config index 36e4761..be63be1 100644 --- a/config/cava/config +++ b/config/cava/config @@ -1,184 +1,184 @@ -# Configuration file for CAVA. Default values are commented out. Use either ';' or '#' for commenting. - - -[general] - -# Smoothing mode. Can be 'normal', 'scientific' or 'waves'. DEPRECATED as of 0.6.0 -; mode = normal - -# Accepts only non-negative values. -; framerate = 60 - -# 'autosens' will attempt to decrease sensitivity if the bars peak. 1 = on, 0 = off -# new as of 0.6.0 autosens of low values (dynamic range) -# 'overshoot' allows bars to overshoot (in % of terminal height) without initiating autosens. DEPRECATED as of 0.6.0 -; autosens = 1 -; overshoot = 20 - -# Manual sensitivity in %. If autosens is enabled, this will only be the initial value. -# 200 means double height. Accepts only non-negative values. -; sensitivity = 100 - -# The number of bars (0-200). 0 sets it to auto (fill up console). -# Bars' width and space between bars in number of characters. -; bars = 0 -; bar_width = 2 -; bar_spacing = 1 - -# For SDL width and space between bars is in pixels, defaults are: -; bar_width = 20 -; bar_spacing = 5 - - -# Lower and higher cutoff frequencies for lowest and highest bars -# the bandwidth of the visualizer. -# Note: there is a minimum total bandwidth of 43Mhz x number of bars. -# Cava will automatically increase the higher cutoff if a too low band is specified. -; lower_cutoff_freq = 50 -; higher_cutoff_freq = 10000 - - -# Seconds with no input before cava goes to sleep mode. Cava will not perform FFT or drawing and -# only check for input once per second. Cava will wake up once input is detected. 0 = disable. -; sleep_timer = 0 - - -[input] - -# Audio capturing method. Possible methods are: 'pulse', 'alsa', 'fifo', 'sndio' or 'shmem' -# Defaults to 'pulse', 'alsa' or 'fifo', in that order, dependent on what support cava was built with. -# -# All input methods uses the same config variable 'source' -# to define where it should get the audio. -# -# For pulseaudio 'source' will be the source. Default: 'auto', which uses the monitor source of the default sink -# (all pulseaudio sinks(outputs) have 'monitor' sources(inputs) associated with them). -# -# For alsa 'source' will be the capture device. -# For fifo 'source' will be the path to fifo-file. -# For shmem 'source' will be /squeezelite-AA:BB:CC:DD:EE:FF where 'AA:BB:CC:DD:EE:FF' will be squeezelite's MAC address -method = pulse -source = auto - -; method = alsa -; source = hw:Loopback,1 - -; method = fifo -; source = /tmp/mpd.fifo -; sample_rate = 44100 -; sample_bits = 16 - -; method = shmem -; source = /squeezelite-AA:BB:CC:DD:EE:FF - -; method = portaudio -; source = auto - - -[output] - -# Output method. Can be 'ncurses', 'noncurses', 'raw' or 'sdl'. -# 'noncurses' uses a custom framebuffer technique and prints only changes -# from frame to frame in the terminal. 'ncurses' is default if supported. -# -# 'raw' is an 8 or 16 bit (configurable via the 'bit_format' option) data -# stream of the bar heights that can be used to send to other applications. -# 'raw' defaults to 200 bars, which can be adjusted in the 'bars' option above. -# -# 'sdl' uses the Simple DirectMedia Layer to render in a graphical context. -; method = ncurses - -# Visual channels. Can be 'stereo' or 'mono'. -# 'stereo' mirrors both channels with low frequencies in center. -# 'mono' outputs left to right lowest to highest frequencies. -# 'mono_option' set mono to either take input from 'left', 'right' or 'average'. -; channels = stereo -; mono_option = average - -# Raw output target. A fifo will be created if target does not exist. -; raw_target = /dev/stdout - -# Raw data format. Can be 'binary' or 'ascii'. -; data_format = binary - -# Binary bit format, can be '8bit' (0-255) or '16bit' (0-65530). -; bit_format = 16bit - -# Ascii max value. In 'ascii' mode range will run from 0 to value specified here -; ascii_max_range = 1000 - -# Ascii delimiters. In ascii format each bar and frame is separated by a delimiters. -# Use decimal value in ascii table (i.e. 59 = ';' and 10 = '\n' (line feed)). -; bar_delimiter = 59 -; frame_delimiter = 10 - -# sdl window size and position. -1,-1 is centered. -; sdl_width = 1000 -; sdl_height = 500 -; sdl_x = -1 -; sdl_y= -1 - -[color] - -# Colors can be one of seven predefined: black, blue, cyan, green, magenta, red, white, yellow. -# Or defined by hex code '#xxxxxx' (hex code must be within ''). User defined colors requires -# ncurses output method and a terminal that can change color definitions such as Gnome-terminal or rxvt. -# if supported, ncurses mode will be forced on if user defined colors are used. -# default is to keep current terminal color -; background = default -; foreground = default - -# SDL only support hex code colors, these are the default: -; background = '#111111' -; foreground = '#33cccc' - - -# Gradient mode, only hex defined colors (and thereby ncurses mode) are supported, -# background must also be defined in hex or remain commented out. 1 = on, 0 = off. -# You can define as many as 8 different colors. They range from bottom to top of screen -# In the [color] section - -[color] - -gradient = 1 - -gradient_color_1 = '#94e2d5' -gradient_color_2 = '#89dceb' -gradient_color_3 = '#74c7ec' -gradient_color_4 = '#89b4fa' -gradient_color_5 = '#cba6f7' -gradient_color_6 = '#f5c2e7' -gradient_color_7 = '#eba0ac' -gradient_color_8 = '#f38ba8' - - - -[smoothing] - -# Percentage value for integral smoothing. Takes values from 0 - 100. -# Higher values means smoother, but less precise. 0 to disable. -; integral = 77 - -# Disables or enables the so-called "Monstercat smoothing" with or without "waves". Set to 0 to disable. -; monstercat = 0 -; waves = 0 - -# Set gravity percentage for "drop off". Higher values means bars will drop faster. -# Accepts only non-negative values. 50 means half gravity, 200 means double. Set to 0 to disable "drop off". -; gravity = 100 - - -# In bar height, bars that would have been lower that this will not be drawn. -; ignore = 0 - - -[eq] - -# This one is tricky. You can have as much keys as you want. -# Remember to uncomment more then one key! More keys = more precision. -# Look at readme.md on github for further explanations and examples. -; 1 = 1 # bass -; 2 = 1 -; 3 = 1 # midtone -; 4 = 1 -; 5 = 1 # treble +## Configuration file for CAVA. Default values are commented out. Use either ';' or '#' for commenting. + + +[general] + +# Smoothing mode. Can be 'normal', 'scientific' or 'waves'. DEPRECATED as of 0.6.0 +; mode = normal + +# Accepts only non-negative values. +; framerate = 60 + +# 'autosens' will attempt to decrease sensitivity if the bars peak. 1 = on, 0 = off +# new as of 0.6.0 autosens of low values (dynamic range) +# 'overshoot' allows bars to overshoot (in % of terminal height) without initiating autosens. DEPRECATED as of 0.6.0 +; autosens = 1 +; overshoot = 20 + +# Manual sensitivity in %. If autosens is enabled, this will only be the initial value. +# 200 means double height. Accepts only non-negative values. +; sensitivity = 100 + +# The number of bars (0-200). 0 sets it to auto (fill up console). +# Bars' width and space between bars in number of characters. +; bars = 0 +; bar_width = 2 +; bar_spacing = 1 + +# For SDL width and space between bars is in pixels, defaults are: +; bar_width = 20 +; bar_spacing = 5 + + +# Lower and higher cutoff frequencies for lowest and highest bars +# the bandwidth of the visualizer. +# Note: there is a minimum total bandwidth of 43Mhz x number of bars. +# Cava will automatically increase the higher cutoff if a too low band is specified. +; lower_cutoff_freq = 50 +; higher_cutoff_freq = 10000 + + +# Seconds with no input before cava goes to sleep mode. Cava will not perform FFT or drawing and +# only check for input once per second. Cava will wake up once input is detected. 0 = disable. +; sleep_timer = 0 + + +[input] + +# Audio capturing method. Possible methods are: 'pulse', 'alsa', 'fifo', 'sndio' or 'shmem' +# Defaults to 'pulse', 'alsa' or 'fifo', in that order, dependent on what support cava was built with. +# +# All input methods uses the same config variable 'source' +# to define where it should get the audio. +# +# For pulseaudio 'source' will be the source. Default: 'auto', which uses the monitor source of the default sink +# (all pulseaudio sinks(outputs) have 'monitor' sources(inputs) associated with them). +# +# For alsa 'source' will be the capture device. +# For fifo 'source' will be the path to fifo-file. +# For shmem 'source' will be /squeezelite-AA:BB:CC:DD:EE:FF where 'AA:BB:CC:DD:EE:FF' will be squeezelite's MAC address +method = pulse +source = auto + +; method = alsa +; source = hw:Loopback,1 + +; method = fifo +; source = /tmp/mpd.fifo +; sample_rate = 44100 +; sample_bits = 16 + +; method = shmem +; source = /squeezelite-AA:BB:CC:DD:EE:FF + +; method = portaudio +; source = auto + + +[output] + +# Output method. Can be 'ncurses', 'noncurses', 'raw' or 'sdl'. +# 'noncurses' uses a custom framebuffer technique and prints only changes +# from frame to frame in the terminal. 'ncurses' is default if supported. +# +# 'raw' is an 8 or 16 bit (configurable via the 'bit_format' option) data +# stream of the bar heights that can be used to send to other applications. +# 'raw' defaults to 200 bars, which can be adjusted in the 'bars' option above. +# +# 'sdl' uses the Simple DirectMedia Layer to render in a graphical context. +; method = ncurses + +# Visual channels. Can be 'stereo' or 'mono'. +# 'stereo' mirrors both channels with low frequencies in center. +# 'mono' outputs left to right lowest to highest frequencies. +# 'mono_option' set mono to either take input from 'left', 'right' or 'average'. +; channels = stereo +; mono_option = average + +# Raw output target. A fifo will be created if target does not exist. +; raw_target = /dev/stdout + +# Raw data format. Can be 'binary' or 'ascii'. +; data_format = binary + +# Binary bit format, can be '8bit' (0-255) or '16bit' (0-65530). +; bit_format = 16bit + +# Ascii max value. In 'ascii' mode range will run from 0 to value specified here +; ascii_max_range = 1000 + +# Ascii delimiters. In ascii format each bar and frame is separated by a delimiters. +# Use decimal value in ascii table (i.e. 59 = ';' and 10 = '\n' (line feed)). +; bar_delimiter = 59 +; frame_delimiter = 10 + +# sdl window size and position. -1,-1 is centered. +; sdl_width = 1000 +; sdl_height = 500 +; sdl_x = -1 +; sdl_y= -1 + +[color] + +# Colors can be one of seven predefined: black, blue, cyan, green, magenta, red, white, yellow. +# Or defined by hex code '#xxxxxx' (hex code must be within ''). User defined colors requires +# ncurses output method and a terminal that can change color definitions such as Gnome-terminal or rxvt. +# if supported, ncurses mode will be forced on if user defined colors are used. +# default is to keep current terminal color +; background = default +; foreground = default + +# SDL only support hex code colors, these are the default: +; background = '#111111' +; foreground = '#33cccc' + + +# Gradient mode, only hex defined colors (and thereby ncurses mode) are supported, +# background must also be defined in hex or remain commented out. 1 = on, 0 = off. +# You can define as many as 8 different colors. They range from bottom to top of screen +# In the [color] section + +[color] + +gradient = 1 + +gradient_count = 8 +gradient_color_1 = '#010102' +gradient_color_2 = '#9E2517' +gradient_color_3 = '#0E714C' +gradient_color_4 = '#08BCB1' +gradient_color_5 = '#CDF5B1' +gradient_color_6 = '#0AE59C' +gradient_color_7 = '#0AFAEC' +gradient_color_8 = '#CDF5B1' + +[color] +[smoothing] + +# Percentage value for integral smoothing. Takes values from 0 - 100. +# Higher values means smoother, but less precise. 0 to disable. +; integral = 77 + +# Disables or enables the so-called "Monstercat smoothing" with or without "waves". Set to 0 to disable. +; monstercat = 0 +; waves = 0 + +# Set gravity percentage for "drop off". Higher values means bars will drop faster. +# Accepts only non-negative values. 50 means half gravity, 200 means double. Set to 0 to disable "drop off". +; gravity = 100 + + +# In bar height, bars that would have been lower that this will not be drawn. +; ignore = 0 + + +[eq] + +# This one is tricky. You can have as much keys as you want. +# Remember to uncomment more then one key! More keys = more precision. +# Look at readme.md on github for further explanations and examples. +; 1 = 1 # bass +; 2 = 1 +; 3 = 1 # midtone +; 4 = 1 +; 5 = 1 # treble diff --git a/config/cava/shaders/northern_lights.frag b/config/cava/shaders/northern_lights.frag new file mode 100644 index 0000000..ecd859a --- /dev/null +++ b/config/cava/shaders/northern_lights.frag @@ -0,0 +1,34 @@ +#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/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf index 2f529d6..50be5e1 100644 --- a/config/hypr/UserConfigs/Startup_Apps.conf +++ b/config/hypr/UserConfigs/Startup_Apps.conf @@ -10,7 +10,7 @@ $SwwwRandom = $UserScripts/WallpaperAutoChange.sh # wallpaper stuff / More wallpaper options below exec-once = swww query || swww-daemon --format xrgb -exec-once = $SwwwRandom $wallDIR # random wallpaper switcher every 30 minutes +#exec-once = $SwwwRandom $wallDIR # random wallpaper switcher every 30 minutes # Startup exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP @@ -24,8 +24,8 @@ exec-once = waybar & exec-once = nm-applet --indicator & exec-once = swaync & exec-once = ags & -#exec-once = blueman-applet & -#exec-once = rog-control-center & +exec-once = blueman-applet & +exec-once = rog-control-center & #clipboard manager exec-once = wl-paste --type text --watch cliphist store diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf index da8ec4e..b3193e4 100644 --- a/config/hypr/UserConfigs/UserSettings.conf +++ b/config/hypr/UserConfigs/UserSettings.conf @@ -4,8 +4,9 @@ # refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables -# Sourcing colors generated by pywal -source = $HOME/.cache/wal/colors-hyprland +# Sourcing colors generated by wallust +source = $HOME/.config/hypr/wallust/wallust-hyprland.conf + # blurls = waybar # blurls = rofi @@ -29,7 +30,7 @@ general { border_size = 2 resize_on_border = true - col.active_border = $color0 $color2 $color4 $color6 $color8 90deg + col.active_border = $color0 $color2 $color9 $color12 $color15 90deg col.inactive_border = $backgroundCol layout = master @@ -57,7 +58,7 @@ decoration { drop_shadow=true shadow_range=6 shadow_render_power = 1 - col.shadow = $color2 + col.shadow = $color12 col.shadow_inactive = 0x50000000 blur { diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index bdbd551..c07094b 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -20,6 +20,7 @@ windowrule = float, ^(file-roller|org.gnome.FileRoller)$ # archive manager #windowrule = workspace 6 silent,^(gamescope)$ windowrule = center,^(pavucontrol) +windowrule = float, org.gnome.SystemMonitor # windowrule v2 move to workspace windowrulev2 = workspace 1, class:^([Tt]hunderbird)$ diff --git a/config/hypr/UserScripts/WallpaperAutoChange.sh b/config/hypr/UserScripts/WallpaperAutoChange.sh index 9e0e1cb..f54620b 100755 --- a/config/hypr/UserScripts/WallpaperAutoChange.sh +++ b/config/hypr/UserScripts/WallpaperAutoChange.sh @@ -7,7 +7,7 @@ # # NOTE: this script uses bash (not POSIX shell) for the RANDOM variable -pywal_refresh=$HOME/.config/hypr/scripts/RefreshNoWaybar.sh +wallust_refresh=$HOME/.config/hypr/scripts/RefreshNoWaybar.sh focused_monitor=$(hyprctl monitors | awk '/^Monitor/{name=$2} /focused: yes/{print name}') @@ -32,7 +32,7 @@ while true; do | sort -n | cut -d':' -f2- \ | while read -r img; do swww img -o $focused_monitor "$img" - $pywal_refresh + $wallust_refresh sleep $INTERVAL done diff --git a/config/hypr/UserScripts/WallpaperRandom.sh b/config/hypr/UserScripts/WallpaperRandom.sh index 52fc819..adaec3b 100755 --- a/config/hypr/UserScripts/WallpaperRandom.sh +++ b/config/hypr/UserScripts/WallpaperRandom.sh @@ -20,7 +20,7 @@ SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration swww query || swww-daemon --format xrgb && swww img ${RANDOMPICS} $SWWW_PARAMS -${scriptsDir}/PywalSwww.sh +${scriptsDir}/WallustSwww.sh sleep 1 ${scriptsDir}/Refresh.sh diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh index 2616014..9a087c7 100755 --- a/config/hypr/UserScripts/WallpaperSelect.sh +++ b/config/hypr/UserScripts/WallpaperSelect.sh @@ -85,6 +85,6 @@ fi main sleep 0.5 -${SCRIPTSDIR}/PywalSwww.sh +${SCRIPTSDIR}/WallustSwww.sh sleep 0.2 ${SCRIPTSDIR}/Refresh.sh diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py index 046dbcd..7b23d28 100755 --- a/config/hypr/UserScripts/Weather.py +++ b/config/hypr/UserScripts/Weather.py @@ -76,7 +76,7 @@ temp_min_max = f" {temp_min}\t\t {temp_max}" # wind speed wind_speed = html_data("span[data-testid='Wind']").text().split("\n")[1] -wind_text = f"煮 {wind_speed}" +wind_text = f" {wind_speed}" # print(wind_text) # humidity @@ -86,7 +86,7 @@ humidity_text = f" {humidity}" # visibility visbility = html_data("span[data-testid='VisibilityValue']").text() -visbility_text = f" {visbility}" +visbility_text = f" {visbility}" # print(visbility_text) # air quality index @@ -127,7 +127,7 @@ simple_weather =f"{icon} {status}\n" + \ f" {temp} ({temp_feel_text})\n" + \ f"{wind_text}\n" + \ f"{humidity_text}\n" + \ - f"{visbility_text} AQI {air_quality_index}\n" + f"{visbility_text} AQI{air_quality_index}\n" try: with open(os.path.expanduser("~/.cache/.weather_cache"), "w") as file: diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index 38c927a..a4a8c19 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -2,7 +2,8 @@ # Hyprlock # Original config submitted by https://github.com/SherLock707 -source = $HOME/.cache/wal/colors-hyprland +# Sourcing colors generated by wallust +source = $HOME/.config/hypr/wallust/wallust-hyprland.conf general { grace = 1 diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index f5fe66d..34f0af9 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -8,7 +8,7 @@ # Variables scriptsDir=$HOME/.config/hypr/scripts wallpaper=$HOME/Pictures/wallpapers/Lofi-Urban-Nightscape.png -waybar_style="$HOME/.config/waybar/style/[Pywal] Chroma Tally.css" +waybar_style="$HOME/.config/waybar/style/[Wallust] Chroma Tally.css" kvantum_theme="Catppuccin-Mocha" swww="swww img" @@ -17,16 +17,13 @@ effect="--transition-bezier .43,1.19,1,.4 --transition-fps 30 --transition-type # Check if a marker file exists. if [ ! -f ~/.config/hypr/.initial_startup_done ]; then - # Initialize pywal and wallpaper + # Initialize wallust and wallpaper if [ -f "$wallpaper" ]; then - wal -i $wallpaper -s -t > /dev/null + wallust run -s $wallpaper > /dev/null swww query || swww-daemon && $swww $wallpaper $effect - "$scriptsDir/PywalSwww.sh" > /dev/null 2>&1 & + "$scriptsDir/WallustSwww.sh" > /dev/null 2>&1 & fi - # Initial symlink for Pywal Dark and Light for Rofi Themes - ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi" > /dev/null 2>&1 & - # initiate GTK dark mode and apply icon and cursor theme gsettings set org.gnome.desktop.interface color-scheme prefer-dark > /dev/null 2>&1 & gsettings set org.gnome.desktop.interface gtk-theme Tokyonight-Dark-BL-LB > /dev/null 2>&1 & diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh index f9d2a93..60f75d4 100755 --- a/config/hypr/scripts/DarkLight.sh +++ b/config/hypr/scripts/DarkLight.sh @@ -12,9 +12,13 @@ swaync_style="$HOME/.config/swaync/style.css" ags_style="$HOME/.config/ags/user/style.css" SCRIPTSDIR="$HOME/.config/hypr/scripts" notif="$HOME/.config/swaync/images/bell.png" -dark_rofi_pywal="$HOME/.cache/wal/colors-rofi-dark.rasi" -light_rofi_pywal="$HOME/.cache/wal/colors-rofi-light.rasi" +wallust_rofi="$HOME/.config/wallust/templates/colors-rofi.rasi" +wallust_config="$HOME/.config/wallust/wallust.toml" +pallete_dark="dark16" +pallete_light="light16" + +# kill swaybg if running pkill swaybg # Initialize swww if needed @@ -45,6 +49,19 @@ notify_user() { notify-send -u low -i "$notif" "Switching to $1 mode" } +# Print a message indicating the mode change +echo "Changing palette mode to $next_mode..." + +# Use sed to replace the palette setting in the wallust config file +if [ "$next_mode" = "Dark" ]; then + sed -i 's/^palette = .*/palette = "'"$pallete_dark"'"/' "$wallust_config" +else + sed -i 's/^palette = .*/palette = "'"$pallete_light"'"/' "$wallust_config" +fi + + +# Print a message indicating the completion of the operation +echo "Palette mode updated." # Function to set Waybar style set_waybar_style() { theme="$1" @@ -112,13 +129,15 @@ kvantummanager --set "$kvantum_theme" sed -i "s|^color_scheme_path=.*$|color_scheme_path=$qt5ct_color_scheme|" "$HOME/.config/qt5ct/qt5ct.conf" sed -i "s|^color_scheme_path=.*$|color_scheme_path=$qt6ct_color_scheme|" "$HOME/.config/qt6ct/qt6ct.conf" -# Set Rofi Themes + +# set the rofi color for background if [ "$next_mode" = "Dark" ]; then - ln -sf "$dark_rofi_pywal" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi" + sed -i '24s/.*/background: rgba(0,0,0,0.7);/' $wallust_rofi else - ln -sf "$light_rofi_pywal" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi" + sed -i '24s/.*/background: rgba(255,255,255,0.9);/' $wallust_rofi fi + # GTK themes and icons switching set_custom_gtk_theme() { mode=$1 @@ -201,7 +220,7 @@ update_theme_mode sleep 0.5 # Run remaining scripts -${SCRIPTSDIR}/PywalSwww.sh +${SCRIPTSDIR}/WallustSwww.sh sleep 1 ${SCRIPTSDIR}/Refresh.sh diff --git a/config/hypr/scripts/GameMode.sh b/config/hypr/scripts/GameMode.sh index 37afe06..5ad268c 100755 --- a/config/hypr/scripts/GameMode.sh +++ b/config/hypr/scripts/GameMode.sh @@ -22,7 +22,7 @@ if [ "$HYPRGAMEMODE" = 1 ] ; then else swww-daemon && swww img "$HOME/.config/rofi/.current_wallpaper" & sleep 0.1 - ${SCRIPTSDIR}/PywalSwww.sh + ${SCRIPTSDIR}/WallustSwww.sh sleep 0.5 ${SCRIPTSDIR}/Refresh.sh notify-send -e -u normal -i "$notif" "gamemode disabled. All animations normal" diff --git a/config/hypr/scripts/Refresh.sh b/config/hypr/scripts/Refresh.sh index aeae77d..42e7089 100755 --- a/config/hypr/scripts/Refresh.sh +++ b/config/hypr/scripts/Refresh.sh @@ -1,6 +1,6 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -# Scripts for refreshing ags waybar, rofi, swaync, pywal colors +# Scripts for refreshing ags waybar, rofi, swaync, wallust SCRIPTSDIR=$HOME/.config/hypr/scripts UserScripts=$HOME/.config/hypr/UserScripts @@ -42,7 +42,5 @@ if file_exists "${UserScripts}/RainbowBorders.sh"; then ${UserScripts}/RainbowBorders.sh & fi -# for cava-pywal (note, need to manually restart cava once wallpaper changes) -ln -sf "$HOME/.cache/wal/cava-colors" "$HOME/.config/cava/config" || true exit 0 \ No newline at end of file diff --git a/config/hypr/scripts/RefreshNoWaybar.sh b/config/hypr/scripts/RefreshNoWaybar.sh index 42d67ad..70a4aeb 100755 --- a/config/hypr/scripts/RefreshNoWaybar.sh +++ b/config/hypr/scripts/RefreshNoWaybar.sh @@ -3,7 +3,7 @@ # Modified version of Refresh but no waybar refresh # Used by automatic wallpaper change -# Modified inorder to refresh rofi background, Pywal, SwayNC +# Modified inorder to refresh rofi background, Wallust, SwayNC SCRIPTSDIR=$HOME/.config/hypr/scripts UserScripts=$HOME/.config/hypr/UserScripts @@ -28,8 +28,8 @@ done # quit ags ags -q -# Pywal refresh -${SCRIPTSDIR}/PywalSwww.sh & +# Wallust refresh +${SCRIPTSDIR}/WallustSwww.sh & # Relaunching rainbow borders if the script exists sleep 1 @@ -37,7 +37,5 @@ if file_exists "${UserScripts}/RainbowBorders.sh"; then ${UserScripts}/RainbowBorders.sh & fi -# for cava-pywal (note, need to manually restart cava once wallpaper changes) -ln -sf "$HOME/.cache/wal/cava-colors" "$HOME/.config/cava/config" || true exit 0 \ No newline at end of file diff --git a/config/hypr/scripts/PywalSwww.sh b/config/hypr/scripts/WallustSwww.sh similarity index 83% rename from config/hypr/scripts/PywalSwww.sh rename to config/hypr/scripts/WallustSwww.sh index 9f7b15b..2a71102 100755 --- a/config/hypr/scripts/PywalSwww.sh +++ b/config/hypr/scripts/WallustSwww.sh @@ -1,6 +1,6 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -# Pywal Colors for current wallpaper +# Wallust Colors for current wallpaper # Define the path to the swww cache directory cache_dir="$HOME/.cache/swww/" @@ -30,9 +30,8 @@ fi # Check the flag before executing further commands if [ "$ln_success" = true ]; then - # execute pywal - # wal -i "$wallpaper_path" - echo 'about to execute wal' - # execute pywal skipping tty and terminal changes - wal -i "$wallpaper_path" -s -t -n -e & + # execute wallust + echo 'about to execute wallust' + # execute wallust skipping tty and terminal changes + wallust run "$wallpaper_path" -s & fi diff --git a/config/hypr/wallust/wallust-hyprland.conf b/config/hypr/wallust/wallust-hyprland.conf new file mode 100644 index 0000000..0048885 --- /dev/null +++ b/config/hypr/wallust/wallust-hyprland.conf @@ -0,0 +1,18 @@ +$background = rgb(010102) +$foreground = rgb(E2FECE) +$color0 = rgb(010102) +$color1 = rgb(595213) +$color2 = rgb(9E2517) +$color3 = rgb(0E714C) +$color4 = rgb(08AC75) +$color5 = rgb(08BCB1) +$color6 = rgb(81BC57) +$color7 = rgb(CDF5B1) +$color8 = rgb(8FAB7C) +$color9 = rgb(776D19) +$color10 = rgb(D3311F) +$color11 = rgb(129766) +$color12 = rgb(0AE59C) +$color13 = rgb(0AFAEC) +$color14 = rgb(ACFB74) +$color15 = rgb(CDF5B1) diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index 4b19446..f178d46 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -1,5 +1,3 @@ -#include ~/.cache/wal/colors-kitty.conf - font_family Fira Code SemiBold font_size 13.0 bold_font auto diff --git a/config/rofi/.current_wallpaper b/config/rofi/.current_wallpaper index e575d15..164ab72 120000 --- a/config/rofi/.current_wallpaper +++ b/config/rofi/.current_wallpaper @@ -1 +1 @@ -/home/ja/Pictures/wallpapers/CuteCat.png \ No newline at end of file +/home/ja/Pictures/wallpapers/IT_guy.png \ No newline at end of file diff --git a/config/rofi/config-search.rasi b/config/rofi/config-search.rasi index 2fc2f47..5e39878 100644 --- a/config/rofi/config-search.rasi +++ b/config/rofi/config-search.rasi @@ -12,13 +12,11 @@ window { /* ---- Inputbar ---- */ inputbar { enabled: true; - padding: 2px; - margin: 2px; } /* ---- Mainbox ---- */ mainbox { - padding: 2px; + padding: 0px; children: [ "entry"]; } diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi index 3cfecc4..5afb769 100644 --- a/config/rofi/config-wallpaper.rasi +++ b/config/rofi/config-wallpaper.rasi @@ -44,7 +44,7 @@ element-icon { } element-text { - font: "Fira Code SemiBold 8"; + font: "Fira Code SemiBold 10"; vertical-align: 0.5; horizontal-align: 0.5; } diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi index 2c8b965..2eae75b 100755 --- a/config/rofi/config.rasi +++ b/config/rofi/config.rasi @@ -19,8 +19,8 @@ configuration { dpi: 1; } -/* ---- Load pywal colors ---- */ -@theme "~/.cache/wal/colors-rofi-dark.rasi" +/* ---- Load wallust colors ---- */ +@theme "~/.config/rofi/wallust/colors-rofi.rasi" /* ---- Global Properties ---- */ * { @@ -50,11 +50,12 @@ window { // Style Values width: 50%; - background-color: #00000099; + background-color: @background; } /* ----- Main Box ----- */ mainbox { + padding: 15px; enabled: true; orientation: vertical; children: [ "inputbar", "listbox" ]; @@ -81,10 +82,10 @@ entry { width: 300px; padding: 10px; border-radius: 12px; - background-color: @background-alt; - text-color: inherit; + background-color: @selected; + text-color: @text-selected cursor: text; - placeholder: "🔎 Search "; // << Search symbol + placeholder: "🔎 Search "; // << Search symbol placeholder-color: inherit; } @@ -133,7 +134,7 @@ button { padding: 12px; border-radius: 12px; background-color: @background-alt; - text-color: inherit; + text-color: @selected; cursor: pointer; } button selected { diff --git a/config/rofi/pywal-color/Readme.md b/config/rofi/pywal-color/Readme.md deleted file mode 100644 index 5e2da85..0000000 --- a/config/rofi/pywal-color/Readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# NOTE!! - -This is symlink from ~/.cache/wal/colors-rofi-dark.rasi or ~/.cache/wal/colors-rofi-dark.rasi. Do not delete this folder and files else rofi theme wont be loaded. \ No newline at end of file diff --git a/config/rofi/pywal-color/pywal-theme.rasi b/config/rofi/pywal-color/pywal-theme.rasi deleted file mode 100644 index b7d485d..0000000 --- a/config/rofi/pywal-color/pywal-theme.rasi +++ /dev/null @@ -1 +0,0 @@ -This is only for symlink \ No newline at end of file diff --git a/config/rofi/resolution/1080p/config.rasi b/config/rofi/resolution/1080p/config.rasi index 2c8b965..2eae75b 100755 --- a/config/rofi/resolution/1080p/config.rasi +++ b/config/rofi/resolution/1080p/config.rasi @@ -19,8 +19,8 @@ configuration { dpi: 1; } -/* ---- Load pywal colors ---- */ -@theme "~/.cache/wal/colors-rofi-dark.rasi" +/* ---- Load wallust colors ---- */ +@theme "~/.config/rofi/wallust/colors-rofi.rasi" /* ---- Global Properties ---- */ * { @@ -50,11 +50,12 @@ window { // Style Values width: 50%; - background-color: #00000099; + background-color: @background; } /* ----- Main Box ----- */ mainbox { + padding: 15px; enabled: true; orientation: vertical; children: [ "inputbar", "listbox" ]; @@ -81,10 +82,10 @@ entry { width: 300px; padding: 10px; border-radius: 12px; - background-color: @background-alt; - text-color: inherit; + background-color: @selected; + text-color: @text-selected cursor: text; - placeholder: "🔎 Search "; // << Search symbol + placeholder: "🔎 Search "; // << Search symbol placeholder-color: inherit; } @@ -133,7 +134,7 @@ button { padding: 12px; border-radius: 12px; background-color: @background-alt; - text-color: inherit; + text-color: @selected; cursor: pointer; } button selected { diff --git a/config/rofi/resolution/1440p/config.rasi b/config/rofi/resolution/1440p/config.rasi index ae3a7b7..01efd1a 100755 --- a/config/rofi/resolution/1440p/config.rasi +++ b/config/rofi/resolution/1440p/config.rasi @@ -20,7 +20,7 @@ configuration { } /* ---- Load pywal colors ---- */ -@theme "~/.cache/wal/colors-rofi-dark.rasi" +@theme "~/.config/rofi/wallust/colors-rofi.rasi" /* ---- Global Properties ---- */ * { @@ -50,11 +50,12 @@ window { // Style Values width: 40%; - background-color: #00000099; + background-color: @background; } /* ----- Main Box ----- */ mainbox { + padding: 15px; enabled: true; orientation: vertical; children: [ "inputbar", "listbox" ]; @@ -81,10 +82,10 @@ entry { width: 300px; padding: 10px; border-radius: 12px; - background-color: @background-alt; + background-color: @selected; text-color: @text-selected; cursor: text; - placeholder: "🔎 Search "; // << Search symbol + placeholder: " Search "; // << Search symbol placeholder-color: inherit; } @@ -133,7 +134,7 @@ button { padding: 12px; border-radius: 12px; background-color: @background-alt; - text-color: inherit; + text-color: @selected; cursor: pointer; } button selected { diff --git a/config/rofi/wallust/colors-rofi.rasi b/config/rofi/wallust/colors-rofi.rasi new file mode 100644 index 0000000..39aab89 --- /dev/null +++ b/config/rofi/wallust/colors-rofi.rasi @@ -0,0 +1,28 @@ +* { +active-background: #9E2517; +active-foreground: #E2FECE; +normal-background: #010102; +normal-foreground: #E2FECE; +urgent-background: #595213; +urgent-foreground: #E2FECE; + +alternate-active-background: #010102; +alternate-active-foreground: #E2FECE; +alternate-normal-background: #010102; +alternate-normal-foreground: #E2FECE; +alternate-urgent-background: #010102; +alternate-urgent-foreground: #E2FECE; + +selected-active-background: #595213; +selected-active-foreground: #E2FECE; +selected-normal-background: #CDF5B1; +selected-normal-foreground: #E2FECE; +selected-urgent-background: #0AE59C; +selected-urgent-foreground: #E2FECE; + +background-color: #010102; +background: rgba(0,0,0,0.7); +foreground: #CDF5B1; +border-color: #010102; +} + diff --git a/config/swaync/style.css b/config/swaync/style.css index da3746c..a87d996 100755 --- a/config/swaync/style.css +++ b/config/swaync/style.css @@ -1,6 +1,7 @@ /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ +/* swaync colors - wallust from waybar.css */ -@import '../../.cache/wal/colors-waybar.css'; +@import '../../.config/waybar/wallust/colors-waybar.css'; @define-color noti-border-color @color2; @define-color noti-bg rgba(0, 0, 0, 0.8); diff --git a/config/swaync/wallust/colors-wallust.css b/config/swaync/wallust/colors-wallust.css new file mode 100644 index 0000000..bc36eb3 --- /dev/null +++ b/config/swaync/wallust/colors-wallust.css @@ -0,0 +1,9 @@ +@define-color text #E2FECE; +@define-color background rgba(1,1,2,0.25); +@define-color background-alt #010102; +@define-color cursor #E2FECE; +@define-color hovered #0AE59C; +@define-color button-background #81BC57; +@define-color button-active #9E2517; +@define-color border #776D19; +@define-color urgent #CDF5B1; diff --git a/config/wal/templates/colors-hyprland b/config/wal/templates/colors-hyprland deleted file mode 100644 index c1ccbaf..0000000 --- a/config/wal/templates/colors-hyprland +++ /dev/null @@ -1,18 +0,0 @@ -$foregroundCol = 0xff{foreground.strip} -$backgroundCol = 0xff{background.strip} -$color0 = 0xff{color0.strip} -$color1 = 0xff{color1.strip} -$color2 = 0xff{color2.strip} -$color3 = 0xff{color3.strip} -$color4 = 0xff{color4.strip} -$color5 = 0xff{color5.strip} -$color6 = 0xff{color6.strip} -$color7 = 0xff{color7.strip} -$color8 = 0xff{color8.strip} -$color9 = 0xff{color9.strip} -$color10 = 0xff{color10.strip} -$color11 = 0xff{color11.strip} -$color12 = 0xff{color12.strip} -$color13 = 0xff{color13.strip} -$color14 = 0xff{color14.strip} -$color15 = 0xff{color15.strip} diff --git a/config/wal/templates/colors-rofi-dark.rasi b/config/wal/templates/colors-rofi-dark.rasi deleted file mode 100644 index 7d1488b..0000000 --- a/config/wal/templates/colors-rofi-dark.rasi +++ /dev/null @@ -1,166 +0,0 @@ -* {{ - active-background: {color2}; - active-foreground: @foreground; - normal-background: @background; - normal-foreground: @foreground; - urgent-background: {color1}; - urgent-foreground: @foreground; - - alternate-active-background: @background; - alternate-active-foreground: @foreground; - alternate-normal-background: @background; - alternate-normal-foreground: @foreground; - alternate-urgent-background: @background; - alternate-urgent-foreground: @foreground; - - selected-active-background: {color1}; - selected-active-foreground: @foreground; - selected-normal-background: {color2}; - selected-normal-foreground: @foreground; - selected-urgent-background: {color3}; - selected-urgent-foreground: @foreground; - - background-color: @background; - background: rgba(0,0,0,0.7); - foreground: {foreground}; - border-color: @background; - spacing: 2; -}} - -#window {{ - background-color: @background; - border: 0; - padding: 2.5ch; -}} - -#mainbox {{ - border: 0; - padding: 0; -}} - -#message {{ - border: 2px 0px 0px; - border-color: @border-color; - padding: 1px; -}} - -#textbox {{ - text-color: @foreground; -}} - -#inputbar {{ - children: [ prompt,textbox-prompt-colon,entry,case-indicator ]; -}} - -#textbox-prompt-colon {{ - expand: false; - str: ":"; - margin: 0px 0.3em 0em 0em; - text-color: @normal-foreground; -}} - -#listview {{ - fixed-height: 0; - border: 2px 0px 0px; - border-color: @border-color; - spacing: 2px; - scrollbar: true; - padding: 2px 0px 0px; -}} - -#element {{ - border: 0; - padding: 1px; -}} - -#element-text, element-icon {{ - background-color: inherit; - text-color: inherit; -}} - -#element.normal.normal {{ - background-color: @normal-background; - text-color: @normal-foreground; -}} - -#element.normal.urgent {{ - background-color: @urgent-background; - text-color: @urgent-foreground; -}} - -#element.normal.active {{ - background-color: @active-background; - text-color: @active-foreground; -}} - -#element.selected.normal {{ - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -}} - -#element.selected.urgent {{ - background-color: @selected-urgent-background; - text-color: @selected-urgent-foreground; -}} - -#element.selected.active {{ - background-color: @selected-active-background; - text-color: @selected-active-foreground; -}} - -#element.alternate.normal {{ - background-color: @alternate-normal-background; - text-color: @alternate-normal-foreground; -}} - -#element.alternate.urgent {{ - background-color: @alternate-urgent-background; - text-color: @alternate-urgent-foreground; -}} - -#element.alternate.active {{ - background-color: @alternate-active-background; - text-color: @alternate-active-foreground; -}} - -#scrollbar {{ - width: 4px; - border: 0; - handle-width: 8px; - padding: 0; -}} - -#sidebar {{ - border: 2px 0px 0px; - border-color: @border-color; -}} - -#button {{ - text-color: @normal-foreground; -}} - -#button.selected {{ - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -}} - -#inputbar {{ - spacing: 0; - text-color: @normal-foreground; - padding: 1px; -}} - -#case-indicator {{ - spacing: 0; - text-color: @normal-foreground; -}} - -#entry {{ - spacing: 0; - text-color: @normal-foreground; -}} - -#prompt {{ - spacing: 0; - text-color: @normal-foreground; -}} diff --git a/config/wal/templates/colors-rofi-light.rasi b/config/wal/templates/colors-rofi-light.rasi deleted file mode 100644 index 57ea77c..0000000 --- a/config/wal/templates/colors-rofi-light.rasi +++ /dev/null @@ -1,166 +0,0 @@ -* {{ - active-background: {color2}; - active-foreground: @foreground; - normal-background: @background; - normal-foreground: @foreground; - urgent-background: {color1}; - urgent-foreground: @foreground; - - alternate-active-background: @background; - alternate-active-foreground: @foreground; - alternate-normal-background: @background; - alternate-normal-foreground: @foreground; - alternate-urgent-background: @background; - alternate-urgent-foreground: @foreground; - - selected-active-background: {color1}; - selected-active-foreground: @foreground; - selected-normal-background: {color2}; - selected-normal-foreground: @foreground; - selected-urgent-background: {color3}; - selected-urgent-foreground: @foreground; - - background-color: @background; - background: rgba(255,255,255, 0.5); - foreground: {background}; - border-color: @background; - spacing: 2; -}} - -#window {{ - background-color: @background; - border: 0; - padding: 2.5ch; -}} - -#mainbox {{ - border: 0; - padding: 0; -}} - -#message {{ - border: 2px 0px 0px; - border-color: @border-color; - padding: 1px; -}} - -#textbox {{ - text-color: @foreground; -}} - -#inputbar {{ - children: [ prompt,textbox-prompt-colon,entry,case-indicator ]; -}} - -#textbox-prompt-colon {{ - expand: false; - str: ":"; - margin: 0px 0.3em 0em 0em; - text-color: @normal-foreground; -}} - -#listview {{ - fixed-height: 0; - border: 2px 0px 0px; - border-color: @border-color; - spacing: 2px; - scrollbar: true; - padding: 2px 0px 0px; -}} - -#element {{ - border: 0; - padding: 1px; -}} - -#element-text, element-icon {{ - background-color: inherit; - text-color: inherit; -}} - -#element.normal.normal {{ - background-color: @normal-background; - text-color: @normal-foreground; -}} - -#element.normal.urgent {{ - background-color: @urgent-background; - text-color: @urgent-foreground; -}} - -#element.normal.active {{ - background-color: @active-background; - text-color: @active-foreground; -}} - -#element.selected.normal {{ - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -}} - -#element.selected.urgent {{ - background-color: @selected-urgent-background; - text-color: @selected-urgent-foreground; -}} - -#element.selected.active {{ - background-color: @selected-active-background; - text-color: @selected-active-foreground; -}} - -#element.alternate.normal {{ - background-color: @alternate-normal-background; - text-color: @alternate-normal-foreground; -}} - -#element.alternate.urgent {{ - background-color: @alternate-urgent-background; - text-color: @alternate-urgent-foreground; -}} - -#element.alternate.active {{ - background-color: @alternate-active-background; - text-color: @alternate-active-foreground; -}} - -#scrollbar {{ - width: 4px; - border: 0; - handle-width: 8px; - padding: 0; -}} - -#sidebar {{ - border: 2px 0px 0px; - border-color: @border-color; -}} - -#button {{ - text-color: @normal-foreground; -}} - -#button.selected {{ - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -}} - -#inputbar {{ - spacing: 0; - text-color: @normal-foreground; - padding: 1px; -}} - -#case-indicator {{ - spacing: 0; - text-color: @normal-foreground; -}} - -#entry {{ - spacing: 0; - text-color: @normal-foreground; -}} - -#prompt {{ - spacing: 0; - text-color: @normal-foreground; -}} diff --git a/config/wal/templates/cava-colors b/config/wallust/templates/colors-cava similarity index 92% rename from config/wal/templates/cava-colors rename to config/wallust/templates/colors-cava index 4978058..1fd9eb6 100644 --- a/config/wal/templates/cava-colors +++ b/config/wallust/templates/colors-cava @@ -142,16 +142,17 @@ source = auto gradient = 1 -gradient_color_1 = '{color0}' -gradient_color_2 = '{color2}' -gradient_color_3 = '{color3}' -gradient_color_4 = '{color5}' -gradient_color_5 = '{color7}' -gradient_color_6 = '{color12}' -gradient_color_7 = '{color13}' -gradient_color_8 = '{color15}' - +gradient_count = 8 +gradient_color_1 = '{{color0}}' +gradient_color_2 = '{{color2}}' +gradient_color_3 = '{{color3}}' +gradient_color_4 = '{{color5}}' +gradient_color_5 = '{{color7}}' +gradient_color_6 = '{{color12}}' +gradient_color_7 = '{{color13}}' +gradient_color_8 = '{{color15}}' +[color] [smoothing] diff --git a/config/wallust/templates/colors-hyprland.conf b/config/wallust/templates/colors-hyprland.conf new file mode 100644 index 0000000..0387b5c --- /dev/null +++ b/config/wallust/templates/colors-hyprland.conf @@ -0,0 +1,18 @@ +$background = rgb({{background | strip}}) +$foreground = rgb({{foreground | strip}}) +$color0 = rgb({{color0 | strip}}) +$color1 = rgb({{color1 | strip}}) +$color2 = rgb({{color2 | strip}}) +$color3 = rgb({{color3 | strip}}) +$color4 = rgb({{color4 | strip}}) +$color5 = rgb({{color5 | strip}}) +$color6 = rgb({{color6 | strip}}) +$color7 = rgb({{color7 | strip}}) +$color8 = rgb({{color8 | strip}}) +$color9 = rgb({{color9 | strip}}) +$color10 = rgb({{color10 | strip}}) +$color11 = rgb({{color11 | strip}}) +$color12 = rgb({{color12 | strip}}) +$color13 = rgb({{color13 | strip}}) +$color14 = rgb({{color14 | strip}}) +$color15 = rgb({{color15 | strip}}) diff --git a/config/wallust/templates/colors-kitty.conf b/config/wallust/templates/colors-kitty.conf new file mode 100644 index 0000000..4bcd862 --- /dev/null +++ b/config/wallust/templates/colors-kitty.conf @@ -0,0 +1,37 @@ +font_family Intel One Mono +bold_font auto +italic_font auto +bold_italic_font auto + +confirm_os_window_close 0 + +foreground {{foreground}} +background {{background}} +background_opacity 0.25 +cursor {{cursor}} + +active_tab_foreground {{background}} +active_tab_background {{foreground}} +inactive_tab_foreground {{foreground}} +inactive_tab_background {{background}} + +active_border_color {{foreground}} +inactive_border_color {{background}} +bell_border_color {{color1}} + +color0 {{color0}} +color1 {{color1}} +color2 {{color2}} +color3 {{color3}} +color4 {{color4}} +color5 {{color5}} +color6 {{color6}} +color7 {{color7}} +color8 {{color8}} +color9 {{color9}} +color10 {{color10}} +color11 {{color11}} +color12 {{color12}} +color13 {{color13}} +color14 {{color14}} +color15 {{color15}} diff --git a/config/wallust/templates/colors-rofi.rasi b/config/wallust/templates/colors-rofi.rasi new file mode 100644 index 0000000..508d177 --- /dev/null +++ b/config/wallust/templates/colors-rofi.rasi @@ -0,0 +1,28 @@ +* { +active-background: {{color2}}; +active-foreground: {{foreground}}; +normal-background: {{background}}; +normal-foreground: {{foreground}}; +urgent-background: {{color1}}; +urgent-foreground: {{foreground}}; + +alternate-active-background: {{background}}; +alternate-active-foreground: {{foreground}}; +alternate-normal-background: {{background}}; +alternate-normal-foreground: {{foreground}}; +alternate-urgent-background: {{background}}; +alternate-urgent-foreground: {{foreground}}; + +selected-active-background: {{color1}}; +selected-active-foreground: {{foreground}}; +selected-normal-background: {{color7}}; +selected-normal-foreground: {{foreground}}; +selected-urgent-background: {{color12}}; +selected-urgent-foreground: {{foreground}}; + +background-color: {{background}}; +background: rgba(0,0,0,0.7); +foreground: {{color15}}; +border-color: {{background}}; +} + diff --git a/config/wallust/templates/colors-swaync.css b/config/wallust/templates/colors-swaync.css new file mode 100644 index 0000000..0c2b636 --- /dev/null +++ b/config/wallust/templates/colors-swaync.css @@ -0,0 +1,9 @@ +@define-color text {{foreground}}; +@define-color background rgba({{background | rgb}},0.25); +@define-color background-alt {{background}}; +@define-color cursor {{cursor}}; +@define-color hovered {{color12}}; +@define-color button-background {{color6}}; +@define-color button-active {{color2}}; +@define-color border {{color9}}; +@define-color urgent {{color15}}; diff --git a/config/wallust/templates/colors-waybar.css b/config/wallust/templates/colors-waybar.css new file mode 100644 index 0000000..f66bac7 --- /dev/null +++ b/config/wallust/templates/colors-waybar.css @@ -0,0 +1,20 @@ +@define-color foreground {{foreground}}; +@define-color background rgba({{background | rgb}},0.25); +@define-color cursor {{cursor}}; + +@define-color color0 {{color0}}; +@define-color color1 {{color1}}; +@define-color color2 {{color2}}; +@define-color color3 {{color3}}; +@define-color color4 {{color4}}; +@define-color color5 {{color5}}; +@define-color color6 {{color6}}; +@define-color color7 {{color7}}; +@define-color color8 {{color8}}; +@define-color color9 {{color9}}; +@define-color color10 {{color10}}; +@define-color color11 {{color11}}; +@define-color color12 {{color12}}; +@define-color color13 {{color13}}; +@define-color color14 {{color14}}; +@define-color color15 {{color15}}; diff --git a/config/wallust/wallust.toml b/config/wallust/wallust.toml new file mode 100644 index 0000000..4ed44e8 --- /dev/null +++ b/config/wallust/wallust.toml @@ -0,0 +1,53 @@ +# wallust 3.0 beta.* + +backend = "resized" +color_space = "lch" + +# NOTE: All filters will fill 16 colors (from color0 to color15), 16 color +# variations are the 'ilusion' of more colors by opaquing color1 to color5. +# Use the most prominent colors in a way that makes sense, a scheme: +# * dark - 8 dark colors, dark background and light contrast +# * dark16 - Same as `dark` but uses the 16 colors trick +# * harddark - Same as `dark` with hard hue colors +# * harddark16 - Harddark with 16 color variation +# * light - Light bg, dark fg +# * light16 - Same as `light` but uses the 16 color trick +# * softdark - Variant of softlight, uses the lightest colors and a dark +# background (could be interpreted as `dark` inversed) +# * softdark16 - softdark with 16 color variation +# * softlight - Light with soft pastel colors, counterpart of `harddark` +# * softlight16 - softlight with 16 color variation +palette = "dark16" + +# Difference between similar colors, used by the colorspace: +# 1 Not perceptible by human eyes. +# 1 - 2 Perceptible through close observation. +# 2 - 10 Perceptible at a glance. +# 11 - 49 Colors are more similar than opposite +# 100 Colors are exact opposite +threshold = 10 + +[templates] +cava.template = 'templates/colors-cava' +cava.target = '~/.config/cava/config' + +hypr.template = 'templates/colors-hyprland.conf' +hypr.target = '~/.config/hypr/wallust/wallust-hyprland.conf' + +rofi.template = 'templates/colors-rofi.rasi' +rofi.target = '~/.config/rofi/wallust/colors-rofi.rasi' + +swaync.template = 'templates/colors-swaync.css' +swaync.target = '~/.config/swaync/wallust/colors-wallust.css' + +waybar.template = 'templates/colors-waybar.css' +waybar.target = '~/.config/waybar/wallust/colors-waybar.css' + +#macchina.template = 'templates/colors-macchina.toml' +#macchina.target = '~/.config/macchina/themes/wallust.toml' + +#wezterm.template = 'templates/colors-wezterm.toml' +#wezterm.target = '~/.config/wezterm/colors/wallust.toml' + +#zathura.template = 'templates/colors-zathura' +#zathura.target = '~/.config/zathura/zathurarc' diff --git a/config/waybar/config b/config/waybar/config deleted file mode 100644 index 48604a0..0000000 --- a/config/waybar/config +++ /dev/null @@ -1 +0,0 @@ -for symlink \ No newline at end of file diff --git a/config/waybar/config b/config/waybar/config new file mode 120000 index 0000000..079ec33 --- /dev/null +++ b/config/waybar/config @@ -0,0 +1 @@ +/home/ja/.config/waybar/configs/[TOP] Default Laptop_v2 \ No newline at end of file diff --git a/config/waybar/style.css b/config/waybar/style.css deleted file mode 100644 index 48604a0..0000000 --- a/config/waybar/style.css +++ /dev/null @@ -1 +0,0 @@ -for symlink \ No newline at end of file diff --git a/config/waybar/style.css b/config/waybar/style.css new file mode 120000 index 0000000..ab62339 --- /dev/null +++ b/config/waybar/style.css @@ -0,0 +1 @@ +/home/ja/.config/waybar/style/[Wallust] Chroma Tally.css \ No newline at end of file diff --git a/config/waybar/style/[Pywal Bordered] Chroma Fusion Edge.css b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css similarity index 97% rename from config/waybar/style/[Pywal Bordered] Chroma Fusion Edge.css rename to config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css index 8997795..b983170 100644 --- a/config/waybar/style/[Pywal Bordered] Chroma Fusion Edge.css +++ b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css @@ -1,6 +1,6 @@ /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ /* ....Chroma Fusion Edge .... */ -/* Pywal & Catppuccin - Bordered */ +/* Wallust & Catppuccin - Bordered */ @define-color white #F2F2F2; @define-color black #000000; @@ -13,11 +13,11 @@ @define-color cyan rgba(53, 140, 169, 1); @define-color background-module @transparent; -@define-color border-color @color2; +@define-color border-color @color9; @define-color button-color @color11; @define-color button-hover @color12; -@import '../../.cache/wal/colors-waybar.css'; +@import '../../.config/waybar/wallust/colors-waybar.css'; @import "../waybar/style/catppuccin-themes/latte.css"; * { diff --git a/config/waybar/style/[Pywal Transparent] Crystal Clear.css b/config/waybar/style/[Wallust Transparent] Crystal Clear.css similarity index 92% rename from config/waybar/style/[Pywal Transparent] Crystal Clear.css rename to config/waybar/style/[Wallust Transparent] Crystal Clear.css index 9d6502f..189be61 100644 --- a/config/waybar/style/[Pywal Transparent] Crystal Clear.css +++ b/config/waybar/style/[Wallust Transparent] Crystal Clear.css @@ -1,15 +1,15 @@ /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ /* ..........................................*/ -/* .......Pywal - Transparent............... */ +/* ....Wallust - Clear Background........ */ /* ......................................... */ -/* --- 👍 designed by https://github.com/Krautt 👍 --- */ +/* --- 👍 original designed by https://github.com/Krautt 👍 --- */ -@import '../../.cache/wal/colors-waybar.css'; +@import '../../.config/waybar/wallust/colors-waybar.css'; @define-color critical #ff0000; /* critical color */ @define-color warning #f3f809; /* warning color */ -@define-color text @color2; /* text color */ -@define-color text-alt @color7; /* text alternative color */ +@define-color text @color12; /* text color */ +@define-color text-alt @color9; /* text alternative color */ @define-color bg @color7; /* background color */ *{ diff --git a/config/waybar/style/[Pywal] Chroma Edge.css b/config/waybar/style/[Wallust] Chroma Edge.css similarity index 97% rename from config/waybar/style/[Pywal] Chroma Edge.css rename to config/waybar/style/[Wallust] Chroma Edge.css index 600b72d..9ee29a2 100644 --- a/config/waybar/style/[Pywal] Chroma Edge.css +++ b/config/waybar/style/[Wallust] Chroma Edge.css @@ -1,7 +1,7 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ -/* Pywal Chroma Edge */ +/* Wallust Chroma Edge */ -@import '../../.cache/wal/colors-waybar.css'; +@import '../../.config/waybar/wallust/colors-waybar.css'; * { font-family: "JetBrainsMono Nerd Font"; @@ -43,7 +43,7 @@ tooltip { border-radius: 12px; border-width: 2px; border-style: solid; - border-color: @color2; + border-color: @color12; } tooltip label{ @@ -133,7 +133,7 @@ tooltip label{ /* color: #bf616a; */ border-radius: 12px; background-color: rgba(50, 50, 50, 0.1); - border: 1px solid @color2; + border: 1px solid @color12; padding: 5px; } diff --git a/config/waybar/style/[Pywal] Chroma Fusion.css b/config/waybar/style/[Wallust] Chroma Fusion.css similarity index 97% rename from config/waybar/style/[Pywal] Chroma Fusion.css rename to config/waybar/style/[Wallust] Chroma Fusion.css index 00e50ef..e8a0427 100644 --- a/config/waybar/style/[Pywal] Chroma Fusion.css +++ b/config/waybar/style/[Wallust] Chroma Fusion.css @@ -1,6 +1,6 @@ /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ /* ....Chroma Fusion Edge .... */ -/* Pywal -Catpuccin */ +/* Wallust - Catpuccin */ @define-color white #F2F2F2; @define-color black #000000; @@ -13,11 +13,11 @@ @define-color cyan rgba(53, 140, 169, 1); @define-color background-module @transparent; -@define-color border-color @color2; +@define-color border-color @color12; @define-color button-color @color11; @define-color button-hover @color12; -@import '../../.cache/wal/colors-waybar.css'; +@import '../../.config/waybar/wallust/colors-waybar.css'; @import "../waybar/style/catppuccin-themes/latte.css"; * { diff --git a/config/waybar/style/[Pywal] Chroma Tally.css b/config/waybar/style/[Wallust] Chroma Tally.css similarity index 97% rename from config/waybar/style/[Pywal] Chroma Tally.css rename to config/waybar/style/[Wallust] Chroma Tally.css index fe3bc0f..24f08df 100644 --- a/config/waybar/style/[Pywal] Chroma Tally.css +++ b/config/waybar/style/[Wallust] Chroma Tally.css @@ -1,7 +1,7 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ -/* Pywal - Chroma Tally */ +/* Wallust - Chroma Tally */ -@import '../../.cache/wal/colors-waybar.css'; +@import '../../.config/waybar/wallust/colors-waybar.css'; * { font-family: "JetBrainsMono Nerd Font"; @@ -18,7 +18,7 @@ window#waybar { border-radius: 12px; border-bottom: 2px; border-style: solid; - border-color: @color2; + border-color: @color12; } #workspaces { diff --git a/config/waybar/style/[Pywal] Colored.css b/config/waybar/style/[Wallust] Colored.css similarity index 96% rename from config/waybar/style/[Pywal] Colored.css rename to config/waybar/style/[Wallust] Colored.css index f52211b..251f10b 100644 --- a/config/waybar/style/[Pywal] Colored.css +++ b/config/waybar/style/[Wallust] Colored.css @@ -1,7 +1,7 @@ /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ -/* pywal Colored*/ +/* Wallust Colored*/ -@import '../../.cache/wal/colors-waybar.css'; +@import '../../.config/waybar/wallust/colors-waybar.css'; * { font-family: "JetBrainsMono Nerd Font"; @@ -37,7 +37,7 @@ tooltip { border-radius: 10px; border-width: 1px; border-style: solid; - border-color: @color2; + border-color: @color15; } /*-----module groups----*/ @@ -85,7 +85,7 @@ tooltip { #workspaces button.active { color: @background; - background-color: @color2; + background-color: @color7; padding-left: 8px; padding-right: 8px; animation: gradient_f 20s ease-in infinite; diff --git a/config/waybar/style/[Pywal] Simple.css b/config/waybar/style/[Wallust] Simple.css similarity index 97% rename from config/waybar/style/[Pywal] Simple.css rename to config/waybar/style/[Wallust] Simple.css index 835d2ca..77d39c6 100644 --- a/config/waybar/style/[Pywal] Simple.css +++ b/config/waybar/style/[Wallust] Simple.css @@ -1,5 +1,5 @@ /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ -/* pywal - Simple */ +/* Wallust - Simple */ *{ font-family: "JetBrainsMono Nerd Font"; @@ -12,7 +12,7 @@ padding-top: 1px; padding-bottom: 1px; } -@import '../../.cache/wal/colors-waybar.css'; +@import '../../.config/waybar/wallust/colors-waybar.css'; window#waybar { background: transparent; @@ -23,7 +23,7 @@ window#waybar { } tooltip { - color: @color2; + color: @color15; background: @color0; opacity: 0.8; border-radius: 10px; @@ -145,7 +145,7 @@ tooltip { #custom-weather.showyIcyDay, #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { - color: @color2; + color: @color12; padding-top: 3px; padding-bottom: 3px; padding-right: 6px; diff --git a/config/waybar/wallust/colors-waybar.css b/config/waybar/wallust/colors-waybar.css new file mode 100644 index 0000000..60cca04 --- /dev/null +++ b/config/waybar/wallust/colors-waybar.css @@ -0,0 +1,20 @@ +@define-color foreground #E2FECE; +@define-color background rgba(1,1,2,0.25); +@define-color cursor #E2FECE; + +@define-color color0 #010102; +@define-color color1 #595213; +@define-color color2 #9E2517; +@define-color color3 #0E714C; +@define-color color4 #08AC75; +@define-color color5 #08BCB1; +@define-color color6 #81BC57; +@define-color color7 #CDF5B1; +@define-color color8 #8FAB7C; +@define-color color9 #776D19; +@define-color color10 #D3311F; +@define-color color11 #129766; +@define-color color12 #0AE59C; +@define-color color13 #0AFAEC; +@define-color color14 #ACFB74; +@define-color color15 #CDF5B1; diff --git a/copy.sh b/copy.sh index 2e94494..6fb4cc8 100755 --- a/copy.sh +++ b/copy.sh @@ -4,7 +4,7 @@ clear wallpaper=$HOME/Pictures/wallpapers/Lofi-Urban-Nightscape.png -Waybar_Style="$HOME/.config/waybar/style/[Pywal] Chroma Tally.css" +Waybar_Style="$HOME/.config/waybar/style/[Wallust] Chroma Tally.css" # Check if running as root. If root, script will exit if [[ $EUID -eq 0 ]]; then @@ -297,11 +297,8 @@ done # symlinks for waybar style ln -sf "$Waybar_Style" "$HOME/.config/waybar/style.css" && \ -# initialize pywal to avoid config error on hyprland -wal -i $wallpaper -s -t -n -e 2>&1 | tee -a "$LOG" - -#initial symlink for Pywal Dark and Light for Rofi Themes -ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi" +# initialize wallust to avoid config error on hyprland +wallust run -s $wallpaper 2>&1 | tee -a "$LOG" printf "\n%.0s" {1..2}