diff --git a/.bashrc b/.bashrc index ed8ab83..a126089 100644 --- a/.bashrc +++ b/.bashrc @@ -16,10 +16,15 @@ alias tasks='bpytop' alias viruscheck='sudo clamscan -r /' alias Docs="cd ~/Documents && nvim" alias Settings="cd ~/.config/hypr && nvim" +alias spot="ncspot" export XDG_CURRENT_DESKTOP=Hyprland export OZONE_PLATFORM=wayland export ENABLE_FEATURES=UseOzonePlatform export NVM_DIR="$HOME/.nvm" -export WALLPAPER_PATH="/home/$USER/wallpapers/walls/1358310.png" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm PS1='[\u@\h \W]\$ ' + +export PATH=$PATH:/home/eli/.spicetify + +# Created by `pipx` on 2025-01-06 05:43:18 +export PATH="$PATH:/home/eli/.local/bin" diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index bf4f5fe..18d1dc0 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -1,100 +1,58 @@ - -# ####################################################################################### -# AUTOGENERATED HYPR CONFIG. -# PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT, -# OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS. -# ####################################################################################### - -autogenerated = 0 # remove this line to remove the warning - -# This is an example Hyprland config file. -# Refer to the wiki for more information. -# https://wiki.hyprland.org/Configuring/Configuring-Hyprland/ - -# Please note not all available settings / options are set here. -# For a full list, see the wiki - # You can split this configuration into multiple files # Create your files separately and then link them to this file like this: # source = ~/.config/hypr/myColors.conf source = /home/$USER/.cache/wal/colors-hyprland - ################ ### MONITORS ### ################ - # See https://wiki.hyprland.org/Configuring/Monitors/ monitor = DP-1, 2560x1440@165, 0x0, 1 - ################### ### MY PROGRAMS ### ################### - # See https://wiki.hyprland.org/Configuring/Keywords/ - -# Set programs that you use $terminal = kitty $fileManager = GTK_THEME=Adwaita:dark thunar - - $menu = wofi --show drun - ################# ### AUTOSTART ### ################# - -# Autostart necessary processes (like notifications daemons, status bars, etc.) -# Or execute your favorite apps at launch like this: - -# exec-once = $terminal -# exec-once = nm-applet & exec-once = hypridle exec-once = waybar exec-once = swww-daemon exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP - exec-once = swaync -#exec-once = gBar bar 0 ############################# ### ENVIRONMENT VARIABLES ### ############################# - # See https://wiki.hyprland.org/Configuring/Environment-variables/ - env = XCURSOR_THEME,Bibata-Modern-Classic env = XCURSOR_SIZE,12 - - ##################### ### LOOK AND FEEL ### ##################### # Refer to https://wiki.hyprland.org/Configuring/Variables/ - # https://wiki.hyprland.org/Configuring/Variables/#general general { - gaps_in = 1.8 + gaps_in = 2 gaps_out = 15 - border_size = 1 - # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors - col.active_border = rgba(ffffff00) $color9 + border_size = 0 + col.active_border = $color9 col.inactive_border = rgba(00000000) resize_on_border = true allow_tearing = false layout = dwindle } - - # https://wiki.hyprland.org/Configuring/Variables/#decoration decoration { - rounding = 3 - active_opacity = 0.7 - inactive_opacity = 0.5 + rounding = 4 + active_opacity = 0.8 + inactive_opacity = 0.7 fullscreen_opacity = 1 - blur { enabled = true - size = 8 - passes = 3 + size = 3 + passes = 5 new_optimizations = true ignore_opacity = true xray = false @@ -104,55 +62,36 @@ decoration { blurls = swaync-control-center blurls = swaync-notification-window } - shadow { enabled = false - range = 30 - render_power = 3 - color = 0x66000000 + range = 10 + render_power = 5 + color = $color0 + ignore_window = true } } - animations { enabled = true - # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - - bezier = myBezier, 1,.5,.16,1.3 - - animation = windows, 1, 4, myBezier - animation = windowsOut, 1, 5, default, popin 80% - animation = border, 1, 10, default bezier = linear, 0,0,1,1 - animation = borderangle, 1, 60, linear, loop - animation = fade, 1, 2, default - animation = workspaces, 1, 5, default - animation = specialWorkspace, 1, 6, default, slidefadevert +50% + bezier = swirl, 0.04, 1, 0.2, 1.2 + animation = windows, 1, 4, swirl, popin 0% + animation = windowsOut, 1, 3, linear, popin 0% + animation = fade, 1, 2, linear + animation = workspaces, 1, 2, linear + animation = specialWorkspace, 1, 5, swirl, slidefadevert -50% } - - -# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more dwindle { - pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = true # You probably want this + pseudotile = true # Master switch for pseudotiling. mainMod + P + preserve_split = true } - -# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more -master { - #new_is_master = true -} - -# https://wiki.hyprland.org/Configuring/Variables/#misc misc { force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers - disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :( + disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :( } - - ############# ### INPUT ### ############# - # https://wiki.hyprland.org/Configuring/Variables/#input input { kb_layout = us @@ -160,51 +99,43 @@ input { kb_model = kb_options = kb_rules = - follow_mouse = 1 - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. - + sensitivity = 0 touchpad { natural_scroll = true } } - # https://wiki.hyprland.org/Configuring/Variables/#gestures gestures { workspace_swipe = true + workspace_swipe_distance = 300 + workspace_swipe_cancel_ratio = .05 + workspace_swipe_min_speed_to_force = 0 } - -# Example per-device config # See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more device { name = epic-mouse-v1 - sensitivity = -0.5 + sensitivity = 0 } - - #################### ### KEYBINDINGSS ### #################### - # See https://wiki.hyprland.org/Configuring/Keywords/ -$mainMod = SUPER # Sets "Windows" key as main modifier - +$mainMod = SUPER # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more bind = $mainMod, Q, exec, $terminal bind = $mainMod, B, killactive, bind = $mainMod, E, exec, $fileManager bind = $mainMod, V, togglefloating bind = $mainMod, R, exec, $menu -bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod, P, pseudo, +bind = $mainMod, J, togglesplit, bind = $mainMod, F, fullscreen # Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l bind = $mainMod, right, movefocus, r bind = $mainMod, up, movefocus, u bind = $mainMod, down, movefocus, d - # Switch workspaces with mainMod + [0-9] bind = $mainMod, 1, workspace, 1 bind = $mainMod, 2, workspace, 2 @@ -216,7 +147,6 @@ bind = $mainMod, 7, workspace, 7 bind = $mainMod, 8, workspace, 8 bind = $mainMod, 9, workspace, 9 bind = $mainMod, 0, workspace, 10 - # Move active window to a workspace with mainMod + SHIFT + [0-9] bind = $mainMod SHIFT, 1, movetoworkspace, 1 bind = $mainMod SHIFT, 2, movetoworkspace, 2 @@ -239,55 +169,31 @@ bind = CTRL, Print, exec, hyprshot -m region -o ~/Screenshots/ bind = , Print, exec, hyprshot -m window -o ~/Screenshots/ bind = ALT, Print, exec, hyprshot -m active -m output -o ~/Screenshots/ bind = $mainMod, l, exec, hyprlock - -# Example special workspace (scratchpad) bind = $mainMod, S, togglespecialworkspace, magic bind = $mainMod SHIFT, S, movetoworkspace, special:magic - -# Scroll through existing workspaces with mainMod + scroll - -# Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow -# Sound config -#bind = $mainMod, F8, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle && gBar audio -#bind = $mainMod, F9, exec, gBar audio && pactl set-sink-volume @DEFAULT_SINK@ -5% -#bind = $mainMod, F10, exec,gBar audio && pactl set-sink-volume @DEFAULT_SINK@ +5% bind = ALT, TAB, exec, wlogout #bind = CTRL, ESCAPE, exec, gksu bind = ALT, w, exec, ~/.config/hypr/wallpaper.sh bind = ALT, a, exec, ~/.config/waybar/refresh.sh bind = ALT, r, exec, ~/.config/swaync/refresh.sh +bind = $mainMod, M, exit, ############################## ### WINDOWS AND WORKSPACES ### ############################## - # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules - -bind = $mainMod, M, exit, -# Example windowrule v1 -#windowrule = float, ^(kitty)$ -#layerrule = blur, waybar -#layerrule = blur, wofi -# Example windowrule v2 - - - layerrule = blur, wofi layerrule = ignorezero, wofi layerrule = ignorealpha 0.5, wofi - layerrule = blur, waybar layerrule = ignorezero, waybar layerrule = ignorealpha 0.5, waybar - -#Swaync layerrule = blur, swaync-control-center layerrule = blur, swaync-notification-window layerrule = ignorezero, swaync-control-center layerrule = ignorezero, swaync-notification-window layerrule = ignorealpha 0.5, swaync-control-center layerrule = ignorealpha 0.5, swaync-notification-window -#windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ -windowrulev2 = suppressevent maximize, class:.* # You'll probably like this. +#windowrulev2 = suppressevent maximize, class:.* diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf index 74216b2..4d132a0 100644 --- a/.config/hypr/hyprlock.conf +++ b/.config/hypr/hyprlock.conf @@ -14,14 +14,14 @@ input-field { dots_rounding = 4 dots_spacing = .5 dots_fase_time = 300 - inner_color = rgba(100,100,100,.5) # no fill - outer_color = rgb(30,30,30,1) - check_color= rgba(30,30,30,1) - fail_color= rgba(30,30,30,1) + inner_color = $backgroundCol # no fill + outer_color = $backgroundCol $backgroundCol + check_color= $backgroundCol $backgroundCol + fail_color= $backgroundCol $backgroundCol font_color = $color9 font_family = CodeNewRoman Nerd Font Propo fade_on_empty = false - shadow_color = rgba(20,20,20,.5) + shadow_color = rgba(0,0,0,0.5) shadow_passes = 1 shadow_size = 5 rounding = 20 diff --git a/.config/hypr/obscure-scripts/spotify.sh b/.config/hypr/obscure-scripts/spotify.sh new file mode 100755 index 0000000..63af9e9 --- /dev/null +++ b/.config/hypr/obscure-scripts/spotify.sh @@ -0,0 +1,32 @@ +ACCENT=$(jq -r '.colors.color6' ~/.cache/wal/colors.json | sed 's/#//') +ACCENT_ACTIVE=$(jq -r '.colors.color1' ~/.cache/wal/colors.json | sed 's/#//') +ACCENT_INACTIVE=$(jq -r '.colors.color9' ~/.cache/wal/colors.json | sed 's/#//') +BANNER=$(jq -r '.colors.color4' ~/.cache/wal/colors.json | sed 's/#//') +BORDER_ACTIVE=$(jq -r '.colors.color4' ~/.cache/wal/colors.json | sed 's/#//') +BORDER_INACTIVE=$(jq -r '.colors.color12' ~/.cache/wal/colors.json | sed 's/#//') +HEADER=$(jq -r '.colors.color6' ~/.cache/wal/colors.json | sed 's/#//') +HIGHLIGHT=$(jq -r '.colors.color7' ~/.cache/wal/colors.json | sed 's/#//') +MAIN=$(jq -r '.colors.color0' ~/.cache/wal/colors.json | sed 's/#//') +NOTIFICATION=$(jq -r '.colors.color10' ~/.cache/wal/colors.json | sed 's/#//') +NOTIFICATION_ERROR=$(jq -r '.colors.color12' ~/.cache/wal/colors.json | sed 's/#//') +SUBTEXT=$(jq -r '.colors.color12' ~/.cache/wal/colors.json | sed 's/#//') +TEXT=$(jq -r '.colors.color15' ~/.cache/wal/colors.json | sed 's/#//') + +# Apply these colors to Spicetify theme's color.ini file +sed -i "s/accent = .*/accent = $ACCENT/" ~/.config/spicetify/Themes/themefr/color.ini +sed -i "s/accent-active = .*/accent-active = $ACCENT_ACTIVE/" ~/.config/spicetify/Themes/themefr/color.ini +sed -i "s/accent-inactive = .*/accent-inactive = $ACCENT_INACTIVE/" ~/.config/spicetify/Themes/themefr/color.ini +sed -i "s/banner = .*/banner = $BANNER/" ~/.config/spicetify/Themes/themefr/color.ini +sed -i "s/border-active = .*/border-active = $BORDER_ACTIVE/" ~/.config/spicetify/Themes/themefr/color.ini +sed -i "s/border-inactive = .*/border-inactive = $BORDER_INACTIVE/" ~/.config/spicetify/Themes/themefr/color.ini +sed -i "s/header = .*/header = $HEADER/" ~/.config/spicetify/Themes/themefr/color.ini +sed -i "s/highlight = .*/highlight = $HIGHLIGHT/" ~/.config/spicetify/Themes/themefr/color.ini +sed -i "s/main = .*/main = $MAIN/" ~/.config/spicetify/Themes/themefr/color.ini +sed -i "s/notification = .*/notification = $NOTIFICATION/" ~/.config/spicetify/Themes/themefr/color.ini +sed -i "s/notification-error = .*/notification-error = $NOTIFICATION_ERROR/" ~/.config/spicetify/Themes/themefr/color.ini +sed -i "s/subtext = .*/subtext = $SUBTEXT/" ~/.config/spicetify/Themes/themefr/color.ini +sed -i "s/text = .*/text = $TEXT/" ~/.config/spicetify/Themes/themefr/color.ini + +spicetify apply + + diff --git a/.config/kitty/current-theme.conf b/.config/kitty/current-theme.conf index a6c4c5d..cc20ddd 100644 --- a/.config/kitty/current-theme.conf +++ b/.config/kitty/current-theme.conf @@ -1,30 +1,30 @@ -foreground #c2c2c2 -background #0d0d0d +foreground #c0c1c2 +background #06090C background_opacity 1.0 -cursor #c2c2c2 +cursor #c0c1c2 -active_tab_foreground #0d0d0d -active_tab_background #c2c2c2 -inactive_tab_foreground #c2c2c2 -inactive_tab_background #0d0d0d +active_tab_foreground #06090C +active_tab_background #c0c1c2 +inactive_tab_foreground #c0c1c2 +inactive_tab_background #06090C -active_border_color #c2c2c2 -inactive_border_color #0d0d0d -bell_border_color #942436 +active_border_color #c0c1c2 +inactive_border_color #06090C +bell_border_color #2a3e4b -color0 #0d0d0d -color8 #6a5757 -color1 #942436 -color9 #C63049 -color2 #5b5e60 -color10 #7A7E81 -color3 #965b63 -color11 #C87A85 -color4 #5e6163 -color12 #7E8285 -color5 #696c6f -color13 #8D9195 -color6 #747779 -color14 #9B9FA2 -color7 #978c8c -color15 #c2c2c2 +color0 #06090C +color8 #555f68 +color1 #2a3e4b +color9 #385365 +color2 #393b3f +color10 #4D4F54 +color3 #484c4e +color11 #606668 +color4 #6f5143 +color12 #946C5A +color5 #68655a +color13 #8B8778 +color6 #596765 +color14 #778A87 +color7 #899195 +color15 #c0c1c2 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 39b7aed..3794f19 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -16,6 +16,55 @@ require("vim-options") require("lazy").setup("plugins") vim.opt.termguicolors = true local pywal = require('pywal') - pywal.setup() +require('gitsigns').setup { + signs = { + add = { text = '┃' }, + change = { text = '┃' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + untracked = { text = '┆' }, + }, + signs_staged = { + add = { text = '┃' }, + change = { text = '┃' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + untracked = { text = '┆' }, + }, + signs_staged_enable = true, + signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` + numhl = false, -- Toggle with `:Gitsigns toggle_numhl` + linehl = false, -- Toggle with `:Gitsigns toggle_linehl` + word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` + watch_gitdir = { + follow_files = true + }, + auto_attach = true, + attach_to_untracked = false, + current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` + current_line_blame_opts = { + virt_text = true, + virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' + delay = 1000, + ignore_whitespace = false, + virt_text_priority = 100, + use_focus = true, + }, + current_line_blame_formatter = ', - ', + sign_priority = 6, + update_debounce = 100, + status_formatter = nil, -- Use default + max_file_length = 40000, -- Disable if file is longer than this (in lines) + preview_config = { + -- Options passed to nvim_open_win + border = 'single', + style = 'minimal', + relative = 'cursor', + row = 0, + col = 1 + }, +} diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 2f9b488..f4bbdb0 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -4,6 +4,7 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, + "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, diff --git a/.config/nvim/lua/plugins/colors.lua b/.config/nvim/lua/plugins/colors.lua index 333b844..69e1053 100644 --- a/.config/nvim/lua/plugins/colors.lua +++ b/.config/nvim/lua/plugins/colors.lua @@ -1,4 +1,3 @@ return { { 'AlphaTechnolog/pywal.nvim', name = 'pywal' } } - diff --git a/.config/nvim/lua/plugins/git.lua b/.config/nvim/lua/plugins/git.lua new file mode 100644 index 0000000..b7077f4 --- /dev/null +++ b/.config/nvim/lua/plugins/git.lua @@ -0,0 +1,3 @@ +return { + "lewis6991/gitsigns.nvim" +} diff --git a/.config/swaync/style.css b/.config/swaync/style.css index e42f6ed..33c156e 100644 --- a/.config/swaync/style.css +++ b/.config/swaync/style.css @@ -321,14 +321,14 @@ trough { trough highlight { padding: 5px; - background: alpha(@mycolor,.5); + background: @mycolor; border-radius: 20px; box-shadow: 0px 0px 5px rgba(0, 0, 0, .5); transition: all .7s ease; } trough highlight:hover { padding: 5px; - background: alpha(@mycolor,.5); + background: @mycolor; border-radius: 20px; box-shadow: 0px 0px 5px rgba(0, 0, 0, 1); transition: all .7s ease; diff --git a/.config/waybar/config b/.config/waybar/config index f3ee72d..2832ffb 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -30,9 +30,7 @@ "tooltip-format": "{calendar}", "calendar": { "format": { - "months": "{}", - "weekdays": "{}", - "today": "{}" + "today": "{}" } }, "actions": { diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 0a00d28..963dc1b 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -29,11 +29,12 @@ window#waybar{ box-shadow: 0px 0px 2px rgba(0, 0, 0, .5); } tooltip { - background:rgb(50,50,50) + background:@background; + color: @color7; } #clock:hover, #custom-pacman:hover, #custom-notification:hover,#bluetooth:hover,#network:hover,#battery:hover, #cpu:hover,#memory:hover,#temperature:hover{ transition: all .3s ease; - color:@color0; + color:@color9; } #custom-notification { padding: 0px 5px; diff --git a/.config/wofi/style.css b/.config/wofi/style.css index d7b1c09..5dff271 100644 --- a/.config/wofi/style.css +++ b/.config/wofi/style.css @@ -17,7 +17,8 @@ window { padding: 20px; border-radius: 10px; background-color: alpha(@background,.5); - animation: fadeIn .5s ease-in-out; + + } /* Slide In */ @keyframes slideIn { @@ -35,19 +36,11 @@ window { padding: 5px; border: none; background-color: @base; - animation: slideIn 1s ease-in-out; + animation: slideIn 1.5s ease-in-out; } /* Fade In */ -@keyframes fadeIn{ - 0% { - border-radius: 100px; - } - 100% { - border-radius: 10px; - } -} @@ -57,6 +50,7 @@ window { border-radius: .5em; border: none background-color: @base; + } /* Scroll */ @@ -65,7 +59,7 @@ window { padding: 30px; border: none; background-color: @base; - animation: fadeIn .8s ease-in-out; + } /* Input */ diff --git a/wallpapers/walls/296373.jpg b/wallpapers/walls-old/296373.jpg similarity index 100% rename from wallpapers/walls/296373.jpg rename to wallpapers/walls-old/296373.jpg diff --git a/wallpapers/walls/IMG_2551.JPG b/wallpapers/walls-old/IMG_2551.JPG similarity index 100% rename from wallpapers/walls/IMG_2551.JPG rename to wallpapers/walls-old/IMG_2551.JPG diff --git a/wallpapers/walls/rs6.jpg b/wallpapers/walls-old/rs6.jpg similarity index 100% rename from wallpapers/walls/rs6.jpg rename to wallpapers/walls-old/rs6.jpg diff --git a/wallpapers/walls/slammed.jpg b/wallpapers/walls-old/slammed.jpg similarity index 100% rename from wallpapers/walls/slammed.jpg rename to wallpapers/walls-old/slammed.jpg diff --git a/wallpapers/walls/stairs.jpg b/wallpapers/walls-old/stairs.jpg similarity index 100% rename from wallpapers/walls/stairs.jpg rename to wallpapers/walls-old/stairs.jpg diff --git a/wallpapers/walls/wp11031060-2590091791.jpg b/wallpapers/walls-old/wp11031060-2590091791.jpg similarity index 100% rename from wallpapers/walls/wp11031060-2590091791.jpg rename to wallpapers/walls-old/wp11031060-2590091791.jpg diff --git a/wallpapers/walls/minimalist-mountains-green-4k-a3-2992761740.jpg b/wallpapers/walls/minimalist-mountains-green-4k-a3-2992761740.jpg new file mode 100644 index 0000000..e871cce Binary files /dev/null and b/wallpapers/walls/minimalist-mountains-green-4k-a3-2992761740.jpg differ diff --git a/wallpapers/walls/pexels-alex-qian-1180283-4914160.jpg b/wallpapers/walls/pexels-alex-qian-1180283-4914160.jpg new file mode 100644 index 0000000..e5ce3f3 Binary files /dev/null and b/wallpapers/walls/pexels-alex-qian-1180283-4914160.jpg differ diff --git a/wallpapers/walls/pexels-vladalex94-1402787.jpg b/wallpapers/walls/pexels-vladalex94-1402787.jpg new file mode 100644 index 0000000..b954599 Binary files /dev/null and b/wallpapers/walls/pexels-vladalex94-1402787.jpg differ diff --git a/wallpapers/walls/wp7558808-401434860.png b/wallpapers/walls/wp7558808-401434860.png new file mode 100644 index 0000000..1c5975b Binary files /dev/null and b/wallpapers/walls/wp7558808-401434860.png differ diff --git a/wallpapers/walls3/a_black_and_white_image_of_a_room.jpeg b/wallpapers/walls1/a_black_and_white_image_of_a_room.jpeg similarity index 100% rename from wallpapers/walls3/a_black_and_white_image_of_a_room.jpeg rename to wallpapers/walls1/a_black_and_white_image_of_a_room.jpeg diff --git a/wallpapers/walls3/sand.jpg b/wallpapers/walls1/sand.jpg similarity index 100% rename from wallpapers/walls3/sand.jpg rename to wallpapers/walls1/sand.jpg diff --git a/wallpapers/walls3/wallpaper1.jpg b/wallpapers/walls1/wallpaper1.jpg similarity index 100% rename from wallpapers/walls3/wallpaper1.jpg rename to wallpapers/walls1/wallpaper1.jpg diff --git a/wallpapers/walls3/wallpaper10.jpg b/wallpapers/walls1/wallpaper10.jpg similarity index 100% rename from wallpapers/walls3/wallpaper10.jpg rename to wallpapers/walls1/wallpaper10.jpg diff --git a/wallpapers/walls3/wallpaper11.jpg b/wallpapers/walls1/wallpaper11.jpg similarity index 100% rename from wallpapers/walls3/wallpaper11.jpg rename to wallpapers/walls1/wallpaper11.jpg diff --git a/wallpapers/walls3/wallpaper12.jpg b/wallpapers/walls1/wallpaper12.jpg similarity index 100% rename from wallpapers/walls3/wallpaper12.jpg rename to wallpapers/walls1/wallpaper12.jpg diff --git a/wallpapers/walls3/wallpaper13.jpg b/wallpapers/walls1/wallpaper13.jpg similarity index 100% rename from wallpapers/walls3/wallpaper13.jpg rename to wallpapers/walls1/wallpaper13.jpg diff --git a/wallpapers/walls3/wallpaper14.jpg b/wallpapers/walls1/wallpaper14.jpg similarity index 100% rename from wallpapers/walls3/wallpaper14.jpg rename to wallpapers/walls1/wallpaper14.jpg diff --git a/wallpapers/walls3/wallpaper16.jpg b/wallpapers/walls1/wallpaper16.jpg similarity index 100% rename from wallpapers/walls3/wallpaper16.jpg rename to wallpapers/walls1/wallpaper16.jpg diff --git a/wallpapers/walls3/wallpaper17.jpg b/wallpapers/walls1/wallpaper17.jpg similarity index 100% rename from wallpapers/walls3/wallpaper17.jpg rename to wallpapers/walls1/wallpaper17.jpg diff --git a/wallpapers/walls3/wallpaper18.jpg b/wallpapers/walls1/wallpaper18.jpg similarity index 100% rename from wallpapers/walls3/wallpaper18.jpg rename to wallpapers/walls1/wallpaper18.jpg diff --git a/wallpapers/walls3/wallpaper19.jpg b/wallpapers/walls1/wallpaper19.jpg similarity index 100% rename from wallpapers/walls3/wallpaper19.jpg rename to wallpapers/walls1/wallpaper19.jpg diff --git a/wallpapers/walls3/wallpaper2.jpg b/wallpapers/walls1/wallpaper2.jpg similarity index 100% rename from wallpapers/walls3/wallpaper2.jpg rename to wallpapers/walls1/wallpaper2.jpg diff --git a/wallpapers/walls3/wallpaper21.jpg b/wallpapers/walls1/wallpaper21.jpg similarity index 100% rename from wallpapers/walls3/wallpaper21.jpg rename to wallpapers/walls1/wallpaper21.jpg diff --git a/wallpapers/walls3/wallpaper22.jpg b/wallpapers/walls1/wallpaper22.jpg similarity index 100% rename from wallpapers/walls3/wallpaper22.jpg rename to wallpapers/walls1/wallpaper22.jpg diff --git a/wallpapers/walls3/wallpaper23.jpg b/wallpapers/walls1/wallpaper23.jpg similarity index 100% rename from wallpapers/walls3/wallpaper23.jpg rename to wallpapers/walls1/wallpaper23.jpg diff --git a/wallpapers/walls3/wallpaper3.jpg b/wallpapers/walls1/wallpaper3.jpg similarity index 100% rename from wallpapers/walls3/wallpaper3.jpg rename to wallpapers/walls1/wallpaper3.jpg diff --git a/wallpapers/walls3/wallpaper4.jpg b/wallpapers/walls1/wallpaper4.jpg similarity index 100% rename from wallpapers/walls3/wallpaper4.jpg rename to wallpapers/walls1/wallpaper4.jpg diff --git a/wallpapers/walls3/wallpaper5.jpg b/wallpapers/walls1/wallpaper5.jpg similarity index 100% rename from wallpapers/walls3/wallpaper5.jpg rename to wallpapers/walls1/wallpaper5.jpg diff --git a/wallpapers/walls3/wallpaper6.jpg b/wallpapers/walls1/wallpaper6.jpg similarity index 100% rename from wallpapers/walls3/wallpaper6.jpg rename to wallpapers/walls1/wallpaper6.jpg diff --git a/wallpapers/walls3/wallpaper7.jpg b/wallpapers/walls1/wallpaper7.jpg similarity index 100% rename from wallpapers/walls3/wallpaper7.jpg rename to wallpapers/walls1/wallpaper7.jpg diff --git a/wallpapers/walls3/wallpaper8.jpg b/wallpapers/walls1/wallpaper8.jpg similarity index 100% rename from wallpapers/walls3/wallpaper8.jpg rename to wallpapers/walls1/wallpaper8.jpg diff --git a/wallpapers/walls3/wallpaper9.jpg b/wallpapers/walls1/wallpaper9.jpg similarity index 100% rename from wallpapers/walls3/wallpaper9.jpg rename to wallpapers/walls1/wallpaper9.jpg diff --git a/wallpapers/walls1/wp5187908-2044436229.jpg b/wallpapers/walls1/wp5187908-2044436229.jpg new file mode 100644 index 0000000..343a9b5 Binary files /dev/null and b/wallpapers/walls1/wp5187908-2044436229.jpg differ diff --git a/wallpapers/walls2/1337527.png b/wallpapers/walls2/1337527.png deleted file mode 100644 index f1ee20c..0000000 Binary files a/wallpapers/walls2/1337527.png and /dev/null differ diff --git a/wallpapers/walls2/1358310.png b/wallpapers/walls2/1358310.png deleted file mode 100644 index 142a346..0000000 Binary files a/wallpapers/walls2/1358310.png and /dev/null differ diff --git a/wallpapers/walls2/296373.jpg b/wallpapers/walls2/296373.jpg deleted file mode 100644 index 1a7176d..0000000 Binary files a/wallpapers/walls2/296373.jpg and /dev/null differ diff --git a/wallpapers/walls2/568499.jpg b/wallpapers/walls2/568499.jpg deleted file mode 100644 index 6ab74f3..0000000 Binary files a/wallpapers/walls2/568499.jpg and /dev/null differ diff --git a/wallpapers/walls2/IMG_2543.png b/wallpapers/walls2/IMG_2543.png deleted file mode 100644 index 0260a11..0000000 Binary files a/wallpapers/walls2/IMG_2543.png and /dev/null differ diff --git a/wallpapers/walls2/IMG_2551.JPG b/wallpapers/walls2/IMG_2551.JPG deleted file mode 100644 index ea6ba93..0000000 Binary files a/wallpapers/walls2/IMG_2551.JPG and /dev/null differ diff --git a/wallpapers/walls2/evgeny-tchebotarev-aiwuLjLPFnU-unsplash.jpg b/wallpapers/walls2/evgeny-tchebotarev-aiwuLjLPFnU-unsplash.jpg deleted file mode 100644 index b9009b4..0000000 Binary files a/wallpapers/walls2/evgeny-tchebotarev-aiwuLjLPFnU-unsplash.jpg and /dev/null differ diff --git a/wallpapers/walls2/flowers.png b/wallpapers/walls2/flowers.png deleted file mode 100644 index 3a2e76f..0000000 Binary files a/wallpapers/walls2/flowers.png and /dev/null differ diff --git a/wallpapers/walls2/goodview.jpg b/wallpapers/walls2/goodview.jpg deleted file mode 100644 index d667dbe..0000000 Binary files a/wallpapers/walls2/goodview.jpg and /dev/null differ diff --git a/wallpapers/walls2/lock.jpg b/wallpapers/walls2/lock.jpg deleted file mode 100644 index 4d9675d..0000000 Binary files a/wallpapers/walls2/lock.jpg and /dev/null differ diff --git a/wallpapers/walls2/rs6.jpg b/wallpapers/walls2/rs6.jpg deleted file mode 100644 index 552c8ee..0000000 Binary files a/wallpapers/walls2/rs6.jpg and /dev/null differ diff --git a/wallpapers/walls2/slammed.jpg b/wallpapers/walls2/slammed.jpg deleted file mode 100644 index c288d7d..0000000 Binary files a/wallpapers/walls2/slammed.jpg and /dev/null differ diff --git a/wallpapers/walls2/stairs.jpg b/wallpapers/walls2/stairs.jpg deleted file mode 100644 index 17fa814..0000000 Binary files a/wallpapers/walls2/stairs.jpg and /dev/null differ diff --git a/wallpapers/walls2/wp11031060-2590091791.jpg b/wallpapers/walls2/wp11031060-2590091791.jpg deleted file mode 100644 index 19f0129..0000000 Binary files a/wallpapers/walls2/wp11031060-2590091791.jpg and /dev/null differ diff --git a/wallpapers/walls2/wp9052004-3369484529.jpg b/wallpapers/walls2/wp9052004-3369484529.jpg deleted file mode 100644 index 5b2f601..0000000 Binary files a/wallpapers/walls2/wp9052004-3369484529.jpg and /dev/null differ