1
0

New Wallpaper Selection! Other Tweaks as well

This commit is contained in:
Eli Fouts 2025-01-16 01:46:09 -05:00
parent 3ba3d6b6d9
commit 8ac6f4bf3d
23 changed files with 357 additions and 166 deletions

View File

@ -15,6 +15,7 @@ alias tasks='bpytop'
alias Docs="cd ~/Documents && nvim"
alias Settings="cd ~/.config/hypr && nvim"
alias spot="ncspot"
alias untar="tar -xf"
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
PS1='[\u@\h \W]\$ '

6
.config/cava/config Normal file
View File

@ -0,0 +1,6 @@
[color]
gradient = 1
gradient_count = 2
gradient_color_1 = '#4b4d3f'
gradient_color_2 = '#69562a'

View File

@ -0,0 +1,79 @@
#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);
}
}

View File

@ -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;
}

View File

@ -0,0 +1,14 @@
#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;
}

View File

@ -1,39 +1,16 @@
# You can split this configuration into multiple files
# Create your files separately and then link them to this file like this:
# source = ~/.config/hypr/myColors.conf
source = /home/$USER/.cache/wal/colors-hyprland
################
### MONITORS ###
################
# See https://wiki.hyprland.org/Configuring/Monitors/
monitor = DP-1, 2560x1440@165, 0x0, 1
###################
### MY PROGRAMS ###
###################
# See https://wiki.hyprland.org/Configuring/Keywords/
$terminal = kitty
$fileManager = thunar
$menu = wofi --show drun
#################
### AUTOSTART ###
#################
$menu = wofi --show drun -n
exec-once = hypridle
exec-once = waybar
exec-once = swww-daemon
exec-once = sudo powertop --auto-tune
exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once = swaync && swaync-client -df
#############################
### ENVIRONMENT VARIABLES ###
#############################
# See https://wiki.hyprland.org/Configuring/Environment-variables/
env = XCURSOR_THEME,Bibata-Modern-Classic
env = XCURSOR_SIZE,12
#####################
### LOOK AND FEEL ###
#####################
# Refer to https://wiki.hyprland.org/Configuring/Variables/
# https://wiki.hyprland.org/Configuring/Variables/#general
general {
gaps_in = 2
gaps_out = 15
@ -44,7 +21,6 @@ general {
allow_tearing = false
layout = dwindle
}
# https://wiki.hyprland.org/Configuring/Variables/#decoration
decoration {
rounding = 4
active_opacity = 0.8
@ -73,7 +49,6 @@ decoration {
}
animations {
enabled = true
# Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
bezier = linear, 0,0,1,1
bezier = swirl, 0.04, 1, 0.2, 1.2
animation = windows, 1, 4, swirl, popin 0%
@ -83,61 +58,44 @@ animations {
animation = specialWorkspace, 1, 5, swirl, slidefadevert -50%
}
dwindle {
pseudotile = true # Master switch for pseudotiling. mainMod + P
preserve_split = true
}
misc {
force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers
disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
force_default_wallpaper = 1
disable_hyprland_logo = true
}
#############
### INPUT ###
#############
# https://wiki.hyprland.org/Configuring/Variables/#input
input {
kb_layout = us
kb_variant =
kb_model =
kb_options =
kb_rules =
follow_mouse = 1
sensitivity = 0
touchpad {
natural_scroll = true
}
}
# https://wiki.hyprland.org/Configuring/Variables/#gestures
gestures {
workspace_swipe = true
workspace_swipe_distance = 300
workspace_swipe_cancel_ratio = .05
workspace_swipe_min_speed_to_force = 0
}
# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
device {
name = epic-mouse-v1
sensitivity = 0
}
####################
### KEYBINDINGSS ###
####################
# See https://wiki.hyprland.org/Configuring/Keywords/
$mainMod = SUPER
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
bind = $mainMod, Q, exec, $terminal
bind = $mainMod, B, killactive,
bind = $mainMod, B, killactive
bind = $mainMod, E, exec, $fileManager
bind = $mainMod, V, togglefloating
bind = $mainMod, R, exec, $menu
bind = $mainMod, P, pseudo,
bind = $mainMod, J, togglesplit,
bind = $mainMod, P, pseudo
bind = $mainMod, J, togglesplit
bind = $mainMod, F, fullscreen
# Move focus with mainMod + arrow keys
bind = $mainMod, left, movefocus, l
bind = $mainMod, right, movefocus, r
bind = $mainMod, up, movefocus, u
bind = $mainMod, down, movefocus, d
# Switch workspaces with mainMod + [0-9]
bind = $mainMod, 1, workspace, 1
bind = $mainMod, 2, workspace, 2
bind = $mainMod, 3, workspace, 3
@ -148,7 +106,6 @@ bind = $mainMod, 7, workspace, 7
bind = $mainMod, 8, workspace, 8
bind = $mainMod, 9, workspace, 9
bind = $mainMod, 0, workspace, 10
# Move active window to a workspace with mainMod + SHIFT + [0-9]
bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3
@ -179,18 +136,10 @@ 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, r, exec, ~/.config/swaync/refresh.sh
bind = $mainMod, M, exit,
##############################
### WINDOWS AND WORKSPACES ###
##############################
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
bind = $mainMod, M, exit
layerrule = blur, wofi
layerrule = ignorezero, wofi
layerrule = ignorealpha 0.5, wofi
layerrule = blur, wlogout
layerrule = ignorezero, wlogout
layerrule = ignorealpha 0.5, wlogout
layerrule = blur, waybar
layerrule = ignorezero, waybar
layerrule = ignorealpha 0.5, waybar
@ -200,10 +149,5 @@ layerrule = ignorezero, swaync-control-center
layerrule = ignorezero, swaync-notification-window
layerrule = ignorealpha 0.5, swaync-control-center
layerrule = ignorealpha 0.5, swaync-notification-window
layerrule = blur, wlogout
layerrule = ignorezero, wlogout
layerrule = ignorealpha 0.5, wlogout
windowrule = rounding 10, wofi
#windowrulev2 = suppressevent maximize, class:.*

View File

@ -1,16 +1,22 @@
#!/bin/bash
WALLPAPER_DIR="/home/eli/wallpapers/walls"
SELECTED_WALLPAPER=$(find "$WALLPAPER_DIR" -type f -exec basename {} \; | wofi -c ~/.config/wofi/config1 --show dmenu --prompt "Select Wallpaper:")
FULL_PATH=$(find "$WALLPAPER_DIR" -type f -name "$SELECTED_WALLPAPER")
swww img "$FULL_PATH" --transition-type any --transition-fps 60 --transition-duration .5
wal -i "$FULL_PATH" -n --cols16
swaync-client --reload-css
cat ~/.cache/wal/colors-kitty.conf > ~/.config/kitty/current-theme.conf
pywalfox update
color1=$(awk 'match($0, /color2=\47(.*)\47/,a) { print a[1] }' ~/.cache/wal/colors.sh)
color2=$(awk 'match($0, /color3=\47(.*)\47/,a) { print a[1] }' ~/.cache/wal/colors.sh)
cava_config="$HOME/.config/cava/config"
sed -i "s/^gradient_color_1 = .*/gradient_color_1 = '$color1'/" $cava_config
sed -i "s/^gradient_color_2 = .*/gradient_color_2 = '$color2'/" $cava_config
pkill -USR2 cava || cava -p $cava_config
WALLPAPER_DIR="$HOME/wallpapers/walls"
#I dont know what the fuck I am doing
menu() {
find "${WALLPAPER_DIR}" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) | awk '{print "img:"$0}'
}
main() {
choice=$(menu | wofi -c ~/.config/wofi/config1 -s ~/.config/wofi/style1.css --show dmenu --prompt "Select Wallpaper:" -n)
selected_wallpaper=$(echo "$choice" | sed 's/^img://')
swww img "$selected_wallpaper" --transition-type any --transition-fps 60 --transition-duration .5
wal -i "$selected_wallpaper" -n --cols16
swaync-client --reload-css
cat ~/.cache/wal/colors-kitty.conf > ~/.config/kitty/current-theme.conf
pywalfox update
color1=$(awk 'match($0, /color2=\47(.*)\47/,a) { print a[1] }' ~/.cache/wal/colors.sh)
color2=$(awk 'match($0, /color3=\47(.*)\47/,a) { print a[1] }' ~/.cache/wal/colors.sh)
cava_config="$HOME/.config/cava/config"
sed -i "s/^gradient_color_1 = .*/gradient_color_1 = '$color1'/" $cava_config
sed -i "s/^gradient_color_2 = .*/gradient_color_2 = '$color2'/" $cava_config
pkill -USR2 cava || cava -p $cava_config
}
main

View File

@ -1,30 +1,30 @@
foreground #bfc3c6
background #01111C
foreground #c6c6c3
background #1b1b12
background_opacity 1.0
cursor #bfc3c6
cursor #c6c6c3
active_tab_foreground #01111C
active_tab_background #bfc3c6
inactive_tab_foreground #bfc3c6
inactive_tab_background #01111C
active_tab_foreground #1b1b12
active_tab_background #c6c6c3
inactive_tab_foreground #c6c6c3
inactive_tab_background #1b1b12
active_border_color #bfc3c6
inactive_border_color #01111C
bell_border_color #39435e
active_border_color #c6c6c3
inactive_border_color #1b1b12
bell_border_color #393c37
color0 #01111C
color8 #58646b
color1 #39435e
color9 #4C5A7E
color2 #01506f
color10 #026B94
color3 #0b4a72
color11 #0F6399
color4 #335090
color12 #446BC0
color5 #036885
color13 #048BB2
color6 #206b87
color14 #2B8FB4
color7 #8c9297
color15 #bfc3c6
color0 #1b1b12
color8 #71715c
color1 #393c37
color9 #4D514A
color2 #4b4d3f
color10 #656755
color3 #69562a
color11 #8D7338
color4 #6a5838
color12 #8E764B
color5 #7d6c3c
color13 #A79050
color6 #967d3c
color14 #C8A751
color7 #9b9b90
color15 #c6c6c3

View File

@ -1,9 +1,9 @@
@import url('/home/eli/.cache/wal/colors-waybar.css');
@define-color mpris-album-art-overlay rgba(0, 0, 0, 0.55);
@define-color mpris-button-hover rgba(0, 0, 0, 0.50);
@define-color text @color7;
@define-color mpris-album-art-overlay alpha(@background, 0.55);
@define-color mpris-button-hover alpha(@background, 0.50);
@define-color text @color15;
@define-color bg alpha(@background,.5);
@define-color bg-hover rgba(50,50,50,.8);
@define-color bg-hover alpha(@background,.8);
@define-color mycolor @color9;
@define-color border-color alpha(@mycolor, 0.15);
@ -278,12 +278,12 @@
.widget-buttons-grid>flowbox>flowboxchild>button label {
font-size: 20px;
color: @text;
color: @color7;
transition: all .7s ease;
}
.widget-buttons-grid>flowbox>flowboxchild>button:hover label {
font-size: 20px;
color: @background;
color: @text;
transition: all .7s ease;
}
.widget-buttons-grid > flowbox > flowboxchild > button {
@ -294,7 +294,7 @@
transition: all .5s ease;
}
.widget-buttons-grid > flowbox > flowboxchild > button:hover {
background: @color5;
background: @color4;
box-shadow: 0px 0px 2px rgba(0, 0, 0, .2);
transition: all .5s ease;
@ -303,6 +303,9 @@
.widget-buttons-grid > flowbox > flowboxchild > button.toggle:checked {
background: @mycolor;
}
.widget-buttons-grid > flowbox > flowboxchild > button.toggle:checked label {
color: @background;
}
.widget-menubar > box > .menu-button-bar > button {
border: none;

View File

@ -60,7 +60,7 @@
"on-click-right": "blueman-manager",
},
"battery": {
"interval":10,
"interval":30,
"states": {
"good": 95,
"warning": 30,
@ -81,7 +81,7 @@
},
"custom/pacman": {
"format": "󰅢 {}",
"interval": 600,
"interval": 1800,
"exec": "checkupdates | wc -l",
"exec-if": "exit 0",
"on-click": "kitty sh -c 'yay; sudo pacman -Syu; echo Done - Press enter to exit; read'; pkill -SIGRTMIN+8 waybar",

View File

@ -1,2 +1,13 @@
pkill waybar
waybar
#!/bin/bash
# Check if waybar is running
if pgrep -x "waybar" > /dev/null; then
# If running, kill the waybar process
pkill -x "waybar"
echo "Waybar stopped."
else
# If not running, start waybar
waybar &
echo "Waybar started."
fi

View File

@ -1,8 +1,8 @@
[config]
allow_images=true
show=drun
width=1000
height=500
width=1200
height=600
always_parse_args=true
show_all=true
term=kitty
@ -10,3 +10,4 @@ hide_scroll=true
print_command=true
insensitive=true
columns=3
image_size=300

View File

@ -23,7 +23,7 @@
window {
all:unset;
padding: 20px;
border-radius: 10px;
border-radius: 0px;
background-color: alpha(@background,.5);
}
#inner-box {
@ -55,12 +55,12 @@ window {
#input image {
border: none;
color: @red;
outline: none;
}
#input * {
border: none;
outline: none;
}
#input:focus {
outline: none;
border: none;
@ -75,10 +75,12 @@ window {
}
#entry {
border: none;
margin: 5px;
}
#entry arrow {
border: none;
color: @lavender;
}
#entry:selected {
box-shadow: 1px 1px 5px rgba(255,255,255, .03);

88
.config/wofi/style1.css Normal file
View File

@ -0,0 +1,88 @@
@import url('/home/eli/.cache/wal/colors-waybar.css');
@define-color mauve @color9;
@define-color red @color9;
@define-color lavender @color7;
@define-color text @color7;
* {
all:unset;
font-family: 'CodeNewRoman Nerd Font Mono', monospace;
font-size: 18px;
outline: none;
border: none;
text-shadow:none;
background-color:transparent;
}
window {
all:unset;
padding: 20px;
border-radius: 0px;
background-color: alpha(@background,.5);
}
#inner-box {
margin: 2px;
padding: 5px;
border: none;
}
#outer-box {
border: none;
}
#scroll {
margin: 0px;
padding: 30px;
border: none;
}
#input {
all:unset;
margin-left:20px;
margin-right:20px;
margin-top:20px;
padding: 20px;
border: none;
outline: none;
color: @text;
box-shadow: 1px 1px 5px rgba(0, 0, 0, .2);
border-radius:10;
}
#input image {
border: none;
color: @red;
padding-right:10px;
}
#input * {
border: none;
outline: none;
}
#input:focus {
outline: none;
border: none;
box-shadow: 1px 1px 5px rgba(0, 0, 0, .2);
border-radius:10;
}
#text {
margin: 5px;
border: none;
color: @text;
outline: none;
}
#entry {
all:unset;
padding-left:35px;
padding-top: 35px;
}
#entry arrow {
border: none;
color: @lavender;
}
#entry:selected {
}
#entry:selected #text {
color: @mauve;
}
#entry:drop(active) {
background-color: @lavender !important;
}

View File

@ -310,7 +310,7 @@ In `~/.config/wofi/style.css`, update the hostname in the file path to your `pyw
networkmanager
gvfs
libnotify
pavucontrol
pavucontrolfdf
pipewire-pulse
nwg-look
wofi
@ -318,6 +318,8 @@ In `~/.config/wofi/style.css`, update the hostname in the file path to your `pyw
pywalfox
auto-cpufreq
powertop
qogir-icon-theme
fd
```
Fun to have

View File

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

Before

Width:  |  Height:  |  Size: 4.8 MiB

After

Width:  |  Height:  |  Size: 4.8 MiB

View File

Before

Width:  |  Height:  |  Size: 594 KiB

After

Width:  |  Height:  |  Size: 594 KiB

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

Before

Width:  |  Height:  |  Size: 211 KiB

After

Width:  |  Height:  |  Size: 211 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 673 KiB

BIN
wallpapers/walls/loki.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 836 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 951 KiB