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/fish/functions/f.fish b/Config/fish/functions/f.fish deleted file mode 100755 index ad1a9ab..0000000 --- a/Config/fish/functions/f.fish +++ /dev/null @@ -1,4 +0,0 @@ -function f --wraps='neofetch --config .config/neofetch/f.conf --ascii_distro arch_small' --wraps='neofetch --config .config/neofetch/f.conf --ascii .config/neofetch/arch-ascii' --description 'alias f=neofetch --config .config/neofetch/f.conf --ascii_distro arch_small' - neofetch --config .config/neofetch/f.conf --ascii_distro arch_small $argv - -end diff --git a/Config/fish/functions/ff.fish b/Config/fish/functions/ff.fish deleted file mode 100755 index 9aec7bb..0000000 --- a/Config/fish/functions/ff.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ff --wraps='neofetch --config .config/neofetch/ff.conf --off' --description 'alias ff=neofetch --config .config/neofetch/ff.conf --off' - neofetch --config .config/neofetch/ff.conf --off $argv - -end diff --git a/Config/fish/functions/r.fish b/Config/fish/functions/r.fish deleted file mode 100755 index 7ba885d..0000000 --- a/Config/fish/functions/r.fish +++ /dev/null @@ -1,4 +0,0 @@ -function r --wraps='sudo -E lf -config .config/lf/lfrc' --description 'alias r=sudo -E lf -config .config/lf/lfrc' - sudo -E lf -config .config/lf/lfrc $argv - -end diff --git a/Config/fish/functions/rr.fish b/Config/fish/functions/rr.fish deleted file mode 100755 index 619f0fa..0000000 --- a/Config/fish/functions/rr.fish +++ /dev/null @@ -1,4 +0,0 @@ -function rr --wraps=lf --description 'alias rr=lf' - lf $argv - -end diff --git a/Config/fish/functions/xd.fish b/Config/fish/functions/xd.fish deleted file mode 100755 index 118df6a..0000000 --- a/Config/fish/functions/xd.fish +++ /dev/null @@ -1,4 +0,0 @@ -function xd --wraps='sudo pacman -Rns' --description 'alias xd=sudo pacman -Rns' - sudo pacman -Rns $argv - -end diff --git a/Config/fish/functions/xs.fish b/Config/fish/functions/xs.fish deleted file mode 100755 index b7721fe..0000000 --- a/Config/fish/functions/xs.fish +++ /dev/null @@ -1,4 +0,0 @@ -function xs --wraps='sudo pacman -S' --description 'alias xs=sudo pacman -S' - sudo pacman -S $argv - -end diff --git a/Config/neofetch/arch-ascii b/Config/neofetch/arch-ascii deleted file mode 100755 index 78cd33e..0000000 --- a/Config/neofetch/arch-ascii +++ /dev/null @@ -1,9 +0,0 @@ -\E[38;5;147m - /\ - / \ - /\ \ - / \ - / ,, \ - / | | -\ -/_-'' ''-_\ -\33[0m diff --git a/Config/neofetch/config.conf b/Config/neofetch/config.conf deleted file mode 100755 index cdba4c6..0000000 --- a/Config/neofetch/config.conf +++ /dev/null @@ -1,864 +0,0 @@ -# See this wiki page for more info: -# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info -print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "Memory" memory - - # info "GPU Driver" gpu_driver # Linux/macOS only - # info "CPU Usage" cpu_usage - # info "Disk" disk - # info "Battery" battery - # info "Font" font - # info "Song" song - # [[ "$player" ]] && prin "Music Player" "$player" - # info "Local IP" local_ip - # info "Public IP" public_ip - # info "Users" users - # info "Locale" locale # This only works on glibc systems. - - info cols -} - -# Title - - -# Hide/Show Fully qualified domain name. -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --title_fqdn -title_fqdn="off" - - -# Kernel - - -# Shorten the output of the kernel function. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --kernel_shorthand -# Supports: Everything except *BSDs (except PacBSD and PC-BSD) -# -# Example: -# on: '4.8.9-1-ARCH' -# off: 'Linux 4.8.9-1-ARCH' -kernel_shorthand="on" - - -# Distro - - -# Shorten the output of the distro function -# -# Default: 'off' -# Values: 'on', 'tiny', 'off' -# Flag: --distro_shorthand -# Supports: Everything except Windows and Haiku -distro_shorthand="off" - -# Show/Hide OS Architecture. -# Show 'x86_64', 'x86' and etc in 'Distro:' output. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --os_arch -# -# Example: -# on: 'Arch Linux x86_64' -# off: 'Arch Linux' -os_arch="on" - - -# Uptime - - -# Shorten the output of the uptime function -# -# Default: 'on' -# Values: 'on', 'tiny', 'off' -# Flag: --uptime_shorthand -# -# Example: -# on: '2 days, 10 hours, 3 mins' -# tiny: '2d 10h 3m' -# off: '2 days, 10 hours, 3 minutes' -uptime_shorthand="on" - - -# Memory - - -# Show memory pecentage in output. -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --memory_percent -# -# Example: -# on: '1801MiB / 7881MiB (22%)' -# off: '1801MiB / 7881MiB' -memory_percent="off" - -# Change memory output unit. -# -# Default: 'mib' -# Values: 'kib', 'mib', 'gib' -# Flag: --memory_unit -# -# Example: -# kib '1020928KiB / 7117824KiB' -# mib '1042MiB / 6951MiB' -# gib: ' 0.98GiB / 6.79GiB' -memory_unit="mib" - - -# Packages - - -# Show/Hide Package Manager names. -# -# Default: 'tiny' -# Values: 'on', 'tiny' 'off' -# Flag: --package_managers -# -# Example: -# on: '998 (pacman), 8 (flatpak), 4 (snap)' -# tiny: '908 (pacman, flatpak, snap)' -# off: '908' -package_managers="on" - - -# Shell - - -# Show the path to $SHELL -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --shell_path -# -# Example: -# on: '/bin/bash' -# off: 'bash' -shell_path="off" - -# Show $SHELL version -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --shell_version -# -# Example: -# on: 'bash 4.4.5' -# off: 'bash' -shell_version="on" - - -# CPU - - -# CPU speed type -# -# Default: 'bios_limit' -# Values: 'scaling_cur_freq', 'scaling_min_freq', 'scaling_max_freq', 'bios_limit'. -# Flag: --speed_type -# Supports: Linux with 'cpufreq' -# NOTE: Any file in '/sys/devices/system/cpu/cpu0/cpufreq' can be used as a value. -speed_type="bios_limit" - -# CPU speed shorthand -# -# Default: 'off' -# Values: 'on', 'off'. -# Flag: --speed_shorthand -# NOTE: This flag is not supported in systems with CPU speed less than 1 GHz -# -# Example: -# on: 'i7-6500U (4) @ 3.1GHz' -# off: 'i7-6500U (4) @ 3.100GHz' -speed_shorthand="off" - -# Enable/Disable CPU brand in output. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --cpu_brand -# -# Example: -# on: 'Intel i7-6500U' -# off: 'i7-6500U (4)' -cpu_brand="on" - -# CPU Speed -# Hide/Show CPU speed. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --cpu_speed -# -# Example: -# on: 'Intel i7-6500U (4) @ 3.1GHz' -# off: 'Intel i7-6500U (4)' -cpu_speed="on" - -# CPU Cores -# Display CPU cores in output -# -# Default: 'logical' -# Values: 'logical', 'physical', 'off' -# Flag: --cpu_cores -# Support: 'physical' doesn't work on BSD. -# -# Example: -# logical: 'Intel i7-6500U (4) @ 3.1GHz' (All virtual cores) -# physical: 'Intel i7-6500U (2) @ 3.1GHz' (All physical cores) -# off: 'Intel i7-6500U @ 3.1GHz' -cpu_cores="logical" - -# CPU Temperature -# Hide/Show CPU temperature. -# Note the temperature is added to the regular CPU function. -# -# Default: 'off' -# Values: 'C', 'F', 'off' -# Flag: --cpu_temp -# Supports: Linux, BSD -# NOTE: For FreeBSD and NetBSD-based systems, you'll need to enable -# coretemp kernel module. This only supports newer Intel processors. -# -# Example: -# C: 'Intel i7-6500U (4) @ 3.1GHz [27.2°C]' -# F: 'Intel i7-6500U (4) @ 3.1GHz [82.0°F]' -# off: 'Intel i7-6500U (4) @ 3.1GHz' -cpu_temp="off" - - -# GPU - - -# Enable/Disable GPU Brand -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gpu_brand -# -# Example: -# on: 'AMD HD 7950' -# off: 'HD 7950' -gpu_brand="on" - -# Which GPU to display -# -# Default: 'all' -# Values: 'all', 'dedicated', 'integrated' -# Flag: --gpu_type -# Supports: Linux -# -# Example: -# all: -# GPU1: AMD HD 7950 -# GPU2: Intel Integrated Graphics -# -# dedicated: -# GPU1: AMD HD 7950 -# -# integrated: -# GPU1: Intel Integrated Graphics -gpu_type="all" - - -# Resolution - - -# Display refresh rate next to each monitor -# Default: 'off' -# Values: 'on', 'off' -# Flag: --refresh_rate -# Supports: Doesn't work on Windows. -# -# Example: -# on: '1920x1080 @ 60Hz' -# off: '1920x1080' -refresh_rate="off" - - -# Gtk Theme / Icons / Font - - -# Shorten output of GTK Theme / Icons / Font -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --gtk_shorthand -# -# Example: -# on: 'Numix, Adwaita' -# off: 'Numix [GTK2], Adwaita [GTK3]' -gtk_shorthand="off" - - -# Enable/Disable gtk2 Theme / Icons / Font -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gtk2 -# -# Example: -# on: 'Numix [GTK2], Adwaita [GTK3]' -# off: 'Adwaita [GTK3]' -gtk2="on" - -# Enable/Disable gtk3 Theme / Icons / Font -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gtk3 -# -# Example: -# on: 'Numix [GTK2], Adwaita [GTK3]' -# off: 'Numix [GTK2]' -gtk3="on" - - -# IP Address - - -# Website to ping for the public IP -# -# Default: 'http://ident.me' -# Values: 'url' -# Flag: --ip_host -public_ip_host="http://ident.me" - -# Public IP timeout. -# -# Default: '2' -# Values: 'int' -# Flag: --ip_timeout -public_ip_timeout=2 - - -# Desktop Environment - - -# Show Desktop Environment version -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --de_version -de_version="on" - - -# Disk - - -# Which disks to display. -# The values can be any /dev/sdXX, mount point or directory. -# NOTE: By default we only show the disk info for '/'. -# -# Default: '/' -# Values: '/', '/dev/sdXX', '/path/to/drive'. -# Flag: --disk_show -# -# Example: -# disk_show=('/' '/dev/sdb1'): -# 'Disk (/): 74G / 118G (66%)' -# 'Disk (/mnt/Videos): 823G / 893G (93%)' -# -# disk_show=('/'): -# 'Disk (/): 74G / 118G (66%)' -# -disk_show=('/') - -# Disk subtitle. -# What to append to the Disk subtitle. -# -# Default: 'mount' -# Values: 'mount', 'name', 'dir', 'none' -# Flag: --disk_subtitle -# -# Example: -# name: 'Disk (/dev/sda1): 74G / 118G (66%)' -# 'Disk (/dev/sdb2): 74G / 118G (66%)' -# -# mount: 'Disk (/): 74G / 118G (66%)' -# 'Disk (/mnt/Local Disk): 74G / 118G (66%)' -# 'Disk (/mnt/Videos): 74G / 118G (66%)' -# -# dir: 'Disk (/): 74G / 118G (66%)' -# 'Disk (Local Disk): 74G / 118G (66%)' -# 'Disk (Videos): 74G / 118G (66%)' -# -# none: 'Disk: 74G / 118G (66%)' -# 'Disk: 74G / 118G (66%)' -# 'Disk: 74G / 118G (66%)' -disk_subtitle="mount" - -# Disk percent. -# Show/Hide disk percent. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --disk_percent -# -# Example: -# on: 'Disk (/): 74G / 118G (66%)' -# off: 'Disk (/): 74G / 118G' -disk_percent="on" - - -# Song - - -# Manually specify a music player. -# -# Default: 'auto' -# Values: 'auto', 'player-name' -# Flag: --music_player -# -# Available values for 'player-name': -# -# amarok -# audacious -# banshee -# bluemindo -# clementine -# cmus -# deadbeef -# deepin-music -# dragon -# elisa -# exaile -# gnome-music -# gmusicbrowser -# gogglesmm -# guayadeque -# io.elementary.music -# iTunes -# juk -# lollypop -# mocp -# mopidy -# mpd -# muine -# netease-cloud-music -# olivia -# playerctl -# pogo -# pragha -# qmmp -# quodlibet -# rhythmbox -# sayonara -# smplayer -# spotify -# strawberry -# tauonmb -# tomahawk -# vlc -# xmms2d -# xnoise -# yarock -music_player="auto" - -# Format to display song information. -# -# Default: '%artist% - %album% - %title%' -# Values: '%artist%', '%album%', '%title%' -# Flag: --song_format -# -# Example: -# default: 'Song: Jet - Get Born - Sgt Major' -song_format="%artist% - %album% - %title%" - -# Print the Artist, Album and Title on separate lines -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --song_shorthand -# -# Example: -# on: 'Artist: The Fratellis' -# 'Album: Costello Music' -# 'Song: Chelsea Dagger' -# -# off: 'Song: The Fratellis - Costello Music - Chelsea Dagger' -song_shorthand="off" - -# 'mpc' arguments (specify a host, password etc). -# -# Default: '' -# Example: mpc_args=(-h HOST -P PASSWORD) -mpc_args=() - - -# Text Colors - - -# Text Colors -# -# Default: 'distro' -# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' -# Flag: --colors -# -# Each number represents a different part of the text in -# this order: 'title', '@', 'underline', 'subtitle', 'colon', 'info' -# -# Example: -# colors=(distro) - Text is colored based on Distro colors. -# colors=(4 6 1 8 8 6) - Text is colored in the order above. -colors=(distro) - - -# Text Options - - -# Toggle bold text -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --bold -bold="on" - -# Enable/Disable Underline -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --underline -underline_enabled="on" - -# Underline character -# -# Default: '-' -# Values: 'string' -# Flag: --underline_char -underline_char="-" - - -# Info Separator -# Replace the default separator with the specified string. -# -# Default: ':' -# Flag: --separator -# -# Example: -# separator="->": 'Shell-> bash' -# separator=" =": 'WM = dwm' -separator=":" - - -# Color Blocks - - -# Color block range -# The range of colors to print. -# -# Default: '0', '15' -# Values: 'num' -# Flag: --block_range -# -# Example: -# -# Display colors 0-7 in the blocks. (8 colors) -# neofetch --block_range 0 7 -# -# Display colors 0-15 in the blocks. (16 colors) -# neofetch --block_range 0 15 -block_range=(0 15) - -# Toggle color blocks -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --color_blocks -color_blocks="on" - -# Color block width in spaces -# -# Default: '3' -# Values: 'num' -# Flag: --block_width -block_width=3 - -# Color block height in lines -# -# Default: '1' -# Values: 'num' -# Flag: --block_height -block_height=1 - -# Color Alignment -# -# Default: 'auto' -# Values: 'auto', 'num' -# Flag: --col_offset -# -# Number specifies how far from the left side of the terminal (in spaces) to -# begin printing the columns, in case you want to e.g. center them under your -# text. -# Example: -# col_offset="auto" - Default behavior of neofetch -# col_offset=7 - Leave 7 spaces then print the colors -col_offset="auto" - -# Progress Bars - - -# Bar characters -# -# Default: '-', '=' -# Values: 'string', 'string' -# Flag: --bar_char -# -# Example: -# neofetch --bar_char 'elapsed' 'total' -# neofetch --bar_char '-' '=' -bar_char_elapsed="-" -bar_char_total="=" - -# Toggle Bar border -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --bar_border -bar_border="on" - -# Progress bar length in spaces -# Number of chars long to make the progress bars. -# -# Default: '15' -# Values: 'num' -# Flag: --bar_length -bar_length=15 - -# Progress bar colors -# When set to distro, uses your distro's logo colors. -# -# Default: 'distro', 'distro' -# Values: 'distro', 'num' -# Flag: --bar_colors -# -# Example: -# neofetch --bar_colors 3 4 -# neofetch --bar_colors distro 5 -bar_color_elapsed="distro" -bar_color_total="distro" - - -# Info display -# Display a bar with the info. -# -# Default: 'off' -# Values: 'bar', 'infobar', 'barinfo', 'off' -# Flags: --cpu_display -# --memory_display -# --battery_display -# --disk_display -# -# Example: -# bar: '[---=======]' -# infobar: 'info [---=======]' -# barinfo: '[---=======] info' -# off: 'info' -cpu_display="off" -memory_display="off" -battery_display="off" -disk_display="off" - - -# Backend Settings - - -# Image backend. -# -# Default: 'ascii' -# Values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'off', -# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' -# Flag: --backend -image_backend="ascii" - -# Image Source -# -# Which image or ascii file to display. -# -# Default: 'auto' -# Values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' -# 'command output (neofetch --ascii "$(fortune | cowsay -W 30)")' -# Flag: --source -# -# NOTE: 'auto' will pick the best image source for whatever image backend is used. -# In ascii mode, distro ascii art will be used and in an image mode, your -# wallpaper will be used. -image_source="auto" - - -# Ascii Options - - -# Ascii distro -# Which distro's ascii art to display. -# -# Default: 'auto' -# Values: 'auto', 'distro_name' -# Flag: --ascii_distro -# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", -# "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, -# ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, -# Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, -# BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, -# Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, -# Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, -# DesaOS, Devuan, DracOS, DarkOs, DragonFly, Drauger, Elementary, -# EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, -# FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, -# gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, -# Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, -# Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, -# LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, -# Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, -# Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -# NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, -# OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, -# Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, -# popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, -# Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, -# Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, -# Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, -# SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, -# openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, -# Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, -# Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, -# and IRIX have ascii logos -# NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. -# Use '{distro name}_old' to use the old logos. -# NOTE: Ubuntu has flavor variants. -# Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, -# Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. -# NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, -# CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, -# Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, -# Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, -# Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, -# postmarketOS, and Void have a smaller logo variant. -# Use '{distro name}_small' to use the small variants. -ascii_distro="auto" - -# Ascii Colors -# -# Default: 'distro' -# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' -# Flag: --ascii_colors -# -# Example: -# ascii_colors=(distro) - Ascii is colored based on Distro colors. -# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors. -ascii_colors=(distro) - -# Bold ascii logo -# Whether or not to bold the ascii logo. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --ascii_bold -ascii_bold="on" - - -# Image Options - - -# Image loop -# Setting this to on will make neofetch redraw the image constantly until -# Ctrl+C is pressed. This fixes display issues in some terminal emulators. -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --loop -image_loop="off" - -# Thumbnail directory -# -# Default: '~/.cache/thumbnails/neofetch' -# Values: 'dir' -thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch" - -# Crop mode -# -# Default: 'normal' -# Values: 'normal', 'fit', 'fill' -# Flag: --crop_mode -# -# See this wiki page to learn about the fit and fill options. -# https://github.com/dylanaraps/neofetch/wiki/What-is-Waifu-Crop%3F -crop_mode="normal" - -# Crop offset -# Note: Only affects 'normal' crop mode. -# -# Default: 'center' -# Values: 'northwest', 'north', 'northeast', 'west', 'center' -# 'east', 'southwest', 'south', 'southeast' -# Flag: --crop_offset -crop_offset="center" - -# Image size -# The image is half the terminal width by default. -# -# Default: 'auto' -# Values: 'auto', '00px', '00%', 'none' -# Flags: --image_size -# --size -image_size="auto" - -# Gap between image and text -# -# Default: '3' -# Values: 'num', '-num' -# Flag: --gap -gap=3 - -# Image offsets -# Only works with the w3m backend. -# -# Default: '0' -# Values: 'px' -# Flags: --xoffset -# --yoffset -yoffset=0 -xoffset=0 - -# Image background color -# Only works with the w3m backend. -# -# Default: '' -# Values: 'color', 'blue' -# Flag: --bg_color -background_color= - - -# Misc Options - -# Stdout mode -# Turn off all colors and disables image backend (ASCII/Image). -# Useful for piping into another command. -# Default: 'off' -# Values: 'on', 'off' -stdout="off" diff --git a/Config/neofetch/small-ascii b/Config/neofetch/small-ascii deleted file mode 100755 index bd3cc8f..0000000 --- a/Config/neofetch/small-ascii +++ /dev/null @@ -1,7 +0,0 @@ -\E[38;5;147m _______ - _ \\______ - -| \\ ___ \\ | -| | / \ | | -| | \___/ | | -| \\______ \\_| - -_______\\ diff --git a/Config/neofetch/void-ascii b/Config/neofetch/void-ascii deleted file mode 100755 index 6dc9ac5..0000000 --- a/Config/neofetch/void-ascii +++ /dev/null @@ -1,14 +0,0 @@ -\E[38;5;147m .:~7?JYYJ?7~:. - .?PGBBBBBBBBBBGPJ~. - .7PPY?7!!7?YPGBBBP7. - ^Y!. .. .^?GBGBP^ - ^GBBP^ .::. :YBGBG^ - .5BGB5. ~YPGGPY~ YBGB5. - ^GGGG~ !BBGGGGBB! ~GGGG^ - ^GGGG~ !BBGGGGBB! ~GGGG^ - .5BGBY ~YPGGPY~ .5BGB5. - ^GBGBY: .::. ^PBBG^ - ^PBGBG?^. .. .!Y^ - .7PBBBGPY?7!!7?YPP7. - .~JPGBBBBBBBBBBGP?. - .:~7?JYYJ?7~:. diff --git a/Config/cava/config b/Configs/cava/config old mode 100644 new mode 100755 similarity index 100% rename from Config/cava/config rename to Configs/cava/config diff --git a/Configs/cmus/autosave b/Configs/cmus/autosave new file mode 100644 index 0000000..162deec --- /dev/null +++ b/Configs/cmus/autosave @@ -0,0 +1,215 @@ +set aaa_mode=all +set altformat_current= %F +set altformat_playlist= %F +set altformat_title= %F +set altformat_trackwin= %f%= %d +set auto_expand_albums_follow=true +set auto_expand_albums_search=true +set auto_expand_albums_selcur=true +set auto_reshuffle=true +set buffer_seconds=10 +set color_cmdline_attr=default +set color_cmdline_bg=default +set color_cmdline_fg=254 +set color_cur_sel_attr=default +set color_error=211 +set color_info=223 +set color_separator=117 +set color_statusline_attr=default +set color_statusline_bg=default +set color_statusline_fg=254 +set color_titleline_attr=default +set color_titleline_bg=151 +set color_titleline_fg=16 +set color_trackwin_album_attr=bold +set color_trackwin_album_bg=default +set color_trackwin_album_fg=default +set color_win_attr=default +set color_win_bg=default +set color_win_cur=117 +set color_win_cur_attr=default +set color_win_cur_sel_attr=default +set color_win_cur_sel_bg=151 +set color_win_cur_sel_fg=16 +set color_win_dir=254 +set color_win_fg=254 +set color_win_inactive_cur_sel_attr=default +set color_win_inactive_cur_sel_bg=181 +set color_win_inactive_cur_sel_fg=235 +set color_win_inactive_sel_attr=default +set color_win_inactive_sel_bg=152 +set color_win_inactive_sel_fg=235 +set color_win_sel_attr=default +set color_win_sel_bg=117 +set color_win_sel_fg=235 +set color_win_title_attr=default +set color_win_title_bg=default +set color_win_title_fg=117 +set confirm_run=true +set continue=true +set continue_album=true +set device=/dev/cdrom +set display_artist_sort_name=false +set dsp.alsa.device=default +set dsp.jack.resampling_quality=2 +set dsp.jack.server_name= +set dsp.oss.device= +set follow=false +set format_clipped_text=… +set format_current= %F +set format_playlist= %F +set format_playlist_va= %F +set format_statusline= %{status} %{?show_playback_position?%{position} %{?duration?/ %{duration} }?%{?duration?%{duration} }}- %{total} %{?bpm>0?at %{bpm} BPM }%{?volume>=0?vol: %{?lvolume!=rvolume?%{lvolume},%{rvolume} ?%{volume} }}%{?stream?buf: %{buffer} }%{?show_current_bitrate & bitrate>=0? %{bitrate} kbps }%=%{?repeat_current?repeat current?%{?play_library?%{playlist_mode} from %{?play_sorted?sorted }library?playlist}} | %1{continue}%1{follow}%1{repeat}%1{shuffle} +set format_title=%a - %l - %t (%y) +set format_trackwin=%3n. %t%= %y %d +set format_trackwin_album= %l %= %{albumduration} +set format_trackwin_va=%3n. %t (%a)%= %y %d +set format_treewin= %l +set format_treewin_artist=%a +set icecast_default_charset=ISO-8859-1 +set id3_default_charset=ISO-8859-1 +set input.cdio.priority=50 +set input.cue.priority=50 +set input.ffmpeg.priority=30 +set input.flac.priority=50 +set input.modplug.priority=50 +set input.vorbis.priority=50 +set input.wav.priority=50 +set lib_add_filter= +set lib_sort=albumartist date album discnumber tracknumber title filename play_count +set mixer.alsa.channel=PCM +set mixer.alsa.device=default +set mixer.oss.channel=PCM +set mixer.oss.device= +set mixer.pulse.restore_volume=0 +set mouse=true +set mpris=false +set output_plugin=pulse +set passwd= +set pause_on_output_change=false +set pl_sort= +set play_library=false +set play_sorted=false +set repeat=true +set repeat_current=false +set replaygain=disabled +set replaygain_limit=true +set replaygain_preamp=0.000000 +set resume=false +set rewind_offset=5 +set scroll_offset=2 +set set_term_title=true +set show_all_tracks=true +set show_current_bitrate=false +set show_hidden=false +set show_playback_position=true +set show_remaining_time=false +set shuffle=off +set skip_track_info=false +set smart_artist_sort=true +set softvol=false +set softvol_state=0 0 +set start_view=playlist +set status_display_program= +set stop_after_queue=false +set time_show_leading_zero=true +set tree_width_max=0 +set tree_width_percent=33 +set wrap_search=true +bind browser backspace browser-up +bind browser i toggle show_hidden +bind browser space win-activate +bind browser u win-update +bind common ! push shell +bind common + vol +10% +bind common , seek -1m +bind common - vol -10% +bind common . seek +1m +bind common / search-start +bind common 1 view tree +bind common 2 view sorted +bind common 3 view playlist +bind common 4 view queue +bind common 5 view browser +bind common 6 view filters +bind common 7 view settings +bind common = vol +10% +bind common ? search-b-start +bind common B player-next-album +bind common C toggle continue +bind common D win-remove +bind common E win-add-Q +bind common F push filter +bind common G win-bottom +bind common I echo {} +bind common L push live-filter +bind common M toggle play_library +bind common N search-prev +bind common P win-mv-before +bind common U win-update-cache +bind common Z player-prev-album +bind common [ vol +1% +0 +bind common ] vol +0 +1% +bind common ^B win-page-up +bind common ^C echo Type :quit to exit cmus. +bind common ^D win-half-page-down +bind common ^E win-scroll-down +bind common ^F win-page-down +bind common ^L refresh +bind common ^R toggle repeat_current +bind common ^U win-half-page-up +bind common ^Y win-scroll-up +bind common a win-add-l +bind common b player-next +bind common c player-pause +bind common delete win-remove +bind common down win-down +bind common e win-add-q +bind common end win-bottom +bind common enter win-activate +bind common f toggle follow +bind common g win-top +bind common h seek -5 +bind common home win-top +bind common i win-sel-cur +bind common j win-down +bind common k win-up +bind common l seek +5 +bind common left seek -5 +bind common m toggle aaa_mode +bind common mlb_click_bar player-pause +bind common mlb_click_selected win-activate +bind common mouse_scroll_down win-down +bind common mouse_scroll_down_bar seek -5 +bind common mouse_scroll_down_title right-view +bind common mouse_scroll_up win-up +bind common mouse_scroll_up_bar seek +5 +bind common mouse_scroll_up_title left-view +bind common n search-next +bind common o toggle play_sorted +bind common p win-mv-after +bind common page_down win-page-down +bind common page_up win-page-up +bind common q quit -i +bind common r toggle repeat +bind common right seek +5 +bind common s toggle shuffle +bind common space win-toggle +bind common t toggle show_remaining_time +bind common tab win-next +bind common u update-cache +bind common up win-up +bind common v player-stop +bind common x player-play +bind common y win-add-p +bind common z player-prev +bind common { vol -1% -0 +bind common } vol -0 -1% +fset 90s=date>=1990&date<2000 +fset classical=genre="Classical" +fset missing-tag=!stream&(artist=""|album=""|title=""|tracknumber=-1|date=-1) +fset mp3=filename="*.mp3" +fset ogg=filename="*.ogg" +fset ogg-or-mp3=ogg|mp3 +fset unheard=play_count=0 +factivate diff --git a/Configs/cmus/catppuccin.theme b/Configs/cmus/catppuccin.theme new file mode 100644 index 0000000..a05ac3b --- /dev/null +++ b/Configs/cmus/catppuccin.theme @@ -0,0 +1,50 @@ +### 'Catppuccin' theme for CMus (for 255 color terms) +set color_cmdline_bg=default +# Text Color White +set color_cmdline_fg=254 +# Error Color Red +set color_error=211 +# Info Color Yellow +set color_info=223 +# Separator Color Blue +set color_separator=117 + +# Statusline background Black +set color_statusline_bg=default +#Statusline foreground #White +set color_statusline_fg=254 + +# Titleline background Green +set color_titleline_bg=151 +# Titleline foreground Black +set color_titleline_fg=16 + +# Terminal default as background +set color_win_bg=default + +# Currently Playing song Blue +set color_win_cur=117 +# Indicator over currently playing song Green +set color_win_cur_sel_bg=151 +set color_win_cur_sel_fg=16 + +# Browser Directory Colors White +set color_win_dir=254 + +# Playlist browser general text color White +set color_win_fg=254 +# Selected inactive Directory of currently playing Album/Song Maroon bg Black fg +set color_win_inactive_cur_sel_bg=181 +set color_win_inactive_cur_sel_fg=235 + +# Selected inactive Directory Teal bg Black fg +set color_win_inactive_sel_bg=152 +set color_win_inactive_sel_fg=235 + +# Indicator color Blue +set color_win_sel_bg=117 +set color_win_sel_fg=235 + +# Artist/Album / Track Headings No background Blue text +set color_win_title_bg=default +set color_win_title_fg=117 diff --git a/Config/fish/config.fish b/Configs/fish/config.fish similarity index 100% rename from Config/fish/config.fish rename to Configs/fish/config.fish diff --git a/Configs/fish/functions/bt.fish b/Configs/fish/functions/bt.fish new file mode 100644 index 0000000..862333c --- /dev/null +++ b/Configs/fish/functions/bt.fish @@ -0,0 +1,4 @@ +function bt --wraps=bluetoothctl --description 'alias bt=bluetoothctl' + bluetoothctl $argv + +end diff --git a/Configs/fish/functions/btb.fish b/Configs/fish/functions/btb.fish new file mode 100644 index 0000000..316448d --- /dev/null +++ b/Configs/fish/functions/btb.fish @@ -0,0 +1,4 @@ +function btb --wraps='bluetoothctl info 0C:AE:BD:DB:52:3A | grep Percentage' --description 'alias btb=bluetoothctl info 0C:AE:BD:DB:52:3A | grep Percentage' + bluetoothctl info 0C:AE:BD:DB:52:3A | grep Percentage $argv + +end diff --git a/Config/fish/functions/e.fish b/Configs/fish/functions/e.fish similarity index 100% rename from Config/fish/functions/e.fish rename to Configs/fish/functions/e.fish diff --git a/Config/fish/functions/ea.fish b/Configs/fish/functions/ea.fish similarity index 100% rename from Config/fish/functions/ea.fish rename to Configs/fish/functions/ea.fish diff --git a/Config/fish/functions/ed.fish b/Configs/fish/functions/ed.fish similarity index 100% rename from Config/fish/functions/ed.fish rename to Configs/fish/functions/ed.fish diff --git a/Config/fish/functions/ef.fish b/Configs/fish/functions/ef.fish similarity index 100% rename from Config/fish/functions/ef.fish rename to Configs/fish/functions/ef.fish diff --git a/Configs/fish/functions/f.fish b/Configs/fish/functions/f.fish new file mode 100755 index 0000000..9eb07a9 --- /dev/null +++ b/Configs/fish/functions/f.fish @@ -0,0 +1,4 @@ +function f --wraps='neofetch --config /home/lilac/.config/neofetch/f.conf' --description 'alias f=neofetch --config /home/lilac/.config/neofetch/f.conf' + neofetch --config /home/lilac/.config/neofetch/f.conf $argv + +end diff --git a/Configs/fish/functions/fb.fish b/Configs/fish/functions/fb.fish new file mode 100644 index 0000000..e80c153 --- /dev/null +++ b/Configs/fish/functions/fb.fish @@ -0,0 +1,4 @@ +function fb --wraps='neofetch --config /home/lilac/.config/neofetch/ff.conf --ascii /home/lilac/.config/artix-big' --wraps='neofetch --config /home/lilac/.config/neofetch/ff.conf --ascii /home/lilac/.config/neofetch/artix-big' --description 'alias fb=neofetch --config /home/lilac/.config/neofetch/ff.conf --ascii /home/lilac/.config/neofetch/artix-big' + neofetch --config /home/lilac/.config/neofetch/ff.conf --ascii /home/lilac/.config/neofetch/artix-big $argv + +end diff --git a/Configs/fish/functions/ff.fish b/Configs/fish/functions/ff.fish new file mode 100755 index 0000000..fa77114 --- /dev/null +++ b/Configs/fish/functions/ff.fish @@ -0,0 +1,4 @@ +function ff --wraps='neofetch --config /home/lilac/.config/neofetch/ff.conf --off' --description 'alias ff=neofetch --config /home/lilac/.config/neofetch/ff.conf --off' + neofetch --config /home/lilac/.config/neofetch/ff.conf --off $argv + +end diff --git a/Config/fish/functions/h.fish b/Configs/fish/functions/h.fish similarity index 100% rename from Config/fish/functions/h.fish rename to Configs/fish/functions/h.fish diff --git a/Configs/fish/functions/r.fish b/Configs/fish/functions/r.fish new file mode 100644 index 0000000..46724ee --- /dev/null +++ b/Configs/fish/functions/r.fish @@ -0,0 +1,4 @@ +function r --wraps='sudo -E lf -config /home/lilac/.config/lf/lfrc' --description 'alias r=sudo -E lf -config /home/lilac/.config/lf/lfrc' + sudo -E lf -config /home/lilac/.config/lf/lfrc $argv + +end diff --git a/Configs/fish/functions/rr.fish b/Configs/fish/functions/rr.fish new file mode 100644 index 0000000..73b7f07 --- /dev/null +++ b/Configs/fish/functions/rr.fish @@ -0,0 +1,4 @@ +function rr --wraps='lf -config /home/lilac/.config/lf/lfrc' --description 'alias rr=lf -config /home/lilac/.config/lf/lfrc' + lf -config /home/lilac/.config/lf/lfrc $argv + +end diff --git a/Config/fish/functions/s.fish b/Configs/fish/functions/s.fish similarity index 100% rename from Config/fish/functions/s.fish rename to Configs/fish/functions/s.fish diff --git a/Config/fish/functions/sb.fish b/Configs/fish/functions/sb.fish old mode 100755 new mode 100644 similarity index 100% rename from Config/fish/functions/sb.fish rename to Configs/fish/functions/sb.fish diff --git a/Config/fish/functions/sw.fish b/Configs/fish/functions/sw.fish old mode 100755 new mode 100644 similarity index 100% rename from Config/fish/functions/sw.fish rename to Configs/fish/functions/sw.fish diff --git a/Config/fish/functions/v.fish b/Configs/fish/functions/v.fish old mode 100755 new mode 100644 similarity index 100% rename from Config/fish/functions/v.fish rename to Configs/fish/functions/v.fish diff --git a/Config/fish/functions/vv.fish b/Configs/fish/functions/vv.fish old mode 100755 new mode 100644 similarity index 100% rename from Config/fish/functions/vv.fish rename to Configs/fish/functions/vv.fish diff --git a/Configs/fish/functions/xd.fish b/Configs/fish/functions/xd.fish new file mode 100755 index 0000000..b7c435a --- /dev/null +++ b/Configs/fish/functions/xd.fish @@ -0,0 +1,4 @@ +function xd --wraps='sudo pacman -Rns' --wraps='sudo paru -Rns' --description 'alias xd=sudo paru -Rns' + sudo paru -Rns $argv + +end diff --git a/Configs/fish/functions/xdc.fish b/Configs/fish/functions/xdc.fish new file mode 100644 index 0000000..4d223a7 --- /dev/null +++ b/Configs/fish/functions/xdc.fish @@ -0,0 +1,4 @@ +function xdc --wraps='sudo paru -Scd && sudo paru -Sccd' --description 'alias xdc=sudo paru -Scd && sudo paru -Sccd' + sudo paru -Scd && sudo paru -Sccd $argv + +end diff --git a/Configs/fish/functions/xs.fish b/Configs/fish/functions/xs.fish new file mode 100644 index 0000000..a69898e --- /dev/null +++ b/Configs/fish/functions/xs.fish @@ -0,0 +1,4 @@ +function xs --wraps='paru -S' --description 'alias xs=paru -S' + paru -S $argv + +end diff --git a/Config/fish/themes/Catppuccin Mocha.theme b/Configs/fish/themes/Catppuccin Mocha.theme similarity index 100% rename from Config/fish/themes/Catppuccin Mocha.theme rename to Configs/fish/themes/Catppuccin Mocha.theme diff --git a/Config/foot/foot.ini b/Configs/foot/foot.ini similarity index 94% rename from Config/foot/foot.ini rename to Configs/foot/foot.ini index c4fb186..dfc6377 100755 --- a/Config/foot/foot.ini +++ b/Configs/foot/foot.ini @@ -10,7 +10,7 @@ # Font. [main] -font=RobotoMonoNerdFontMono:size=16:weight=SemiBold +font=RobotoMonoNerdFontMono:size=14:weight=SemiBold pad=25x25 # Scrollbar. @@ -42,4 +42,4 @@ bright6=94e2d5 # teal bright7=a6adc8 # Subtext 0 #alpha=1.0 -alpha=0.9 +alpha=0.8 diff --git a/Config/gtklock/style.css b/Configs/gtklock/style.css similarity index 92% rename from Config/gtklock/style.css rename to Configs/gtklock/style.css index 93694ba..b04a0cb 100755 --- a/Config/gtklock/style.css +++ b/Configs/gtklock/style.css @@ -6,7 +6,7 @@ window { } #window-box { - padding: 60px; + padding: 40px; border-radius: 12px; box-shadow: rgba(0, 0, 0, 0.56) 4 4 5 2px; /*box-shadow: 1 1 3 1px #101010;*/ @@ -16,5 +16,5 @@ window { #clock-label { font-family: RobotoMonoNerdFontMono; - font-size: 58px; + font-size: 54px; } diff --git a/Config/htop/htoprc b/Configs/htop/htoprc old mode 100755 new mode 100644 similarity index 95% rename from Config/htop/htoprc rename to Configs/htop/htoprc index b77d780..95acee5 --- a/Config/htop/htoprc +++ b/Configs/htop/htoprc @@ -5,7 +5,7 @@ config_reader_min_version=3 fields=0 48 17 46 47 49 1 hide_kernel_threads=1 hide_userland_threads=0 -hide_running_in_container=0 +hide_running_in_container=1 shadow_other_users=0 show_thread_names=0 show_program_path=1 @@ -41,7 +41,7 @@ column_meter_modes_1=1 1 tree_view=0 sort_key=47 tree_sort_key=0 -sort_direction=-1 +sort_direction=1 tree_sort_direction=1 tree_view_always_by_pid=0 all_branches_collapsed=0 @@ -50,7 +50,7 @@ screen:Main=PID USER PRIORITY PERCENT_CPU PERCENT_MEM TIME Command .tree_sort_key=PID .tree_view_always_by_pid=0 .tree_view=0 -.sort_direction=-1 +.sort_direction=1 .tree_sort_direction=1 .all_branches_collapsed=0 screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE Command diff --git a/Config/hypr/hyprland.conf b/Configs/hypr/cat-mocha.conf old mode 100755 new mode 100644 similarity index 57% rename from Config/hypr/hyprland.conf rename to Configs/hypr/cat-mocha.conf index 1465bf1..110a79c --- a/Config/hypr/hyprland.conf +++ b/Configs/hypr/cat-mocha.conf @@ -1,27 +1,37 @@ +##################################################################### # __ __ __ __ ____ # # / // /_ _____ ____/ /__ ____ ___/ / _______ ___ / _(_)__ _ # # / _ / // / _ \/ __/ / _ `/ _ \/ _ / / __/ _ \/ _ \/ _/ / _ `/ # # /_//_/\_, / .__/_/ /_/\_,_/_//_/\_,_/ \__/\___/_//_/_//_/\_, / # # /___/_/ /___/ # +##################################################################### + #DEFAULT THINGS. # Mod key. $mainMod = SUPER -# Default programs. -$wlp = swaybg -i /home/lilac/Media/Pics/Walls/Cat/Min/min-4.png -$btmbar = waybar -c /home/lilac/.config/waybar/hz/config.jsonc -s /home/lilac/.config/waybar/hz/style.css -$lftbar = waybar -c /home/lilac/.config/waybar/vt/config.jsonc -s /home/lilac/.config/waybar/vt/style.css -$term = foot #Terminal emulator. -$fmt = foot -e lf #File manager. -$fmg = nemo #File manager. -$mpt = foot --title=cmus -e cmus #Music player. -$vc = foot --title=vc -e pulsemixer +# Default dirs. +$cfg = /home/lilac/.config +$md = /home/lilac/Media +$wls = /home/lilac/Media/Pics/Walls +$scr = /home/lilac/Media/Pics/Scr +$hm = /home/lilac + +# Default term & utilities. +$term = foot --title=term +$fmt = foot --title=fmt -e lf +$mpt = foot --title=cmus -e cmus +$vc = foot --title=pm -e pulsemixer $sm = foot --title=smtr -e htop +$nm = foot --title=nm -e nmtui # Some default env vars. +env = XCURSOR_THEME,GoogleDot-White env = XCURSOR_SIZE,28 +#env = XCURSOR_SIZE,28 +env = EDITOR, vim # Display configuration. monitor=eDP-1,1920x1080@60,0x0,1 @@ -29,9 +39,8 @@ monitor=eDP-1,1920x1080@60,0x0,1 #AUTOSTART. # Autostart for Hyprland's FULL RESTART. -exec-once = $btmbar -#exec = $wlp -exec-once = $wlp +exec-once = waybar -c $cfg/waybar/lft/config.jsonc -s $cfg/waybar/lft/style.css +exec-once = swaybg -i $wls/Cat/Lsc/cat-lsc-11.png # Autostart for Hyprland's CONFIG RELOAD. exec = hyprctl setcursor GoogleDot-White 28 @@ -42,46 +51,42 @@ exec = export QT_DISABLE_WINDOWDECORATION=1 # Apllications (windows) rules. windowrule = workspace 1, waterfox -windowrule = noborder, waterfox +#windowrule = noborder, waterfox windowrule = workspace 3, 64gram-desktop windowrule = xray 1, io.github.tdesktop_x64.TDesktop -windowrule = noborder, io.github.tdesktop_x64.TDesktop +#windowrule = noborder, io.github.tdesktop_x64.TDesktop -windowrule = workspace 5, krita +windowrule = workspace 4, krita windowrule = noborder, krita windowrule = workspace 6, prismlauncher -windowrule = workspace 4, mpv +windowrule = workspace 5, mpv + windowrule = workspace 2, foot -windowrule = xray 1, foot -windowrule = workspace 3, signal-desktop windowrule = float, swayimg -windowrule = center, swayimg +windowrule = noborder, swayimg windowrule = workspace 4, swayimg windowrule = size 1250 700, swayimg windowrule = move 330 15%, swayimg windowrulev2 = float,^(foot)$,title:^(cmus)$ -windowrulev2 = center,^(foot)$,title:^(cmus)$ windowrulev2 = size 1250 700,^(foot)$,title:^(cmus) -windowrulev2 = move 330 15%,^(foot)$,title:^(cmus) -windowrulev2 = workspace 4,^(foot)$,title:^(cmus)$ +windowrulev2 = move 345 17%,^(foot)$,title:^(cmus) +windowrulev2 = workspace 5,^(foot)$,title:^(cmus)$ windowrulev2 = float,^(foot)$,title:^(smtr)$ windowrulev2 = pin,^(foot)$,title:^(smtr)$ -windowrulev2 = center,^(foot)$,title:^(smtr)$ -windowrulev2 = size 800 550,^(foot)$,title:^(smtr) -windowrulev2 = move 29% 42.4%,^(foot)$,title:^(smtr) +windowrulev2 = size 700 500,^(foot)$,title:^(smtr) +windowrulev2 = move 4.1% 11%,^(foot)$,title:^(smtr) windowrulev2 = workspace unset,^(foot)$,title:^(smtr)$ -windowrulev2 = float,^(foot)$,title:^(vc)$ -windowrulev2 = pin,^(foot)$,title:^(vc)$ -windowrulev2 = center,^(foot)$,title:^(vc)$ -windowrulev2 = size 800 550,^(foot)$,title:^(vc) -windowrulev2 = move 29% 42.4%,^(foot)$,title:^(vc) -windowrulev2 = workspace unset,^(foot)$,title:^(vc)$ +windowrulev2 = float,^(foot)$,title:^(pm)$ +windowrulev2 = pin,^(foot)$,title:^(pm)$ +windowrulev2 = size 700 350,^(foot)$,title:^(pm) +windowrulev2 = move 4.1% 55.8%,^(foot)$,title:^(pm) +windowrulev2 = workspace unset,^(foot)$,title:^(pm)$ # Layer rules. @@ -93,71 +98,87 @@ bind = $mainMod SHIFT, C, exec, bluetoothctl connect 0C:AE:BD:DB:52:3A bind = $mainMod SHIFT, D, exec, bluetoothctl disconnect 0C:AE:BD:DB:52:3A # Brightness 5% step contol shortcuts. -bind= $mainMod, F5, exec, brightnessctl set 5%- -bind= $mainMod, F6, exec, brightnessctl set +5% +binde= $mainMod ALT, F5, exec, brightnessctl set 5%- +binde= $mainMod ALT, F6, exec, brightnessctl set +5% # Brightness 1% step contol shortcuts. -bind= $mainMod ALT, F5, exec, brightnessctl set 1%- -bind= $mainMod ALT, F6, exec, brightnessctl set +1% +binde= $mainMod, F5, exec, brightnessctl set 1%- +binde= $mainMod, F6, exec, brightnessctl set +1% # Toggle Waybar. bindr=$mainMod, D, exec, pkill -SIGUSR1 waybar -bindr=$mainMod ALT, D, exec, pkill -SIGUSR2 waybar -bindr=$mainMod CTRL, D, exec, pkill waybar || waybar -c .config/waybar/hz/config.jsonc -s .config/waybar/hz/style.css +#bindr=$mainMod ALT, D, exec, pkill -SIGUSR2 waybar +bindr=$mainMod ALT, D, exec, pkill waybar || waybar -c $cfg/waybar/lft/config.jsonc -s $cfg/waybar/lft/style.css # Audio volume control shortcuts. #bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% -bind = $mainMod, F3, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% +bindel = $mainMod, F3, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% #bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% -bind = $mainMod, F2, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% +bindel = $mainMod, F2, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% -#bind = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle -bind = $mainMod, F1, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle + +bind = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle +#bindl = $mainMod, F1, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle # Audio play/pause control shortcut. -bindl=, XF86AudioPlay, exec, cmus-remote --pause -bindl=, XF86AudioPlay, exec, playerctl play-pause +#bind = $mainMod ALT, F1, exec, playerctl play-pause +bind =, XF86AudioPlay, exec, playerctl play +bind =, XF86AudioPause, exec, playerctl pause +#bind = $mainMod ALT, F1, exec, cmus-remote --pause +bind =, XF86AudioPlay, exec, cmus-remote --play +bind =, XF86AudioPause, exec, cmus-remote --pause # Audio next song control shortcut. -bindl=, XF86AudioNext, exec, cmus-remote --next -bindl=, XF86AudioNext, exec, playerctl next +#bind = $mainMod ALT, F3, exec, playerctl next +bind =, XF86AudioNext, exec, playerctl next +#bind = $mainMod ALT, F3, exec, cmus-remote --next +bind =, XF86AudioNext, exec, cmus-remote --next # Audio prev song control shortcut. -bindl=, XF86AudioPrev, exec, cmus-remote --prev -bindl=, XF86AudioPrev, exec, playerctl prev +#bind = $mainMod ALT, F2, exec, playerctl previous +bind =, XF86AudioPrev, exec, playerctl previous +#bind = $mainMod ALT, F2, exec, cmus-remote --prev +bind =, XF86AudioPrev, exec, cmus-remote --prev # APPS SHORTCUTS. -# Applications shortcuts. +# Main apps shortcuts. bind = $mainMod, Q, exec, $term bind = $mainMod, E, exec, $fmt -bind = $mainMod ALT, T, exec, hyprctl dispatch exec [workspace 5] transmission-gtk bind = $mainMod, C, exec, $mpt -bind = $mainMod, G, exec, pkill pulsemixer || $vc -bind = $mainMod ALT, G, exec, pkill htop || $sm + +#Oth apps shortcuts. +bind = $mainMod, Y, exec, hyprctl dispatch exec [workspace 6] transmission-gtk bind = $mainMod, T, exec, hyprctl dispatch exec [workspace 3] 64gram-desktop bind = $mainMod, B, exec, hyprctl dispatch exec [workspace 1] waterfox bind = $mainMod, M, exec, hyprctl dispatch exec [workspace 6] prismlauncher -bind = $mainMod, K, exec, hyprctl dispatch exec [workspace 5] krita +bind = $mainMod, K, exec, hyprctl dispatch exec [workspace 4] krita + +#Menus. +bind = $mainMod, V, exec, pkill pulsemixer || $vc +bind = $mainMod, G, exec, pkill htop || $sm +#bind = $mainMod, N, exec, pkill nm || foot --title=nm -e nmtui # Lock screen shortcut. -bind=$mainMod ALT, Delete, exec, gtklock -i +bind=$mainMod SHIFT, Delete, exec, gtklock -i +#bind=$mainMod ALT, Delete, exec, loginctl suspend +#bind=$mainMod CTRL, Delete, exec, gtklock -i | loginctl suspend # Grim (screenshot tool) shortcut. -bind = , Print, exec, grim /home/lilac/Media/Pics/Scr/Screen-"$(date +%s)".png -bind = $mainMod, Print, exec, grim -g "$(slurp)" /home/lilac/Media/Pics/Scr/Screen-"$(date +%s)".png +bind = , Print, exec, grim $scr/Screen-"$(date +%s)".png +bind = $mainMod, Print, exec, grim -g "$(slurp)" $scr/Screen-"$(date +%s)".png # WINDOWS SHORTCUTS. # Windows shortcuts. -bind = $mainMod, F, fullscreen, bind = $mainMod, W, killactive, -bind = $mainMod SHIFT, M, exit, bind = $mainMod, S, togglefloating, -bind = $mainMod, V, centerwindow, # dwindle bind = $mainMod, R, fakefullscreen, +bind = $mainMod, F, fullscreen, +bind = $mainMod, X, centerwindow, +bind = $mainMod ALT SHIFT, M, exit, # Move focus shortcuts. bind = $mainMod, left, movefocus, l @@ -166,33 +187,33 @@ bind = $mainMod, up, movefocus, u bind = $mainMod, down, movefocus, d # Move floating windows. -bind = $mainMod SHIFT, right, moveactive, 30 0 -bind = $mainMod SHIFT, left, moveactive, -30 0 -bind = $mainMod SHIFT, up, moveactive, 0 -30 -bind = $mainMod SHIFT, down, moveactive, 0 30 +binde = $mainMod SHIFT, right, moveactive, 40 0 +binde = $mainMod SHIFT, left, moveactive, -40 0 +binde = $mainMod SHIFT, up, moveactive, 0 -40 +binde = $mainMod SHIFT, down, moveactive, 0 40 # Move floating windows with smaller steps. -bind = $mainMod SHIFT ALT, right, moveactive, 15 0 -bind = $mainMod SHIFT ALT, left, moveactive, -15 0 -bind = $mainMod SHIFT ALT, up, moveactive, 0 -15 -bind = $mainMod SHIFT ALT, down, moveactive, 0 15 +binde = $mainMod ALT SHIFT, right, moveactive, 10 0 +binde = $mainMod ALT SHIFT, left, moveactive, -10 0 +binde = $mainMod ALT SHIFT, up, moveactive, 0 -10 +binde = $mainMod ALT SHIFT, down, moveactive, 0 10 # Move floating windows to a screen edge. -bind = $mainMod ALT, Left, movewindow, l -bind = $mainMod ALT, Right, movewindow, r -bind = $mainMod ALT, Up, movewindow, u -bind = $mainMod ALT, Down, movewindow, d +binde = $mainMod ALT, Left, movewindow, l +binde = $mainMod ALT, Right, movewindow, r +binde = $mainMod ALT, Up, movewindow, u +binde = $mainMod ALT, Down, movewindow, d # Resize windows. -bind = $mainMod CTRL, left, resizeactive,-30 0 -bind = $mainMod CTRL, right, resizeactive,30 0 -bind = $mainMod CTRL, up, resizeactive,0 -30 -bind = $mainMod CTRL, down, resizeactive,0 30 +binde = $mainMod CTRL, left, resizeactive,-40 0 +binde = $mainMod CTRL, right, resizeactive,40 0 +binde = $mainMod CTRL, up, resizeactive,0 -40 +binde = $mainMod CTRL, down, resizeactive,0 40 -bind = $mainMod ALT CTRL, left, resizeactive,-15 0 -bind = $mainMod ALT CTRL, right, resizeactive,15 0 -bind = $mainMod ALT CTRL, up, resizeactive,0 -15 -bind = $mainMod ALT CTRL, down, resizeactive,0 15 +binde = $mainMod ALT CTRL, left, resizeactive,-10 0 +binde = $mainMod ALT CTRL, right, resizeactive,10 0 +binde = $mainMod ALT CTRL, up, resizeactive,0 -10 +binde = $mainMod ALT CTRL, down, resizeactive,0 10 # Move/resize windows with mouse/touchpad. bindm = $mainMod, mouse:272, movewindow @@ -261,22 +282,22 @@ gestures { # Basics. general { cursor_inactive_timeout = 10 - gaps_in = 7 - gaps_out = 14 + gaps_in = 8 + gaps_out = 16 border_size = 3 col.active_border = rgb(313244) #rgb(45475a) rgb(45475a) rgb(b4befe) 40deg - #col.active_border = rgb(181825) #rgb(b4befe) rgb(45475a) rgb(45475a) rgb(b4befe) 40deg - col.inactive_border = rgb(181825) - layout = master + col.inactive_border = rgb(1e1e2e) + layout = master allow_tearing = false } # Windows decorations. decoration { - rounding = 12 + rounding = 8 dim_inactive = true blur { enabled = true + #enabled = false size = 4 passes = 3 xray = true @@ -320,7 +341,7 @@ dwindle { master { new_is_master = false no_gaps_when_only = 1 - mfact = 0.62 + mfact = 0.67 } @@ -330,7 +351,3 @@ misc { force_default_wallpaper = 0 disable_hyprland_logo = true # Set to 0 to disable the anime mascot wallpapers } - -#device:epic-mouse-v1 { -# sensitivity = -0.5 -#} diff --git a/Configs/hypr/hyprland.conf b/Configs/hypr/hyprland.conf new file mode 100755 index 0000000..7ecb326 --- /dev/null +++ b/Configs/hypr/hyprland.conf @@ -0,0 +1 @@ +source = /home/lilac/.config/hypr/cat-mocha.conf diff --git a/Config/lf/icons b/Configs/lf/icons similarity index 100% rename from Config/lf/icons rename to Configs/lf/icons diff --git a/Config/lf/lfrc b/Configs/lf/lfrc similarity index 97% rename from Config/lf/lfrc rename to Configs/lf/lfrc index 1082bb2..be7de79 100755 --- a/Config/lf/lfrc +++ b/Configs/lf/lfrc @@ -27,6 +27,13 @@ set scrolloff 10 # Use the `dim` attribute instead of underline for the cursor in the preview pane set cursorpreviewfmt "\033[7;2m" + +set sixel true +set previewer ~/.config/lf/prw.sh +#set cleaner ~/.config/lf/clear_img.sh + + +#set sixel # use enter for shell commands map shell diff --git a/Configs/lf/prw.sh b/Configs/lf/prw.sh new file mode 100755 index 0000000..f3ae37c --- /dev/null +++ b/Configs/lf/prw.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +case "$(file -Lb --mime-type -- "$1")" in + image/*) + chafa -f sixel -s "$2x$3" --animate off --polite on "$1" + exit 1 + ;; + *) + cat "$1" + ;; +esac + diff --git a/Configs/neofetch/artix-big b/Configs/neofetch/artix-big new file mode 100755 index 0000000..03ec1d2 --- /dev/null +++ b/Configs/neofetch/artix-big @@ -0,0 +1,19 @@ +\E[38;5;147m 'o' + 'ooo' + 'ooxoo' + 'ooxxxoo' + 'oookkxxoo' + 'oiioxkkxxoo' + ':;:iiiioxxxoo' + `'.;::ioxxoo' + '-. `':;jiooo' + 'oooio-.. `'i:io' + 'ooooxxxxoio:,. `'-;' + 'ooooxxxxxkkxoooIi:-. `' + 'ooooxxxxxkkkkxoiiiiiji' + 'ooooxxxxxkxxoiiii:'` .i' + 'ooooxxxxxoi:::'` .;ioxo' + 'ooooxooi::'` .:iiixkxxo' + 'ooooi:'` `'';ioxxo' + 'i:'` '':io' +'` `'\33[0m diff --git a/Configs/neofetch/artix-sml b/Configs/neofetch/artix-sml new file mode 100755 index 0000000..a7f8ade --- /dev/null +++ b/Configs/neofetch/artix-sml @@ -0,0 +1,9 @@ +\E[38;5;147m + /\ + / \ + /`'.,\ + / ', + / ,`\ + / ,.'`. \ +/.,'` `'.\ +\33[0m diff --git a/Config/neofetch/cat-ascii b/Configs/neofetch/cat-ascii similarity index 100% rename from Config/neofetch/cat-ascii rename to Configs/neofetch/cat-ascii diff --git a/Config/neofetch/f.conf b/Configs/neofetch/f.conf similarity index 97% rename from Config/neofetch/f.conf rename to Configs/neofetch/f.conf index 33cb8c3..0a4fca5 100755 --- a/Config/neofetch/f.conf +++ b/Configs/neofetch/f.conf @@ -1,14 +1,16 @@ # See this wiki page for more info: print_info() { - prin - prin "\n" #prin "┌──────── Info ────────┐" - #prin "─ Info ───────────────" - info " \E[38;5;147mde\33[0m" de - info " \E[38;5;147mme\33[0m" memory - info " \E[38;5;147mhd\33[0m" disk - info " \E[38;5;147mup\33[0m" uptime - info " \E[38;5;147mpk\33[0m" packages +prin +prin +#prin "─ Info ───────────────" +# prin " \E[38;5;147mamella\33[0m@lilac" +# info underline + info " \E[38;5;147m\33[0m" de + info " \E[38;5;147m\33[0m" memory + info " \E[38;5;147m\33[0m" disk + info " \E[38;5;147m\33[0m" uptime + info " \E[38;5;147m\33[0m" packages #prin "└──────────────────────┘" # prin "└───────\n ${cl1} ${cl2} ${cl5} ${cl7}\n ───────┘" @@ -522,7 +524,7 @@ mpc_args=() # Example: # colors=(distro) - Text is colored based on Distro colors. # colors=(4 6 1 8 8 6) - Text is colored in the order above. -colors=(7 7 8 5 8 7) +colors=(7 5 8 5 8 7) # Text Options @@ -704,7 +706,7 @@ image_backend="ascii" # NOTE: 'auto' will pick the best image source for whatever image backend is used. # In ascii mode, distro ascii art will be used and in an image mode, your # wallpaper will be used. -#image_source="/home/lilac/.config/neofetch/art" +#image_source="/home/lilac/Media/Pics/Rest/Eden-meme-1.png" # Ascii Options @@ -756,7 +758,7 @@ image_backend="ascii" # Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, # postmarketOS, and Void have a smaller logo variant. # Use '{distro name}_small' to use the small variants. -ascii_distro="void_small" +ascii_distro="artix_small" # Ascii Colors # diff --git a/Config/neofetch/ff.conf b/Configs/neofetch/ff.conf similarity index 97% rename from Config/neofetch/ff.conf rename to Configs/neofetch/ff.conf index db2a825..97dc27a 100755 --- a/Config/neofetch/ff.conf +++ b/Configs/neofetch/ff.conf @@ -16,21 +16,24 @@ print_info() { # prin "─────\n ${cl1} ${cl2} ${cl3} ${cl4} ${cl5} ${cl6} ${cl7} ${cl10}\n ─────" prin "\n" - prin "── Main ────────────────────" - info "\n \E[38;5;147msys\33[0m" distro " |" + prin "── Main ─────────────────────────" +# info "\n \E[38;5;147msys\33[0m" distro " |" info "\n \E[38;5;147mker\33[0m" kernel info "\n \E[38;5;147mupt\33[0m" uptime info "\n \E[38;5;147mpkg\33[0m" packages - prin "── Soft ────────────────────" - info "\n \E[38;5;147mde\33[0m" de - info "\n \E[38;5;147mte\33[0m" term - info "\n \E[38;5;147msh\33[0m" shell - prin "── Hard ────────────────────" -# prin "\n \E[38;5;147mGtk \33[0m" "Catppuccin-Mocha-Lavender" -# info "\n \E[38;5;147mIcns\33[0m" icons + prin "── Hard ─────────────────────────" prin "\n \E[38;5;147mlap\33[0m" "ThinkPad T470" info "\n \E[38;5;147mmem\33[0m" memory info "\n \E[38;5;147mssd\33[0m" disk + prin "── Soft ─────────────────────────" + info "\n \E[38;5;147mde\33[0m" de + info "\n \E[38;5;147mte\33[0m" term + info "\n \E[38;5;147msh\33[0m" shell + prin "── Thms ─────────────────────────" + prin "\n \E[38;5;147mgtk\33[0m" "Catppuccin Mocha Lavender" + prin "\n \E[38;5;147mptr\33[0m" "Google Dot White" + prin "\n \E[38;5;147micn\33[0m" "Papirus Dark" + # prin "└─────────\n ${cl1} ${cl2} ${cl3} ${cl4} ${cl5} ${cl6} ${cl7} ${cl10}\n ─────────┘" #prin "\n \n \n \n \n \n \n \n \n ${cl0} ${cl7} ${cl6} ${cl5} ${cl4} ${cl3} ${cl2} ${cl1}" @@ -787,7 +790,7 @@ ascii_distro="void" # # Example: # ascii_colors=(distro) - Ascii is colored based on Distro colors. - ascii_colors=(5 6 1 8 8 6) #- Ascii is colored using these colors. + ascii_colors=(7 6 1 8 8 6) #- Ascii is colored using these colors. #ascii_colors=(distro) # Bold ascii logo diff --git a/Config/starship.toml b/Configs/starship.toml similarity index 71% rename from Config/starship.toml rename to Configs/starship.toml index 0ad9397..4fc6617 100755 --- a/Config/starship.toml +++ b/Configs/starship.toml @@ -5,39 +5,46 @@ format = """ -$directory\ -$git_status\ -$nodejs\ -$rust\ -$golang\ -$php\ -$time\ -$character""" +$username$directory$git_status +$character +""" # Sets user-defined palette palette = "catppuccin_mocha" [character] # Note the use of Catppuccin color 'maroon' -success_symbol = "[ ](bold lavender)" -error_symbol = "[ ](bold maroon)" -vimcmd_symbol = "[ ](sky)" +success_symbol = "[└](bold overlay0)[  ](bold lavender)" +error_symbol = "[└](bold overlay0)[  ](bold maroon)" +vimcmd_symbol = "[└](bold overlay0)[  ](bold teal)" +#error_symbol = "[└  ](bold maroon)" +#vimcmd_symbol = "[└  ](sky)" [directory] truncation_length = 4 read_only = " read " +format = "[─ $path ]($style)" # Catppuccin 'lavender' +#style = "bold text" style = "bold overlay0" +[username] +style_user = "bold overlay0" +style_root = "bold red" +format = "[┌](bold overlay0)[ $user ]($style)" +disabled = false +show_always = true + [directory.substitutions] -#"Docs" = "Dc" -#"Downs" = "Dw" -#"Music" = "Mus" -#"Pics" = "P" -".config" = "Cfg" -".local" = "Loc" -".icons" = "Ins" -".fonts" = "Fts" +#"Docs" = "" +#"Downloads" = "" +#"Mus" = "" +#"Pics" = "" +#"~" = "" +#".config" = "" +#".local" = "" +#".icons" = "ics" +#".fonts" = "fts" #"~" = "Home" [palettes.catppuccin_mocha] diff --git a/Config/swayimg/config b/Configs/swayimg/config similarity index 100% rename from Config/swayimg/config rename to Configs/swayimg/config diff --git a/Config/waybar/hz/config.jsonc b/Configs/waybar/back-btm/config.jsonc similarity index 73% rename from Config/waybar/hz/config.jsonc rename to Configs/waybar/back-btm/config.jsonc index b2c6717..27942a6 100755 --- a/Config/waybar/hz/config.jsonc +++ b/Configs/waybar/back-btm/config.jsonc @@ -11,23 +11,13 @@ //Global panel settings. { "layer": "top", - // "output": [], "position": "bottom", "min-height": 0, - //"width": 1000, - // "margin": "", - //"margin-top": -4, - //"margin-bottom": 8, - //"margin-left": 10, - //"margin-right": 10, "spacing": 0, "gtk-layer-shell": true, - //"border-radius": 16, - //Modules placement. - //Left panel part. "modules-left": [ "clock", @@ -50,14 +40,14 @@ "custom/tempicon", "temperature", "custom/separator", - "custom/btc", - "custom/btd", + "custom/wifiicon", + "network" + //"custom/btc", + //"custom/btd", ], - //Modules Configuration. - //1. Kayboard layout module. "hyprland/language": { "format": "{}", @@ -68,19 +58,10 @@ //2. Date and time module. "clock": { "interval": 1, - "timezone": "Asia/Novosibirsk", - //"format": " {:%H:%M |  %e %b, %a}", - "format": "{:%H:%M |%e %b, %a}", + "timezone":"Asia/Novosibirsk", + "format": "{:%H:%M | %e %b, %a}", "on-click": "gnome-calendar", "tooltip": false, - "tooltip-format": "{calendar}", - "calendar": { - "mode": "year", - "mode-mon-col": 3, - "format": { - "today": "{}" - } - } }, //3. Workspaces switcher module. @@ -88,23 +69,20 @@ "format": "{icon}", "format-icons": { "1": "", - "2": "", - "3": "", - "4": "", - "5": "", - "6": "", -// "7": "7", -// "8": "8",  -// "9": "9", - - //"active":"󱓻", - //"default":"", - //"urgent":"" + "2": "", + "3": "", + "4": "", + "5": "", + "6": "", + "7": "", + "8": "", + "9": "", + "10": "", }, "on-click": "activate", "tooltip": false, "persistent_workspaces": { - "*": 3 + "*": 6 } }, @@ -112,8 +90,8 @@ "pulseaudio#audio": { "format": "{icon} {volume}", "format-bluetooth": "{icon} {volume}", - "format-bluetooth-muted": "muted", - "format-muted": "muted", + "format-bluetooth-muted": "", + "format-muted": "", "format-icons": { "default": [ "󰛞 󱢠 󱢠 󱢠 󱢠 ", @@ -128,11 +106,11 @@ "󰣐 󰣐 󰣐 󰣐 󰣐 " ] }, - "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle", + "on-click-right": "pactl set-sink-mute @DEFAULT_SINK@ toggle", + "on-click": "pkill pulsemixer || foot --title=pm -e pulsemixer", "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +1%", "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -1%", "tooltip": false, - "tooltip-format": "{icon} {desc} {volume}%" }, //5. Battery 0 (internal) capacity monitoring module. @@ -145,16 +123,7 @@ "format-charging": " {capacity} ", "format-plugged": "󰚥 {capacity} ", "format-icons": [ - "󰁺", - "󰁻", - "󰁼", - "󰁽", - "󰁾", - "󰁿", - "󰂀", - "󰂁", - "󰂂", - "󰁹" + "󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹" ], "on-click": "", "tooltip": false, @@ -180,7 +149,6 @@ "custom/separator": { "format": " | ", "tooltip": false, - "on-click": "wofi --show drun -I" }, //9. Void Linux logo/menu button. @@ -190,10 +158,16 @@ "on-click": "wofi --show drun -I" }, +"custom/wifiicon": { + "format": " ", + "tooltip": false, + //"on-click": "pkill nm || foot --title=nm -e nmtu" + }, + "custom/tempicon": { "format": " ", "tooltip": false, - "on-click": "pkill htop || foot --title=smtr -e htop" + "on-click": "pkill btm || foot --title=smtr -e btm" }, //10. Battery 1 (external) capacity monitoring module. @@ -206,27 +180,32 @@ "format-charging": " {capacity}", "format-plugged": "󰚥 {capacity}", "format-icons": [ - "󰁺", - "󰁻", - "󰁼", - "󰁽", - "󰁾", - "󰁿", - "󰂀", - "󰂁", - "󰂂", - "󰁹" + "󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹" ], "on-click": "", "tooltip": false, "bat": "BAT1", "interval": 1 }, - + +"network": { + // "interface": "wlp2*", // (Optional) To force the use of this interface + "format-wifi": "{signalStrength}", + "format-ethernet": "eth", + //"tooltip-format": "{essid} - {ifname} via {gwaddr} ", + //"format-linked": "{ifname} (No IP) ", + "format-disconnected": "no net", + "format-alt": "{ifname}, {essid}", + "tooltip": false, + "interval": 3, + //"on-click-right": "pkill nm || foot --title=nm -e nmtui", + }, + //11. Temperature monitoring module. "temperature": { "format": "{temperatureC}°C", "on-click": "pkill htop || foot --title=smtr -e htop", - "tooltip":false + "critical-threshold": 80, + "tooltip":false, }, }, diff --git a/Configs/waybar/back-btm/style.css b/Configs/waybar/back-btm/style.css new file mode 100755 index 0000000..8addfe8 --- /dev/null +++ b/Configs/waybar/back-btm/style.css @@ -0,0 +1,176 @@ +/*////////////////////////////////////////////////////////// +// _ __ __ __ __ // +// | | /| / /__ ___ __/ / ___ _____ ___ / /___ __/ /__ // +// | |/ |/ / _ `/ // / _ \/ _ `/ __/ (_- box{ + border-top: 2px solid rgba(49,50,68, 1); + /*box-shadow: rgba(0, 0, 0, 0.35) 4 4 5 2px;*/ + background: rgba(24,24,37, 1.0); + color: #7f849c; + transition-property: background-color; + transition-duration: .5s; + } + + +.modules-right { + border-radius: 7; + background-color: rgba(39,39,68, 0.95); + box-shadow: rgba(0, 0, 0, 0.16) 4 4 5 2px; + margin: 9 9 9 0px; + padding: 2 2 2 2px; + } + + +.modules-center { + border-radius: 7; + background-color: rgba(39, 39, 68, 0.95); + box-shadow: rgba(0, 0, 0, 0.16) 4 4 5 2px; + margin: 9 0 9 0px; + padding: 2 2 2 2px; + } + + +.modules-left { + border-radius: 7; + background-color: rgba(39, 39, 68, 0.95); + box-shadow: rgba(0, 0, 0, 0.16) 4 4 5 2px; + margin: 9 0 9 9px; + padding: 2 2 2 2px; + } + + +/*Modules setting.*/ + + +/*1. Workspace switcher module. +Main.*/ +#workspaces { + margin: 2 0 2 0px; + font-size: 18px; + } + +/*1.1. Inactive workspace button.*/ + #workspaces button { + transition: all 0.3s ease; + font-size: 17px; + padding: 3 16 3 10px; + border-radius: 7px; + color: #585b70; + } + +/*1.2. Inactive workspace hover button.*/ + #workspaces button:hover { + box-shadow: inherit; + text-shadow: inherit; + transition: all 0.3s ease; + } + +/* #workspaces button.focused, +1.3. Active workspace button.*/ + #workspaces button.active { + color: #b4befe; + transition: all 0.3s ease; + text-shadow: rgba(0, 0, 0, 0.288) 2 2 5 2px; + animation: colored-gradient 10s ease infinite; + padding: 3 16 3 10px; + font-weight: bolder; + font-size: 17px; + } + +/*1.4. Warning workspace button.*/ + #workspaces button.urgent { + color: #f38ba8; + transition: all 0.3s ease; + } + + +/*2. Keyboard layout module.*/ +#language { + color:#b4befe; + padding: 0 0 0 0px; + } + +/*3. PulseAudio control module.*/ +#pulseaudio.audio { + color: #b4befe; + text-shadow: rgba(0, 0, 0, 0.288) 2 2 5 2px; + padding: 0 0 0 10px; + } + +/*5. PulseAudio muted status module3*/ +#pulseaudio.audio.muted { + box-shadow: rgba(0, 0, 0, 0.0) 2 2 5 2px; + color: #7f849c; + padding: 0 6 0 10px; + font-size: 16px; + } + +/*6. Batteries capacity monitoring module.*/ +#battery { + padding: 0 6 0 0px; + } + +#custom-wifiicon { + padding-right: 3px; + } + +#custom-tempicon { + padding-right: 3px; + } + +#custom-btd { + padding-right: 15px; + padding-top: 1px; + font-size: 15px; + } + +#custom-btc { + padding-right: 6px; + padding-top: 2px; + font-size: 15px; + } + +#custom-logo { + font-family: RobotoMonoNerdFont; + font-weight: bold; + font-size: 15px; + padding-top: 1px; + padding-left: 4px; + } + +#network { + padding-right: 10px; + } + +/*7. Batteries charging status monitoring module.*/ +#battery.charging, #battery.plugged { + color: #b4befe; + text-shadow: rgba(0, 0, 0, 0.288) 2 2 5 2px; + animation: gradient 5s linear infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); + } + +/*8. Date and time module.*/ +#clock { + padding: 0 0 0 10px; + } diff --git a/Config/waybar/vt/config.jsonc b/Configs/waybar/back-lft/config.jsonc similarity index 73% rename from Config/waybar/vt/config.jsonc rename to Configs/waybar/back-lft/config.jsonc index 9784cc1..b23682a 100755 --- a/Config/waybar/vt/config.jsonc +++ b/Configs/waybar/back-lft/config.jsonc @@ -13,12 +13,13 @@ "layer": "top", // "output": [], "position": "left", - "height": 700, - // "width": 1000, - // "margin":"", + "height": 880, + //"height": 1092, + "min-width": 0, + "width": 13, "margin-top": 0, "margin-bottom": 0, - "margin-right": -6, + "margin-right": -14, "margin-left": 0, "spacing": 0, "gtk-layer-shell": true, @@ -30,12 +31,13 @@ //Left panel part. "modules-left": [ - "clock", - "custom/separator", //"custom/separator", "battery", "custom/separator", "battery#bat2", + "custom/separator", + "custom/tempicon", + "temperature", ], //Center panel part. @@ -48,10 +50,17 @@ "pulseaudio#audio", "custom/separator", "hyprland/language", - //"temperature", "custom/separator", - "custom/btc", - "custom/btd", + "clock" + //"custom/separator", + //"network" + + //"pulseaudio#audio", + //"custom/separator", + //"temperature", + //"custom/separator", + //"custom/btc", + //"custom/btd", ], @@ -70,8 +79,8 @@ "interval": 1, //"timezone": "Asia/Novosibirsk", "format": "{:%H\n%M}", - "on-click": "gnome-calendar", - "tooltip": true, + //"format-alt": "{:%e\n%a\n%b}", + "tooltip": false, //"tooltip-format": "{:%Y %B}\n{calendar}", "calendar": { "mode": "year", @@ -86,19 +95,22 @@ "hyprland/workspaces": { "format": "{icon}", "format-icons": { -// "1": "", -// "2": "", -// "3": "", -// "4": "", -// "5": "", + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "6": "", // "6": "", // "7": "", // "8": "",  // "9": "", +// "10": "" - "active":"󱓻", - "default":"󱓻", - "urgent":"󱓻" +// "active":"󱓻", +// "default":"󱓻"", + "default":"", +// "urgent":"󱓻" }, "on-click": "activate", "tooltip": false, @@ -111,8 +123,8 @@ "pulseaudio#audio": { "format": "{volume}", "format-bluetooth": "{volume}", - "format-bluetooth-muted": "mu\nte", - "format-muted": "mu\nte", + "format-bluetooth-muted": "", + "format-muted": "", "format-icons": { "default": [ "󰛞 󱢠 󱢠 󱢠 󱢠 ", @@ -128,13 +140,27 @@ ] }, //"on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle", - "on-click": "foot --title=vc -e pulsemixer", + "on-click-right": "pactl set-sink-mute @DEFAULT_SINK@ toggle", + "on-click": "pkill pulsemixer || foot --title=pm -e pulsemixer", "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +1%", "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -1%", "tooltip": false, "tooltip-format": "{icon} {desc} {volume}%" }, +"network": { + // "interface": "wlp2*", // (Optional) To force the use of this interface + "format-wifi": "", + "format-ethernet": "", + //"tooltip-format": "{essid} - {ifname} via {gwaddr} ", + //"format-linked": "{ifname} (No IP) ", + "format-disconnected": "", + //"format-alt": "{ifname}, {essid}", + "tooltip": false, + "interval": 3, + //"on-click-right": "pkill nm || foot --title=nm -e nmtui", + }, + //5. Battery 0 (internal) capacity monitoring module. "battery": { "states": { @@ -171,6 +197,19 @@ "on-click": "bluetoothctl connect 0C:AE:BD:DB:52:3A" }, +"custom/wifiicon": { + "format": " ", + "tooltip": false, + //"on-click": "pkill nm || foot --title=nm -e nmtu" + }, + +"custom/tempicon": { + "format": "", + "tooltip": false, + "on-click": "pkill htop || foot --title=smtr -e htop" + }, + + //8. Modules separator. "custom/separator": { "format": "──", @@ -209,6 +248,7 @@ //11. Temperature monitoring module. "temperature": { - "format": "{temperatureC}" + "format": "{temperatureC}", + "on-click": "pkill htop || foot --title=smtr -e htop" }, }, diff --git a/Config/waybar/vt/style.css b/Configs/waybar/back-lft/style.css similarity index 86% rename from Config/waybar/vt/style.css rename to Configs/waybar/back-lft/style.css index e8cd45e..3e09c88 100755 --- a/Config/waybar/vt/style.css +++ b/Configs/waybar/back-lft/style.css @@ -20,7 +20,7 @@ window#waybar { /*border-top: 2px solid rgba(49,50,68, 0.75);*/ /*background: rgba(24, 24, 37, 1.0);*/ background: rgba(17, 17, 27, 0); - color: #7f849c; + color: #585b70; } window#waybar > box{ @@ -29,18 +29,18 @@ window#waybar > box{ box-shadow: rgba(0, 0, 0, 0.2) 0 0 5 2px; transition-property: background-color; transition-duration: .5s; - border-radius: 16; + border-radius: 11; color: #7f849c; margin-top: 20px; - margin-right: 8px; + margin-right: 12px; margin-bottom: 20px; margin-left: 12px; } .modules-right { - border-radius: 8; - background-color: rgba(39,39,68, 0.6); + border-radius: 6; + background-color: rgba(39,39,68, 0.85); box-shadow: rgba(0, 0, 0, 0.11) 4 4 5 2px; margin-left: 9px; margin-bottom: 9px; @@ -55,8 +55,8 @@ window#waybar > box{ .modules-center { - border-radius: 8; - background-color: rgba(39, 39, 68, 0.6); + border-radius: 6; + background-color: rgba(39, 39, 68, 0.85); box-shadow: rgba(0, 0, 0, 0.11) 4 4 5 2px; margin-left: 9px; margin-right: 9px; @@ -69,8 +69,8 @@ window#waybar > box{ .modules-left { - border-radius: 8; - background-color: rgba(39, 39, 68, 0.6); + border-radius: 6; + background-color: rgba(39, 39, 68, 0.85); box-shadow: rgba(0, 0, 0, 0.11) 4 4 5 2px; margin-top: 9px; margin-right: 9px; @@ -97,16 +97,16 @@ Main.*/ /*1.1. Inactive workspace button.*/ #workspaces button { background: transparent; - color: #585b70; transition: all 0.3s ease; + color: #585b70; /*margin-top: 8px; margin-bottom: 8px; margin-left: 1px; margin-right: 1px;*/ - padding-top: 4px; - padding-bottom: 4px; - padding-right: 10px; - padding-left: 7px; + padding-top: 7px; + padding-bottom: 7px; + padding-right: 11px; + padding-left: 5px; border-radius: 10px; } @@ -128,10 +128,6 @@ Main.*/ background: transparent; background-size: 310% 310%; animation: colored-gradient 10s ease infinite; - padding-right: 10px; - padding-left: 6px; - padding-top: 4px; - padding-bottom: 4px; font-weight: bolder; } @@ -181,12 +177,12 @@ Main.*/ border-radius: 30px; padding-top: 8px; padding-bottom: 0px; - padding-right: 0px; + padding-right: 4px; padding-left: 0px; } #battery.bat2 { - padding-bottom:8px; + padding-top: 0px; } /*6. Batteries capacity monitoring module.*/ @@ -194,7 +190,7 @@ Main.*/ background: transparent; border-radius: 30px; margin-top: 0px; - padding-top: 0px; + padding-top: 8px; padding-bottom: 0px; padding-right: 0px; padding-left: 0px; @@ -206,6 +202,17 @@ Main.*/ padding-left: 0px; } +#network { + padding-right: 8px; + padding-bottom: 8px; + } + +#custom-tempicon { + padding-right: 3px; + padding-top: 0px; + padding-bottom: 2px; + } + #custom-btd { /*color:#f5e0dc;*/ padding-bottom: 8px; @@ -229,7 +236,7 @@ Main.*/ } #temperature { - padding-right: 0px; + padding-bottom: 8px; } /*7. Batteries charging status monitoring module.*/ @@ -245,24 +252,11 @@ Main.*/ /*8. Date and time module.*/ #clock { background: transparent; - padding-top: 8px; - padding-bottom: 0px; + padding-top: 0px; + padding-bottom: 8px; padding-right: 0px; padding-left: 0px; } -/*9. Network control module.*/ -#network { - background: #272744; - margin-top: 6px; - margin-bottom: 6px; - margin-left: 9px; - margin-right: 9px; - padding-top: 12px; - padding-bottom: 12px; - padding-right: 10px; - padding-left: 10px; - border-radius: 30px; - } /*10.*/ #custom-date { diff --git a/Configs/waybar/btm/config.jsonc b/Configs/waybar/btm/config.jsonc new file mode 100755 index 0000000..305eadd --- /dev/null +++ b/Configs/waybar/btm/config.jsonc @@ -0,0 +1,227 @@ +///////////////////////////////////////////////////////////////// +// _ __ __ ____ // +// | | /| / /__ ___ __/ / ___ _____ _______ ___ / _(_)__ _ // +// | |/ |/ / _ `/ // / _ \/ _ `/ __/ / __/ _ \/ _ \/ _/ / _ `/ // +// |__/|__/\_,_/\_, /_.__/\_,_/_/ \__/\___/_//_/_//_/\_, / // +// /___/ /___/ // +///////////////////////////////////////////////////////////////// + + + +//Global panel settings. +{ + "layer": "top", + "position": "bottom", + "min-height": 0, + "spacing": 0, + "gtk-layer-shell": true, + + +//Modules placement. +//Left panel part. +"modules-left": [ + "clock", + "custom/separator", + "hyprland/language", + "custom/separator", + "battery#bat2", + //"custom/separator", + "battery", + ], + +//Center panel part. +"modules-center": [ + "hyprland/workspaces", + ], + +//Right panel part. +"modules-right": [ + "pulseaudio#audio", + "custom/separator", + "custom/tempicon", + "temperature", + "custom/separator", + "custom/wifiicon", + "network" + //"custom/btc", + //"custom/btd", + ], + + +//Modules Configuration. +//1. Kayboard layout module. +"hyprland/language": { + "format": "{}", + "format-en": "US", + "format-ru": "RU", + }, + +//2. Date and time module. +"clock": { + "interval": 1, + "timezone":"Asia/Novosibirsk", + "format": "{:%H:%M | %e %b, %a}", + "tooltip": false, + }, + +//3. Workspaces switcher module. + "hyprland/workspaces": { + "format": "{icon}", + "format-icons": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "6": "", +// "1": "", +// "2": "", +// "3": "", +// "4": "", +// "5": "", +// "6": "", + "7": "", + "8": "", + "9": "", + "10": "", + }, + "on-click": "activate", + "tooltip": false, + "persistent_workspaces": { + "*": 6 + } + }, + +//4. PulseAudio control module. +"pulseaudio#audio": { + "format": "{icon} {volume}", + "format-bluetooth": "{icon} {volume}", + "format-bluetooth-muted": "", + "format-muted": "", + "format-icons": { + "default": [ + "󰛞 󱢠 󱢠 󱢠 󱢠 ", + "󰣐 󱢠 󱢠 󱢠 󱢠 ", + "󰣐 󰛞 󱢠 󱢠 󱢠 ", + "󰣐 󰣐 󱢠 󱢠 󱢠 ", + "󰣐 󰣐 󰛞 󱢠 󱢠 ", + "󰣐 󰣐 󰣐 󱢠 󱢠 ", + "󰣐 󰣐 󰣐 󰛞 󱢠 ", + "󰣐 󰣐 󰣐 󰣐 󱢠 ", + "󰣐 󰣐 󰣐 󰣐 󰛞 ", + "󰣐 󰣐 󰣐 󰣐 󰣐 " + ] + }, + "on-click-right": "pactl set-sink-mute @DEFAULT_SINK@ toggle", + "on-click": "pkill pulsemixer || foot --title=pm -e pulsemixer", + "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +1%", + "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -1%", + "tooltip": false, + }, + +//5. Battery 0 (internal) capacity monitoring module. +"battery": { + "states": { + "warning": 30, + "critical": 10 + }, + "format": "{icon} {capacity} ", + "format-charging": " {capacity} ", + "format-plugged": "󰚥 {capacity} ", + "format-icons": [ +// "󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹" + "", + "", + "", + "", + "" + ], + "on-click": "", + "tooltip": false, + "bat": "BAT0", + "interval": 1 + }, + +//6. Bluetooth headphones disconnect button. +"custom/btd": { + "format": "", + "tooltip": false, + "on-click": "bluetoothctl disconnect 0C:AE:BD:DB:52:3A" + }, + +//7. Bluetooth headphones connect button. +"custom/btc": { + "format": " ", + "tooltip": false, + "on-click": "bluetoothctl connect 0C:AE:BD:DB:52:3A" + }, + +//8. Modules separator. +"custom/separator": { + "format": " | ", + "tooltip": false, + }, + +//9. Void Linux logo/menu button. +"custom/logo": { + "format": "  ", + "tooltip": false, + "on-click": "wofi --show drun -I" + }, + +"custom/wifiicon": { + "format": " ", + "tooltip": false, + //"on-click": "pkill nm || foot --title=nm -e nmtu" + }, + +"custom/tempicon": { + "format": " ", + "tooltip": false, + "on-click": "pkill btm || foot --title=smtr -e btm" + }, + +//10. Battery 1 (external) capacity monitoring module. +"battery#bat2": { + "states": { + "warning": 30, + "critical": 15 + }, + "format": "{icon} {capacity} ", + "format-charging": " {capacity}", + "format-plugged": "󰚥 {capacity}", + "format-icons": [ +// "󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹" + "", + "", + "", + "", + "" + ], + "on-click": "", + "tooltip": false, + "bat": "BAT1", + "interval": 1 + }, + +"network": { + // "interface": "wlp2*", // (Optional) To force the use of this interface + "format-wifi": "{signalStrength}", + "format-ethernet": "eth", + //"tooltip-format": "{essid} - {ifname} via {gwaddr} ", + //"format-linked": "{ifname} (No IP) ", + "format-disconnected": "no net", + "format-alt": "{ifname}, {essid}", + "tooltip": false, + "interval": 3, + //"on-click-right": "pkill nm || foot --title=nm -e nmtui", + }, + +//11. Temperature monitoring module. +"temperature": { + "format": "{temperatureC}°C", + "on-click": "pkill htop || foot --title=smtr -e htop", + "critical-threshold": 80, + "tooltip":false, + }, +}, diff --git a/Configs/waybar/btm/style.css b/Configs/waybar/btm/style.css new file mode 100755 index 0000000..00d9ed7 --- /dev/null +++ b/Configs/waybar/btm/style.css @@ -0,0 +1,180 @@ +/*////////////////////////////////////////////////////////// +// _ __ __ __ __ // +// | | /| / /__ ___ __/ / ___ _____ ___ / /___ __/ /__ // +// | |/ |/ / _ `/ // / _ \/ _ `/ __/ (_- box{ + border-top: 2px solid rgba(49,50,68, 1); + /*box-shadow: rgba(0, 0, 0, 0.35) 4 4 5 2px;*/ + background: rgba(24,24,37, 1.0); + color: #7f849c; + transition-property: background-color; + transition-duration: .5s; + } + + +.modules-right { + border-radius: 7; + background-color: rgba(39,39,68, 0.95); + box-shadow: rgba(0, 0, 0, 0.16) 4 4 5 2px; + margin: 9 9 9 0px; + padding: 2 2 2 2px; + } + + +.modules-center { + border-radius: 7; + background-color: rgba(39, 39, 68, 0.95); + box-shadow: rgba(0, 0, 0, 0.16) 4 4 5 2px; + margin: 9 0 9 0px; + padding: 2 2 2 2px; + } + + +.modules-left { + border-radius: 7; + background-color: rgba(39, 39, 68, 0.95); + box-shadow: rgba(0, 0, 0, 0.16) 4 4 5 2px; + margin: 9 0 9 9px; + padding: 2 2 2 2px; + } + + +/*Modules setting.*/ + + +/*1. Workspace switcher module. +Main.*/ +#workspaces { + margin: 2 0 2 0px; + font-size: 18px; + } + +/*1.1. Inactive workspace button.*/ + #workspaces button { + transition: all 0.3s ease; + font-size: 17px; + padding: 3 16 3 10px; + border-radius: 7px; + color: #585b70; + } + +/*1.2. Inactive workspace hover button.*/ + #workspaces button:hover { + box-shadow: inherit; + text-shadow: inherit; + transition: all 0.3s ease; + } + +/* #workspaces button.focused, +1.3. Active workspace button.*/ + #workspaces button.active { + color: #b4befe; + transition: all 0.3s ease; + text-shadow: rgba(0, 0, 0, 0.288) 2 2 5 2px; + animation: colored-gradient 10s ease infinite; + padding: 3 16 3 10px; + font-weight: bolder; + font-size: 17px; + } + +/*1.4. Warning workspace button.*/ + #workspaces button.urgent { + color: #f38ba8; + transition: all 0.3s ease; + } + + +/*2. Keyboard layout module.*/ +#language { + color:#b4befe; + padding: 0 0 0 0px; + } + +/*3. PulseAudio control module.*/ +#pulseaudio.audio { + color: #b4befe; + text-shadow: rgba(0, 0, 0, 0.288) 2 2 5 2px; + padding: 0 0 0 11px; + } + +/*5. PulseAudio muted status module3*/ +#pulseaudio.audio.muted { + box-shadow: rgba(0, 0, 0, 0.0) 2 2 5 2px; + color: #7f849c; + padding: 0 6 0 10px; + font-size: 16px; + } + +/*6. Batteries capacity monitoring module.*/ +#battery.bat2 { + padding: 0 0 0 0px; + } + +#battery { + padding: 0 6 0 0px; + } + +#custom-wifiicon { + padding-right: 3px; + } + +#custom-tempicon { + padding-right: 3px; + } + +#custom-btd { + padding-right: 15px; + padding-top: 1px; + font-size: 15px; + } + +#custom-btc { + padding-right: 6px; + padding-top: 2px; + font-size: 15px; + } + +#custom-logo { + font-family: RobotoMonoNerdFont; + font-weight: bold; + font-size: 15px; + padding-top: 1px; + padding-left: 4px; + } + +#network { + padding-right: 10px; + } + +/*7. Batteries charging status monitoring module.*/ +#battery.charging, #battery.plugged { + color: #b4befe; + text-shadow: rgba(0, 0, 0, 0.288) 2 2 5 2px; + animation: gradient 5s linear infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); + } + +/*8. Date and time module.*/ +#clock { + padding: 0 0 0 10px; + } diff --git a/Configs/waybar/lft/config.jsonc b/Configs/waybar/lft/config.jsonc new file mode 100755 index 0000000..19887be --- /dev/null +++ b/Configs/waybar/lft/config.jsonc @@ -0,0 +1,254 @@ +///////////////////////////////////////////////////////////////// +// _ __ __ ____ // +// | | /| / /__ ___ __/ / ___ _____ _______ ___ / _(_)__ _ // +// | |/ |/ / _ `/ // / _ \/ _ `/ __/ / __/ _ \/ _ \/ _/ / _ `/ // +// |__/|__/\_,_/\_, /_.__/\_,_/_/ \__/\___/_//_/_//_/\_, / // +// /___/ /___/ // +///////////////////////////////////////////////////////////////// + + + +//Global panel settings. +{ + "layer": "top", + // "output": [], + "position": "left", + // "height": 880, + //"height": 1092, + "min-width": 0, + "width": 13, + "margin-top": 0, + "margin-bottom": 0, + "margin-right": -14, + "margin-left": 0, + "spacing": 0, + "gtk-layer-shell": true, + //"border-radius": 17, + + + +//Modules placement. + +//Left panel part. +"modules-left": [ + //"custom/separator", + "battery", + "custom/separator", + "battery#bat2", + "custom/separator", + "custom/tempicon", + "temperature", + ], + +//Center panel part. +"modules-center": [ + "hyprland/workspaces", + ], + +//Right panel part. +"modules-right": [ + "pulseaudio#audio", + "custom/separator", + "hyprland/language", + "custom/separator", + "clock" + //"custom/separator", + //"network" + + //"pulseaudio#audio", + //"custom/separator", + //"temperature", + //"custom/separator", + //"custom/btc", + //"custom/btd", + ], + + + +//Modules Configuration. + +//1. Kayboard layout module. +"hyprland/language": { + "format": "{}", + "format-en": "US", + "format-ru": "RU", + }, + +//2. Date and time module. +"clock": { + "interval": 1, + //"timezone": "Asia/Novosibirsk", + "format": "{:%H\n%M}", + //"format-alt": "{:%e\n%a\n%b}", + "tooltip": false, + //"tooltip-format": "{:%Y %B}\n{calendar}", + "calendar": { + "mode": "year", + "mode-mon-col": 3, + "format": { + "today": "{}" + } + } + }, + +//3. Workspaces switcher module. + "hyprland/workspaces": { + "format": "{icon}", + "format-icons": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "6": "", +// "6": "", +// "7": "", +// "8": "",  +// "9": "", +// "10": "" + +// "active":"󱓻", +// "default":"󱓻"", + "default":"", +// "urgent":"󱓻" + }, + "on-click": "activate", + "tooltip": false, + "persistent_workspaces": { + "*": 3 + } + }, + +//4. PulseAudio control module. +"pulseaudio#audio": { + "format": "{volume}", + "format-bluetooth": "{volume}", + "format-bluetooth-muted": "", + "format-muted": "", + "format-icons": { + "default": [ + "󰛞 󱢠 󱢠 󱢠 󱢠 ", + "󰣐 󱢠 󱢠 󱢠 󱢠 ", + "󰣐 󰛞 󱢠 󱢠 󱢠 ", + "󰣐 󰣐 󱢠 󱢠 󱢠 ", + "󰣐 󰣐 󰛞 󱢠 󱢠 ", + "󰣐 󰣐 󰣐 󱢠 󱢠 ", + "󰣐 󰣐 󰣐 󰛞 󱢠 ", + "󰣐 󰣐 󰣐 󰣐 󱢠 ", + "󰣐 󰣐 󰣐 󰣐 󰛞 ", + "󰣐 󰣐 󰣐 󰣐 󰣐 " + ] + }, + //"on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle", + "on-click-right": "pactl set-sink-mute @DEFAULT_SINK@ toggle", + "on-click": "pkill pulsemixer || foot --title=pm -e pulsemixer", + "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +1%", + "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -1%", + "tooltip": false, + "tooltip-format": "{icon} {desc} {volume}%" + }, + +"network": { + // "interface": "wlp2*", // (Optional) To force the use of this interface + "format-wifi": "", + "format-ethernet": "", + //"tooltip-format": "{essid} - {ifname} via {gwaddr} ", + //"format-linked": "{ifname} (No IP) ", + "format-disconnected": "", + //"format-alt": "{ifname}, {essid}", + "tooltip": false, + "interval": 3, + //"on-click-right": "pkill nm || foot --title=nm -e nmtui", + }, + +//5. Battery 0 (internal) capacity monitoring module. +"battery": { + "states": { + "warning": 30, + "critical": 10 + }, + "format": "{icon}\n{capacity}", + "format-charging": "{icon}\n{capacity}", + "format-plugged": "{icon}\n{capacity}", + "format-icons": [ + "", + "", + "", + "", + "" + ], + "on-click": "", + "tooltip": false, + "bat": "BAT0", + "interval": 1 + }, + +//6. Bluetooth headphones disconnect button. +"custom/btd": { + "format": "󰟎", + "tooltip": false, + "on-click": "bluetoothctl disconnect 0C:AE:BD:DB:52:3A" + }, + +//7. Bluetooth headphones connect button. +"custom/btc": { + "format": "󰋋", + "tooltip": false, + "on-click": "bluetoothctl connect 0C:AE:BD:DB:52:3A" + }, + +"custom/wifiicon": { + "format": " ", + "tooltip": false, + //"on-click": "pkill nm || foot --title=nm -e nmtu" + }, + +"custom/tempicon": { + "format": "", + "tooltip": false, + "on-click": "pkill htop || foot --title=smtr -e htop" + }, + + +//8. Modules separator. +"custom/separator": { + "format": "──", + "tooltip": false, + "on-click": "wofi --show drun -I" + }, + +//9. Void Linux logo/menu button. +"custom/logo": { + "format": "  ", + "tooltip": false, + "on-click": "wofi --show drun -I" + }, + +//10. Battery 1 (external) capacity monitoring module. +"battery#bat2": { + "states": { + "warning": 30, + "critical": 15 + }, + "format": "{icon}\n{capacity}", + "format-charging": "{icon}\n{capacity}", + "format-plugged": "{icon}\n{capacity}", + "format-icons": [ + "", + "", + "", + "", + "" + ], + "on-click": "", + "tooltip": false, + "bat": "BAT1", + "interval": 1 + }, + +//11. Temperature monitoring module. +"temperature": { + "format": "{temperatureC}", + "on-click": "pkill htop || foot --title=smtr -e htop" + }, +}, diff --git a/Config/waybar/hz/style.css b/Configs/waybar/lft/style.css similarity index 72% rename from Config/waybar/hz/style.css rename to Configs/waybar/lft/style.css index 341f575..31ad64a 100755 --- a/Config/waybar/hz/style.css +++ b/Configs/waybar/lft/style.css @@ -14,35 +14,34 @@ font-family: RobotoMonoNerdFont; font-size: 14px; font-weight: Bold; + min-height: 0px; } - -window#waybar { - background: rgba(0,0,0, 0); - transition-property: background-color; - transition-duration: .5s; - +window#waybar { + /*background: rgba(24, 24, 37, 1.0);*/ + background: rgba(17, 17, 27, 0); + color: #585b70; } window#waybar > box{ - border-top: 2px solid rgba(49,50,68, 0.75); - background: rgba(24,24,37, 1.0); - box-shadow: rgba(0, 0, 0, 0.35) 4 4 5 2px; + border-right: 2px solid rgba(49,50,68, 0.65); + background: rgba(24, 24, 37, 1.0); + box-shadow: rgba(0, 0, 0, 0.2) 0 0 5 2px; transition-property: background-color; transition-duration: .5s; color: #7f849c; -/* border-radius: 10; - margin-left: 20px; - margin-right: 20px; - margin-bottom: 12px; - margin-top: 3px;*/ + margin-right: 12px; + /*margin-top: 20px; + border-radius: 11; + margin-bottom: 20px; + margin-left: 12px;*/ } .modules-right { - border-radius: 10; - background-color: rgba(39,39,68, 0.95); - box-shadow: rgba(0, 0, 0, 0.16) 4 4 5 2px; - margin-top: 9px; + border-radius: 6; + background-color: rgba(39,39,68, 0.85); + box-shadow: rgba(0, 0, 0, 0.11) 4 4 5 2px; + margin-left: 9px; margin-bottom: 9px; margin-right: 9px; padding-top: 2px; @@ -52,12 +51,14 @@ window#waybar > box{ } + + .modules-center { - border-radius: 10; - background-color: rgba(39, 39, 68, 0.95); - box-shadow: rgba(0, 0, 0, 0.16) 4 4 5 2px; - margin-top: 9px; - margin-bottom: 9px; + border-radius: 6; + background-color: rgba(39, 39, 68, 0.85); + box-shadow: rgba(0, 0, 0, 0.11) 4 4 5 2px; + margin-left: 9px; + margin-right: 9px; padding-top: 2px; padding-bottom: 2px; padding-right: 2px; @@ -65,12 +66,13 @@ window#waybar > box{ } + .modules-left { - border-radius: 10; - background-color: rgba(39, 39, 68, 0.95); - box-shadow: rgba(0, 0, 0, 0.16) 4 4 5 2px; + border-radius: 6; + background-color: rgba(39, 39, 68, 0.85); + box-shadow: rgba(0, 0, 0, 0.11) 4 4 5 2px; margin-top: 9px; - margin-bottom: 9px; + margin-right: 9px; margin-left: 9px; padding-top: 2px; padding-bottom: 2px; @@ -79,6 +81,7 @@ window#waybar > box{ } + /*Modules setting.*/ @@ -88,24 +91,22 @@ Main.*/ /*background: #1e1e2e;*/ margin-top: 2px; margin-bottom: 2px; - font-size: 17px; } /*1.1. Inactive workspace button.*/ #workspaces button { background: transparent; - color: #585b70; transition: all 0.3s ease; + color: #585b70; /*margin-top: 8px; margin-bottom: 8px; margin-left: 1px; margin-right: 1px;*/ - font-size: 17px; - padding-top: 3px; - padding-bottom: 3px; - padding-right: 16px; - padding-left: 10px; - border-radius: 7px; + padding-top: 7px; + padding-bottom: 7px; + padding-right: 11px; + padding-left: 5px; + border-radius: 10px; } /*1.2. Inactive workspace hover button.*/ @@ -126,12 +127,7 @@ Main.*/ background: transparent; background-size: 310% 310%; animation: colored-gradient 10s ease infinite; - padding-right: 16px; - padding-left: 10px; - padding-top: 3px; - padding-bottom: 3px; font-weight: bolder; - font-size: 17px; } /*1.4. Warning workspace button.*/ @@ -148,8 +144,8 @@ Main.*/ background: transparent; color:#b4befe; /*color:#f5e0dc;*/ - padding-top: 0px; - padding-bottom: 0px; + padding-top: 3px; + padding-bottom: 3px; padding-right: 0px; padding-left: 0px; border-radius: 30px; @@ -165,10 +161,10 @@ Main.*/ background-size: 300% 300%; text-shadow: rgba(0, 0, 0, 0.288) 2 2 5 2px; border-radius: 30px; - padding-top: 0px; + padding-top: 10px; padding-bottom: 0px; padding-right: 0px; - padding-left: 7px; + padding-left: 0px; border-radius: 30px; } @@ -178,10 +174,14 @@ Main.*/ box-shadow: rgba(0, 0, 0, 0.0) 2 2 5 2px; color: #7f849c; border-radius: 30px; - padding-top: 0px; + padding-top: 8px; padding-bottom: 0px; - padding-right: 0px; - padding-left: 7px; + padding-right: 4px; + padding-left: 0px; + } + +#battery.bat2 { + padding-top: 0px; } /*6. Batteries capacity monitoring module.*/ @@ -189,29 +189,41 @@ Main.*/ background: transparent; border-radius: 30px; margin-top: 0px; - padding-top: 0px; + padding-top: 8px; padding-bottom: 0px; - padding-right: 6px; + padding-right: 0px; padding-left: 0px; border-radius: 30px; } +#custom-pm { + /*color:#f5e0dc;*/ + padding-left: 0px; + } + +#network { + padding-right: 8px; + padding-bottom: 8px; + } + #custom-tempicon { padding-right: 3px; + padding-top: 0px; + padding-bottom: 2px; } #custom-btd { /*color:#f5e0dc;*/ - padding-right: 10px; - padding-top: 1px; - font-size: 15px; + padding-bottom: 8px; + padding-right: 2px; + font-size: 16px; } #custom-btc { /*color:#f5e0dc;*/ - padding-right: 6px; - padding-top: 2px; - font-size: 15px; + font-size: 16px; + padding-bottom: 4px; + padding-right: 2px; } #custom-logo { @@ -223,7 +235,7 @@ Main.*/ } #temperature { - padding-right: 0px; + padding-bottom: 8px; } /*7. Batteries charging status monitoring module.*/ @@ -240,22 +252,9 @@ Main.*/ #clock { background: transparent; padding-top: 0px; - padding-bottom: 0px; + padding-bottom: 8px; padding-right: 0px; - padding-left: 10px; - } -/*9. Network control module.*/ -#network { - background: #272744; - margin-top: 6px; - margin-bottom: 6px; - margin-left: 9px; - margin-right: 9px; - padding-top: 12px; - padding-bottom: 12px; - padding-right: 10px; - padding-left: 10px; - border-radius: 30px; + padding-left: 0px; } /*10.*/ diff --git a/Scr/1-1.png b/Scr/1-1.png deleted file mode 100644 index 33a53c3..0000000 Binary files a/Scr/1-1.png and /dev/null differ diff --git a/Scr/2-1.png b/Scr/2-1.png deleted file mode 100644 index 7852973..0000000 Binary files a/Scr/2-1.png and /dev/null differ diff --git a/Screenshots/Scr-111.png b/Screenshots/Scr-111.png new file mode 100644 index 0000000..ca6fff5 Binary files /dev/null and b/Screenshots/Scr-111.png differ diff --git a/Screenshots/Scr-112.png b/Screenshots/Scr-112.png new file mode 100644 index 0000000..3d6a903 Binary files /dev/null and b/Screenshots/Scr-112.png differ diff --git a/Screenshots/Scr-113.png b/Screenshots/Scr-113.png new file mode 100644 index 0000000..d1ca95b Binary files /dev/null and b/Screenshots/Scr-113.png differ diff --git a/Screenshots/Scr-114.png b/Screenshots/Scr-114.png new file mode 100644 index 0000000..9adaf6d Binary files /dev/null and b/Screenshots/Scr-114.png differ diff --git a/Walls/Anime/boy-0.png b/Wallpapers/Anime/boy-0.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Anime/boy-0.png rename to Wallpapers/Anime/boy-0.png diff --git a/Walls/Anime/girl-0.jpg b/Wallpapers/Anime/girl-0.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Anime/girl-0.jpg rename to Wallpapers/Anime/girl-0.jpg diff --git a/Walls/Anime/girl-1.png b/Wallpapers/Anime/girl-1.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Anime/girl-1.png rename to Wallpapers/Anime/girl-1.png diff --git a/Walls/Anime/girl-2.png b/Wallpapers/Anime/girl-2.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Anime/girl-2.png rename to Wallpapers/Anime/girl-2.png diff --git a/Walls/Anime/girl-3.png b/Wallpapers/Anime/girl-3.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Anime/girl-3.png rename to Wallpapers/Anime/girl-3.png diff --git a/Walls/Anime/girl-5.png b/Wallpapers/Anime/girl-5.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Anime/girl-5.png rename to Wallpapers/Anime/girl-5.png diff --git a/Walls/Anime/girl-6.jpg b/Wallpapers/Anime/girl-6.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Anime/girl-6.jpg rename to Wallpapers/Anime/girl-6.jpg diff --git a/Walls/Cat/Lsc/cat-lsc-0.jpg b/Wallpapers/Cat/Lsc/cat-lsc-0.jpg similarity index 100% rename from Walls/Cat/Lsc/cat-lsc-0.jpg rename to Wallpapers/Cat/Lsc/cat-lsc-0.jpg diff --git a/Walls/Cat/Lsc/cat-lsc-1.jpg b/Wallpapers/Cat/Lsc/cat-lsc-1.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Lsc/cat-lsc-1.jpg rename to Wallpapers/Cat/Lsc/cat-lsc-1.jpg diff --git a/Walls/Cat/Lsc/cat-lsc-10.png b/Wallpapers/Cat/Lsc/cat-lsc-10.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Lsc/cat-lsc-10.png rename to Wallpapers/Cat/Lsc/cat-lsc-10.png diff --git a/Walls/Cat/Lsc/cat-lsc-11.png b/Wallpapers/Cat/Lsc/cat-lsc-11.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Lsc/cat-lsc-11.png rename to Wallpapers/Cat/Lsc/cat-lsc-11.png diff --git a/Walls/Cat/Lsc/cat-lsc-12.png b/Wallpapers/Cat/Lsc/cat-lsc-12.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Lsc/cat-lsc-12.png rename to Wallpapers/Cat/Lsc/cat-lsc-12.png diff --git a/Walls/Cat/Lsc/cat-lsc-2.png b/Wallpapers/Cat/Lsc/cat-lsc-2.png similarity index 100% rename from Walls/Cat/Lsc/cat-lsc-2.png rename to Wallpapers/Cat/Lsc/cat-lsc-2.png diff --git a/Walls/Cat/Lsc/cat-lsc-4.png b/Wallpapers/Cat/Lsc/cat-lsc-4.png similarity index 100% rename from Walls/Cat/Lsc/cat-lsc-4.png rename to Wallpapers/Cat/Lsc/cat-lsc-4.png diff --git a/Walls/Cat/Lsc/cat-lsc-8.jpg b/Wallpapers/Cat/Lsc/cat-lsc-8.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Lsc/cat-lsc-8.jpg rename to Wallpapers/Cat/Lsc/cat-lsc-8.jpg diff --git a/Walls/Cat/Lsc/cat-lsc-9.jpg b/Wallpapers/Cat/Lsc/cat-lsc-9.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Lsc/cat-lsc-9.jpg rename to Wallpapers/Cat/Lsc/cat-lsc-9.jpg diff --git a/Walls/Cat/Min/grad-1.png b/Wallpapers/Cat/Min/grad-1.png similarity index 100% rename from Walls/Cat/Min/grad-1.png rename to Wallpapers/Cat/Min/grad-1.png diff --git a/Walls/Cat/Min/grad-2.png b/Wallpapers/Cat/Min/grad-2.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Min/grad-2.png rename to Wallpapers/Cat/Min/grad-2.png diff --git a/Walls/Cat/Min/grad-3.png b/Wallpapers/Cat/Min/grad-3.png similarity index 100% rename from Walls/Cat/Min/grad-3.png rename to Wallpapers/Cat/Min/grad-3.png diff --git a/Walls/Cat/Min/grad-4.png b/Wallpapers/Cat/Min/grad-4.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Min/grad-4.png rename to Wallpapers/Cat/Min/grad-4.png diff --git a/Walls/Cat/Min/grad-5.png b/Wallpapers/Cat/Min/grad-5.png similarity index 100% rename from Walls/Cat/Min/grad-5.png rename to Wallpapers/Cat/Min/grad-5.png diff --git a/Walls/Cat/Min/grad-6.png b/Wallpapers/Cat/Min/grad-6.png similarity index 100% rename from Walls/Cat/Min/grad-6.png rename to Wallpapers/Cat/Min/grad-6.png diff --git a/Walls/Cat/Min/min-0.png b/Wallpapers/Cat/Min/min-0.png similarity index 100% rename from Walls/Cat/Min/min-0.png rename to Wallpapers/Cat/Min/min-0.png diff --git a/Walls/Cat/Min/min-1.jpg b/Wallpapers/Cat/Min/min-1.jpg similarity index 100% rename from Walls/Cat/Min/min-1.jpg rename to Wallpapers/Cat/Min/min-1.jpg diff --git a/Walls/Cat/Min/min-10.png b/Wallpapers/Cat/Min/min-10.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Min/min-10.png rename to Wallpapers/Cat/Min/min-10.png diff --git a/Walls/Cat/Min/min-12.jpg b/Wallpapers/Cat/Min/min-12.jpg similarity index 100% rename from Walls/Cat/Min/min-12.jpg rename to Wallpapers/Cat/Min/min-12.jpg diff --git a/Walls/Cat/Min/min-13.jpg b/Wallpapers/Cat/Min/min-13.jpg similarity index 100% rename from Walls/Cat/Min/min-13.jpg rename to Wallpapers/Cat/Min/min-13.jpg diff --git a/Walls/Cat/Min/min-15.jpg b/Wallpapers/Cat/Min/min-15.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Min/min-15.jpg rename to Wallpapers/Cat/Min/min-15.jpg diff --git a/Walls/Cat/Min/min-16.png b/Wallpapers/Cat/Min/min-16.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Min/min-16.png rename to Wallpapers/Cat/Min/min-16.png diff --git a/Walls/Cat/Min/min-18.png b/Wallpapers/Cat/Min/min-18.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Min/min-18.png rename to Wallpapers/Cat/Min/min-18.png diff --git a/Walls/Cat/Min/min-19.png b/Wallpapers/Cat/Min/min-19.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Min/min-19.png rename to Wallpapers/Cat/Min/min-19.png diff --git a/Walls/Cat/Min/min-2.png b/Wallpapers/Cat/Min/min-2.png similarity index 100% rename from Walls/Cat/Min/min-2.png rename to Wallpapers/Cat/Min/min-2.png diff --git a/Walls/Cat/Min/min-20.png b/Wallpapers/Cat/Min/min-20.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Min/min-20.png rename to Wallpapers/Cat/Min/min-20.png diff --git a/Walls/Cat/Min/min-21.png b/Wallpapers/Cat/Min/min-21.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Min/min-21.png rename to Wallpapers/Cat/Min/min-21.png diff --git a/Walls/Cat/Min/min-22.png b/Wallpapers/Cat/Min/min-22.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Min/min-22.png rename to Wallpapers/Cat/Min/min-22.png diff --git a/Walls/Cat/Min/min-24.png b/Wallpapers/Cat/Min/min-24.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Min/min-24.png rename to Wallpapers/Cat/Min/min-24.png diff --git a/Walls/Cat/Min/min-26.png b/Wallpapers/Cat/Min/min-26.png similarity index 100% rename from Walls/Cat/Min/min-26.png rename to Wallpapers/Cat/Min/min-26.png diff --git a/Walls/Cat/Min/min-27.png b/Wallpapers/Cat/Min/min-27.png similarity index 100% rename from Walls/Cat/Min/min-27.png rename to Wallpapers/Cat/Min/min-27.png diff --git a/Walls/Cat/Min/min-28.png b/Wallpapers/Cat/Min/min-28.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Min/min-28.png rename to Wallpapers/Cat/Min/min-28.png diff --git a/Walls/Cat/Min/min-3.png b/Wallpapers/Cat/Min/min-3.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Min/min-3.png rename to Wallpapers/Cat/Min/min-3.png diff --git a/Walls/Cat/Min/min-4.png b/Wallpapers/Cat/Min/min-4.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Cat/Min/min-4.png rename to Wallpapers/Cat/Min/min-4.png diff --git a/Walls/Cat/Min/min-6.png b/Wallpapers/Cat/Min/min-6.png similarity index 100% rename from Walls/Cat/Min/min-6.png rename to Wallpapers/Cat/Min/min-6.png diff --git a/Walls/Cat/Min/min-7.png b/Wallpapers/Cat/Min/min-7.png similarity index 100% rename from Walls/Cat/Min/min-7.png rename to Wallpapers/Cat/Min/min-7.png diff --git a/Walls/Most/Lsc/lsc-0.jpg b/Wallpapers/Most/Lsc/lsc-0.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-0.jpg rename to Wallpapers/Most/Lsc/lsc-0.jpg diff --git a/Walls/Most/Lsc/lsc-1.jpg b/Wallpapers/Most/Lsc/lsc-1.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-1.jpg rename to Wallpapers/Most/Lsc/lsc-1.jpg diff --git a/Walls/Most/Lsc/lsc-11.jpg b/Wallpapers/Most/Lsc/lsc-11.jpg similarity index 100% rename from Walls/Most/Lsc/lsc-11.jpg rename to Wallpapers/Most/Lsc/lsc-11.jpg diff --git a/Walls/Most/Lsc/lsc-12.png b/Wallpapers/Most/Lsc/lsc-12.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-12.png rename to Wallpapers/Most/Lsc/lsc-12.png diff --git a/Walls/Most/Lsc/lsc-13.jpg b/Wallpapers/Most/Lsc/lsc-13.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-13.jpg rename to Wallpapers/Most/Lsc/lsc-13.jpg diff --git a/Walls/Most/Lsc/lsc-14.jpg b/Wallpapers/Most/Lsc/lsc-14.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-14.jpg rename to Wallpapers/Most/Lsc/lsc-14.jpg diff --git a/Walls/Most/Lsc/lsc-15.jpeg b/Wallpapers/Most/Lsc/lsc-15.jpeg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-15.jpeg rename to Wallpapers/Most/Lsc/lsc-15.jpeg diff --git a/Walls/Most/Lsc/lsc-16.png b/Wallpapers/Most/Lsc/lsc-16.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-16.png rename to Wallpapers/Most/Lsc/lsc-16.png diff --git a/Walls/Most/Lsc/lsc-17.jpg b/Wallpapers/Most/Lsc/lsc-17.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-17.jpg rename to Wallpapers/Most/Lsc/lsc-17.jpg diff --git a/Walls/Most/Lsc/lsc-18.jpg b/Wallpapers/Most/Lsc/lsc-18.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-18.jpg rename to Wallpapers/Most/Lsc/lsc-18.jpg diff --git a/Walls/Most/Lsc/lsc-19.jpg b/Wallpapers/Most/Lsc/lsc-19.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-19.jpg rename to Wallpapers/Most/Lsc/lsc-19.jpg diff --git a/Walls/Most/Lsc/lsc-2.jpg b/Wallpapers/Most/Lsc/lsc-2.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-2.jpg rename to Wallpapers/Most/Lsc/lsc-2.jpg diff --git a/Walls/Most/Lsc/lsc-20.jpg b/Wallpapers/Most/Lsc/lsc-20.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-20.jpg rename to Wallpapers/Most/Lsc/lsc-20.jpg diff --git a/Walls/Most/Lsc/lsc-3.jpg b/Wallpapers/Most/Lsc/lsc-3.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-3.jpg rename to Wallpapers/Most/Lsc/lsc-3.jpg diff --git a/Walls/Most/Lsc/lsc-6.png b/Wallpapers/Most/Lsc/lsc-6.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-6.png rename to Wallpapers/Most/Lsc/lsc-6.png diff --git a/Walls/Most/Lsc/lsc-7.png b/Wallpapers/Most/Lsc/lsc-7.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Lsc/lsc-7.png rename to Wallpapers/Most/Lsc/lsc-7.png diff --git a/Walls/Most/Lsc/lsc-8.png b/Wallpapers/Most/Lsc/lsc-8.png similarity index 100% rename from Walls/Most/Lsc/lsc-8.png rename to Wallpapers/Most/Lsc/lsc-8.png diff --git a/Walls/Most/Min/min-1.jpg b/Wallpapers/Most/Min/min-1.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Min/min-1.jpg rename to Wallpapers/Most/Min/min-1.jpg diff --git a/Walls/Most/Min/min-2.jpg b/Wallpapers/Most/Min/min-2.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Min/min-2.jpg rename to Wallpapers/Most/Min/min-2.jpg diff --git a/Walls/Most/Min/min-3.png b/Wallpapers/Most/Min/min-3.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Min/min-3.png rename to Wallpapers/Most/Min/min-3.png diff --git a/Walls/Most/Min/min-4.jpg b/Wallpapers/Most/Min/min-4.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Min/min-4.jpg rename to Wallpapers/Most/Min/min-4.jpg diff --git a/Walls/Most/Ntr/cl-0.jpg b/Wallpapers/Most/Ntr/cl-0.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/cl-0.jpg rename to Wallpapers/Most/Ntr/cl-0.jpg diff --git a/Walls/Most/Ntr/cl-1.jpg b/Wallpapers/Most/Ntr/cl-1.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/cl-1.jpg rename to Wallpapers/Most/Ntr/cl-1.jpg diff --git a/Walls/Most/Ntr/cl-2.jpg b/Wallpapers/Most/Ntr/cl-2.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/cl-2.jpg rename to Wallpapers/Most/Ntr/cl-2.jpg diff --git a/Walls/Most/Ntr/cl-3.jpg b/Wallpapers/Most/Ntr/cl-3.jpg similarity index 100% rename from Walls/Most/Ntr/cl-3.jpg rename to Wallpapers/Most/Ntr/cl-3.jpg diff --git a/Walls/Most/Ntr/cl-4.jpg b/Wallpapers/Most/Ntr/cl-4.jpg similarity index 100% rename from Walls/Most/Ntr/cl-4.jpg rename to Wallpapers/Most/Ntr/cl-4.jpg diff --git a/Walls/Most/Ntr/cl-5.jpg b/Wallpapers/Most/Ntr/cl-5.jpg similarity index 100% rename from Walls/Most/Ntr/cl-5.jpg rename to Wallpapers/Most/Ntr/cl-5.jpg diff --git a/Walls/Most/Ntr/cl-6.png b/Wallpapers/Most/Ntr/cl-6.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/cl-6.png rename to Wallpapers/Most/Ntr/cl-6.png diff --git a/Walls/Most/Ntr/cl-7.jpg b/Wallpapers/Most/Ntr/cl-7.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/cl-7.jpg rename to Wallpapers/Most/Ntr/cl-7.jpg diff --git a/Walls/Most/Ntr/cl-8.jpg b/Wallpapers/Most/Ntr/cl-8.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/cl-8.jpg rename to Wallpapers/Most/Ntr/cl-8.jpg diff --git a/Wallpapers/Most/Ntr/cl-9.png b/Wallpapers/Most/Ntr/cl-9.png new file mode 100644 index 0000000..6ed281a Binary files /dev/null and b/Wallpapers/Most/Ntr/cl-9.png differ diff --git a/Walls/Most/Ntr/flw-1.png b/Wallpapers/Most/Ntr/flw-1.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/flw-1.png rename to Wallpapers/Most/Ntr/flw-1.png diff --git a/Walls/Most/Ntr/fuji-2.jpg b/Wallpapers/Most/Ntr/fuji-2.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/fuji-2.jpg rename to Wallpapers/Most/Ntr/fuji-2.jpg diff --git a/Walls/Most/Ntr/fuji-3.jpg b/Wallpapers/Most/Ntr/fuji-3.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/fuji-3.jpg rename to Wallpapers/Most/Ntr/fuji-3.jpg diff --git a/Walls/Most/Ntr/fuji-4.jpg b/Wallpapers/Most/Ntr/fuji-4.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/fuji-4.jpg rename to Wallpapers/Most/Ntr/fuji-4.jpg diff --git a/Walls/Most/Ntr/fuji-5.png b/Wallpapers/Most/Ntr/fuji-5.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/fuji-5.png rename to Wallpapers/Most/Ntr/fuji-5.png diff --git a/Walls/Most/Ntr/mnt-0.jpg b/Wallpapers/Most/Ntr/mnt-0.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/mnt-0.jpg rename to Wallpapers/Most/Ntr/mnt-0.jpg diff --git a/Walls/Most/Ntr/mnt-1.jpg b/Wallpapers/Most/Ntr/mnt-1.jpg similarity index 100% rename from Walls/Most/Ntr/mnt-1.jpg rename to Wallpapers/Most/Ntr/mnt-1.jpg diff --git a/Walls/Most/Ntr/mnt-2.jpg b/Wallpapers/Most/Ntr/mnt-2.jpg similarity index 100% rename from Walls/Most/Ntr/mnt-2.jpg rename to Wallpapers/Most/Ntr/mnt-2.jpg diff --git a/Walls/Most/Ntr/mnt-4.png b/Wallpapers/Most/Ntr/mnt-4.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/mnt-4.png rename to Wallpapers/Most/Ntr/mnt-4.png diff --git a/Walls/Most/Ntr/mnt-5.jpg b/Wallpapers/Most/Ntr/mnt-5.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/mnt-5.jpg rename to Wallpapers/Most/Ntr/mnt-5.jpg diff --git a/Walls/Most/Ntr/mnt-7.jpg b/Wallpapers/Most/Ntr/mnt-7.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/mnt-7.jpg rename to Wallpapers/Most/Ntr/mnt-7.jpg diff --git a/Walls/Most/Ntr/mnt-8.jpg b/Wallpapers/Most/Ntr/mnt-8.jpg similarity index 100% rename from Walls/Most/Ntr/mnt-8.jpg rename to Wallpapers/Most/Ntr/mnt-8.jpg diff --git a/Walls/Most/Ntr/roses-0.jpg b/Wallpapers/Most/Ntr/roses-0.jpg similarity index 100% rename from Walls/Most/Ntr/roses-0.jpg rename to Wallpapers/Most/Ntr/roses-0.jpg diff --git a/Walls/Most/Ntr/roses-1.png b/Wallpapers/Most/Ntr/roses-1.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/roses-1.png rename to Wallpapers/Most/Ntr/roses-1.png diff --git a/Walls/Most/Ntr/sakura-1.jpg b/Wallpapers/Most/Ntr/sakura-1.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/sakura-1.jpg rename to Wallpapers/Most/Ntr/sakura-1.jpg diff --git a/Walls/Most/Ntr/sakura-10.jpg b/Wallpapers/Most/Ntr/sakura-10.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/sakura-10.jpg rename to Wallpapers/Most/Ntr/sakura-10.jpg diff --git a/Walls/Most/Ntr/sakura-12.png b/Wallpapers/Most/Ntr/sakura-12.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/sakura-12.png rename to Wallpapers/Most/Ntr/sakura-12.png diff --git a/Walls/Most/Ntr/sakura-13.png b/Wallpapers/Most/Ntr/sakura-13.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/sakura-13.png rename to Wallpapers/Most/Ntr/sakura-13.png diff --git a/Walls/Most/Ntr/sakura-14.jpg b/Wallpapers/Most/Ntr/sakura-14.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/sakura-14.jpg rename to Wallpapers/Most/Ntr/sakura-14.jpg diff --git a/Walls/Most/Ntr/sakura-3.jpg b/Wallpapers/Most/Ntr/sakura-3.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/sakura-3.jpg rename to Wallpapers/Most/Ntr/sakura-3.jpg diff --git a/Walls/Most/Ntr/sakura-6.jpg b/Wallpapers/Most/Ntr/sakura-6.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/sakura-6.jpg rename to Wallpapers/Most/Ntr/sakura-6.jpg diff --git a/Walls/Most/Ntr/sakura-7.jpg b/Wallpapers/Most/Ntr/sakura-7.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/sakura-7.jpg rename to Wallpapers/Most/Ntr/sakura-7.jpg diff --git a/Walls/Most/Ntr/sakura-8.jpg b/Wallpapers/Most/Ntr/sakura-8.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/sakura-8.jpg rename to Wallpapers/Most/Ntr/sakura-8.jpg diff --git a/Walls/Most/Ntr/sakura-9.jpg b/Wallpapers/Most/Ntr/sakura-9.jpg old mode 100644 new mode 100755 similarity index 100% rename from Walls/Most/Ntr/sakura-9.jpg rename to Wallpapers/Most/Ntr/sakura-9.jpg diff --git a/Walls/Unc/estro.png b/Wallpapers/Unc/estro.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Unc/estro.png rename to Wallpapers/Unc/estro.png diff --git a/Walls/Unc/void.png b/Wallpapers/Unc/void.png old mode 100644 new mode 100755 similarity index 100% rename from Walls/Unc/void.png rename to Wallpapers/Unc/void.png diff --git a/Walls/Cat/Min/min-25.png b/Walls/Cat/Min/min-25.png deleted file mode 100644 index ace8c2c..0000000 Binary files a/Walls/Cat/Min/min-25.png and /dev/null differ