From 08898185124c14a97d404fd99ecb27b292ede310 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Mon, 9 Oct 2023 11:40:25 +0100 Subject: [PATCH] Big reorganise Move commonModule into system/default.nix Keep most essential parts (user definition, home-manager init) in flake.nix but move rest to system/default.nix Remove some tui expressions from home and add all to home/default.nix, will always want those so always use Disable gamescope session unless gamescope.nix imported Move various home.package definitions to environment.systemPackage in system/ expressions, located based on appropriate use Move wallpapers directory due to restructure, no other changes to it --- flake.nix | 234 +++++------------- home/default.nix | 221 +++++++++++++++-- home/fzf.nix | 11 - home/git.nix | 36 --- home/hyprland/default.nix | 7 - home/kdeconnect.nix | 8 + home/ssh.nix | 49 ---- home/starship.nix | 97 -------- home/tmux.nix | 28 --- hosts/Ronin/configuration.nix | 11 +- hosts/Ronin/home.nix | 1 - hosts/Scorch/home.nix | 1 - hosts/Vanguard/home.nix | 1 - services/syncthing/default.nix | 5 +- system/default.nix | 76 ++++++ system/desktop.nix | 69 +++++- system/gamescope.nix | 1 + system/steam.nix | 6 +- {wallpapers => system/wallpapers}/LICENSE | 0 {wallpapers => system/wallpapers}/README.md | 0 {wallpapers => system/wallpapers}/blake.png | Bin .../wallpapers}/dithered/barn.png | Bin .../wallpapers}/dithered/lighthouse.png | Bin .../wallpapers}/dithered/marketplace.png | Bin .../wallpapers}/dithered/motorbikes.png | Bin .../flatppuccin/flatppuccin_4k_macchiato.png | Bin .../flatppuccin_4k_macchiato_inverted.png | Bin .../wallpapers}/gradients/bkg1_bkg5.png | Bin .../wallpapers}/gradients/bkg3_bkg5.png | Bin .../wallpapers}/gradients/blue_bkg5.png | Bin .../wallpapers}/gradients/blue_green.png | Bin .../wallpapers}/gradients/cyan_bkg5.png | Bin .../wallpapers}/gradients/flamingo_bkg1.png | Bin .../wallpapers}/gradients/flamingo_bkg5.png | Bin .../wallpapers}/gradients/flamingo_peach.png | Bin .../wallpapers}/gradients/flamingo_yellow.png | Bin .../wallpapers}/gradients/green_bkg5.png | Bin .../wallpapers}/gradients/magenta_blue.png | Bin .../wallpapers}/gradients/magenta_pink.png | Bin .../wallpapers}/gradients/peach_bkg5.png | Bin .../wallpapers}/gradients/red_bkg5.png | Bin .../wallpapers}/gradients/red_peach.png | Bin .../wallpapers}/gradients/red_pink.png | Bin .../wallpapers}/landscapes/Clearday.jpg | Bin .../wallpapers}/landscapes/Clearnight.jpg | Bin .../wallpapers}/landscapes/Cloudsday.jpg | Bin .../wallpapers}/landscapes/Cloudsnight.jpg | Bin .../wallpapers}/landscapes/Rainnight.jpg | Bin .../wallpapers}/landscapes/evening-sky.png | Bin .../wallpapers}/landscapes/forrest.png | Bin .../landscapes/salty_mountains.png | Bin .../landscapes/shaded_landscape.png | Bin .../landscapes/tropic_island_day.jpg | Bin .../landscapes/tropic_island_evening.jpg | Bin .../landscapes/tropic_island_morning.jpg | Bin .../landscapes/tropic_island_night.jpg | Bin .../wallpapers}/landscapes/yosemite.png | Bin .../mandelbrot/mandelbrot_full_blue.png | Bin .../mandelbrot/mandelbrot_full_flamingo.png | Bin .../mandelbrot/mandelbrot_full_green.png | Bin .../mandelbrot/mandelbrot_full_lavender.png | Bin .../mandelbrot/mandelbrot_full_magenta.png | Bin .../mandelbrot/mandelbrot_full_maroon.png | Bin .../mandelbrot/mandelbrot_full_peach.png | Bin .../mandelbrot/mandelbrot_full_pink.png | Bin .../mandelbrot/mandelbrot_full_red.png | Bin .../mandelbrot/mandelbrot_full_rosewater.png | Bin .../mandelbrot/mandelbrot_full_sky.png | Bin .../mandelbrot/mandelbrot_full_teal.png | Bin .../mandelbrot/mandelbrot_full_yellow.png | Bin .../mandelbrot/mandelbrot_gap_blue.png | Bin .../mandelbrot/mandelbrot_gap_flamingo.png | Bin .../mandelbrot/mandelbrot_gap_green.png | Bin .../mandelbrot/mandelbrot_gap_lavender.png | Bin .../mandelbrot/mandelbrot_gap_magenta.png | Bin .../mandelbrot/mandelbrot_gap_maroon.png | Bin .../mandelbrot/mandelbrot_gap_peach.png | Bin .../mandelbrot/mandelbrot_gap_pink.png | Bin .../mandelbrot/mandelbrot_gap_red.png | Bin .../mandelbrot/mandelbrot_gap_rosewater.png | Bin .../mandelbrot/mandelbrot_gap_sky.png | Bin .../mandelbrot/mandelbrot_gap_teal.png | Bin .../mandelbrot/mandelbrot_gap_yellow.png | Bin .../mandelbrot/mandelbrot_side_blue.png | Bin .../mandelbrot/mandelbrot_side_flamingo.png | Bin .../mandelbrot/mandelbrot_side_green.png | Bin .../mandelbrot/mandelbrot_side_lavender.png | Bin .../mandelbrot/mandelbrot_side_magenta.png | Bin .../mandelbrot/mandelbrot_side_maroon.png | Bin .../mandelbrot/mandelbrot_side_peach.png | Bin .../mandelbrot/mandelbrot_side_pink.png | Bin .../mandelbrot/mandelbrot_side_red.png | Bin .../mandelbrot/mandelbrot_side_rosewater.png | Bin .../mandelbrot/mandelbrot_side_sky.png | Bin .../mandelbrot/mandelbrot_side_teal.png | Bin .../mandelbrot/mandelbrot_side_yellow.png | Bin .../.comments/catppuccin_triangle.png.xml | 0 .../minimalistic/.comments/heart.jpg.xml | 0 .../minimalistic/black5_unicat.png | Bin .../wallpapers}/minimalistic/blue-cat.png | Bin .../wallpapers}/minimalistic/blue_unicat.png | Bin .../wallpapers}/minimalistic/buttons.png | Bin .../minimalistic/catppuccin_triangle.png | Bin .../wallpapers}/minimalistic/cats.png | Bin .../minimalistic/dark-cat-rosewater.png | Bin .../wallpapers}/minimalistic/dark-cat.png | Bin .../minimalistic/darker_unicat.png | Bin .../wallpapers}/minimalistic/flamingo-cat.png | Bin .../minimalistic/flamingo_unicat.png | Bin .../minimalistic/gradient-synth-cat.png | Bin .../wallpapers}/minimalistic/green-cat.png | Bin .../minimalistic/hashtags-black.png | Bin .../wallpapers}/minimalistic/hashtags-new.png | Bin .../wallpapers}/minimalistic/heart.jpg | Bin .../wallpapers}/minimalistic/hearts.png | Bin .../wallpapers}/minimalistic/lavender-cat.png | Bin .../minimalistic/list-aligned-left.png | Bin .../minimalistic/list-aligned-right.png | Bin .../minimalistic/list-horizontal.png | Bin .../wallpapers}/minimalistic/magenta-cat.png | Bin .../wallpapers}/minimalistic/maroon-cat.png | Bin .../wallpapers}/minimalistic/peach-cat.png | Bin .../wallpapers}/minimalistic/peach_unicat.png | Bin .../wallpapers}/minimalistic/pink-cat.png | Bin .../wallpapers}/minimalistic/pink_unicat.png | Bin .../wallpapers}/minimalistic/red-cat.png | Bin .../wallpapers}/minimalistic/red_unicat.png | Bin .../wallpapers}/minimalistic/romb.png | Bin .../minimalistic/rosewater-cat.png | Bin .../wallpapers}/minimalistic/sky-cat.png | Bin .../wallpapers}/minimalistic/sports.png | Bin .../wallpapers}/minimalistic/teal-cat.png | Bin .../wallpapers}/minimalistic/teal_unicat.png | Bin .../wallpapers}/minimalistic/tetris.png | Bin .../wallpapers}/minimalistic/unicat.png | Bin .../wallpapers}/minimalistic/yellow-cat.png | Bin .../wallpapers}/misc/cat-sound.png | Bin .../wallpapers}/misc/cat_bunnies.png | Bin .../wallpapers}/misc/cat_colors.png | Bin .../wallpapers}/misc/cat_pacman.png | Bin .../wallpapers}/misc/comfy-home.png | Bin .../wallpapers}/misc/doggocat.png | Bin .../misc/feet-on-the-dashboard.png | Bin .../wallpapers}/misc/lonely-fish.png | Bin .../wallpapers}/misc/rainbow-cat.png | Bin .../wallpapers}/misc/rainbow.png | Bin .../wallpapers}/misc/virus.png | Bin .../wallpapers}/misc/windows-error.jpg | Bin .../os/.comments/void-1920x1080.png.xml | 0 .../wallpapers}/os/alpine-black-4k.png | Bin .../os/alpine-magenta-blue-1920x1080.png | Bin .../os/alpine-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/android-black-4k.png | Bin .../os/android-magenta-blue-1920x1080.png | Bin .../os/android-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/apple-black-4k.png | Bin .../os/apple-blue-black-1920x1080.png | Bin .../wallpapers}/os/apple-colors-big-4k.png | Bin .../wallpapers}/os/apple-colors-small-4k.png | Bin .../os/apple-magenta-blue-1920x1080.png | Bin .../os/apple-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/arch-black-4k.png | Bin .../os/arch-magenta-blue-1920x1080.png | Bin .../os/arch-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/arch-rainbow-1920x1080.png | Bin .../wallpapers}/os/arco-black-4k.png | Bin .../os/arco-magenta-blue-1920x1080.png | Bin .../os/arco-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/artix-black-4k.png | Bin .../os/artix-magenta-blue-1920x1080.png | Bin .../os/artix-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/centos-black-4k.png | Bin .../wallpapers}/os/crystal-linux-4k.png | Bin .../crystal-linux-magenta_blue1920x1080.png | Bin .../crystal-linux-magenta_pink1920x1080.png | Bin .../wallpapers}/os/debian-black-4k.png | Bin .../os/debian-magenta-blue-1920x1080.png | Bin .../os/debian-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/deepin-black-4k.png | Bin .../os/deepin-magenta-blue-1920x1080.png | Bin .../os/deepin-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/elementary-black-4k.png | Bin .../os/elementary-sky-lavender-ascii.png | Bin .../wallpapers}/os/endeavour-black-4k.png | Bin .../os/endeavour-blue-black-1920x1080.png | Bin .../os/endeavour-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/fedora-black-4k.png | Bin .../os/fedora-magenta-blue-1920x1080.png | Bin .../os/fedora-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/freebsd-black-4k.png | Bin .../os/freebsd-magenta-blue-1920x1080.png | Bin .../os/freebsd-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/garuda-black-4k.png | Bin .../wallpapers}/os/gentoo-black-4k.png | Bin .../wallpapers}/os/manjaro-black-4k.png | Bin .../os/manjaro-magenta-blue-1920x1080.png | Bin .../os/manjaro-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/mint-black-4k.png | Bin .../os/mint-magenta-blue-1920x1080.png | Bin .../os/mint-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/mxlinux-black-4k.png | Bin .../os/mxlinux-magenta-blue-1920x1080.png | Bin .../os/mxlinux-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/nix-black-4k.png | Bin .../os/nix-magenta-blue-1920x1080.png | Bin .../os/nix-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/opensuse-black-4k.png | Bin .../os/opensuse-magenta-blue-1920x1080.png | Bin .../os/opensuse-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/pop-black-4k.png | Bin .../os/pop-magenta-blue-1920x1080.png | Bin .../os/pop-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/raspberry-black-4k.png | Bin .../os/raspberry-magenta-blue-1920x1080.png | Bin .../os/raspberry-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/solus-black-4k.png | Bin .../os/solus-magenta-blue-1920x1080.png | Bin .../os/solus-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/tux-black-4k.png | Bin .../os/tux-magenta-blue-1920x1080.png | Bin .../os/tux-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/ubuntu-black-4k.png | Bin .../os/ubuntu-magenta-blue-1920x1080.png | Bin .../os/ubuntu-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/various-arch-1-4k.png | Bin .../wallpapers}/os/various-arch-2-4k.png | Bin .../wallpapers}/os/various-os-1-4k.png | Bin .../wallpapers}/os/various-os-2-4k.png | Bin .../wallpapers}/os/various-os-3-4k.png | Bin .../wallpapers}/os/void-1920x1080.png | Bin .../wallpapers}/os/void-black-4k.png | Bin .../wallpapers}/os/void-black3-1920x1080.png | Bin .../os/void-magenta-blue-1920x1080.png | Bin .../os/void-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/windows-black.png | Bin .../os/windows-magenta-blue-1920x1080.png | Bin .../os/windows-magenta-pink-1920x1080.png | Bin .../wallpapers}/os/zorin-black-4k.png | Bin .../os/zorin-magenta-blue-1920x1080.png | Bin .../os/zorin-magenta-pink-1920x1080.png | Bin .../wallpapers}/patterns/emojis.png | Bin .../wallpapers}/patterns/line_icons.png | Bin .../wallpapers}/solids/bkg1.png | Bin .../wallpapers}/solids/bkg2.png | Bin .../wallpapers}/solids/bkg3.png | Bin .../wallpapers}/solids/bkg4.png | Bin .../wallpapers}/solids/bkg5.png | Bin .../wallpapers}/solids/blue.png | Bin .../wallpapers}/solids/cyan.png | Bin .../wallpapers}/solids/flamingo.png | Bin .../wallpapers}/solids/gray.png | Bin .../wallpapers}/solids/green.png | Bin .../wallpapers}/solids/magenta.png | Bin .../wallpapers}/solids/peach.png | Bin .../wallpapers}/solids/pink.png | Bin .../wallpapers}/solids/red.png | Bin .../wallpapers}/solids/white.png | Bin .../wallpapers}/solids/yellow.png | Bin .../wallpapers}/wallpaper.jpg | Bin .../waves/Waves Dark 6016x6016.jpg | Bin .../waves/Waves Dark Alt 6016x6016.jpg | Bin .../waves/Waves Light 6016x6016.jpg | Bin .../wallpapers}/waves/cat-blue-eye.png | Bin .../wallpapers}/waves/cat-waves.png | Bin .../waves/wavy_lines_v01_5120x2880.png | Bin .../waves/wavy_lines_v02_5120x2880.png | Bin .../waves/wavy_lines_v03_5120x2880.png | Bin 267 files changed, 425 insertions(+), 437 deletions(-) delete mode 100644 home/fzf.nix delete mode 100644 home/git.nix create mode 100644 home/kdeconnect.nix delete mode 100644 home/ssh.nix delete mode 100644 home/starship.nix delete mode 100644 home/tmux.nix create mode 100644 system/default.nix rename {wallpapers => system/wallpapers}/LICENSE (100%) rename {wallpapers => system/wallpapers}/README.md (100%) rename {wallpapers => system/wallpapers}/blake.png (100%) rename {wallpapers => system/wallpapers}/dithered/barn.png (100%) rename {wallpapers => system/wallpapers}/dithered/lighthouse.png (100%) rename {wallpapers => system/wallpapers}/dithered/marketplace.png (100%) rename {wallpapers => system/wallpapers}/dithered/motorbikes.png (100%) rename {wallpapers => system/wallpapers}/flatppuccin/flatppuccin_4k_macchiato.png (100%) rename {wallpapers => system/wallpapers}/flatppuccin/flatppuccin_4k_macchiato_inverted.png (100%) rename {wallpapers => system/wallpapers}/gradients/bkg1_bkg5.png (100%) rename {wallpapers => system/wallpapers}/gradients/bkg3_bkg5.png (100%) rename {wallpapers => system/wallpapers}/gradients/blue_bkg5.png (100%) rename {wallpapers => system/wallpapers}/gradients/blue_green.png (100%) rename {wallpapers => system/wallpapers}/gradients/cyan_bkg5.png (100%) rename {wallpapers => system/wallpapers}/gradients/flamingo_bkg1.png (100%) rename {wallpapers => system/wallpapers}/gradients/flamingo_bkg5.png (100%) rename {wallpapers => system/wallpapers}/gradients/flamingo_peach.png (100%) rename {wallpapers => system/wallpapers}/gradients/flamingo_yellow.png (100%) rename {wallpapers => system/wallpapers}/gradients/green_bkg5.png (100%) rename {wallpapers => system/wallpapers}/gradients/magenta_blue.png (100%) rename {wallpapers => system/wallpapers}/gradients/magenta_pink.png (100%) rename {wallpapers => system/wallpapers}/gradients/peach_bkg5.png (100%) rename {wallpapers => system/wallpapers}/gradients/red_bkg5.png (100%) rename {wallpapers => system/wallpapers}/gradients/red_peach.png (100%) rename {wallpapers => system/wallpapers}/gradients/red_pink.png (100%) rename {wallpapers => system/wallpapers}/landscapes/Clearday.jpg (100%) rename {wallpapers => system/wallpapers}/landscapes/Clearnight.jpg (100%) rename {wallpapers => system/wallpapers}/landscapes/Cloudsday.jpg (100%) rename {wallpapers => system/wallpapers}/landscapes/Cloudsnight.jpg (100%) rename {wallpapers => system/wallpapers}/landscapes/Rainnight.jpg (100%) rename {wallpapers => system/wallpapers}/landscapes/evening-sky.png (100%) rename {wallpapers => system/wallpapers}/landscapes/forrest.png (100%) rename {wallpapers => system/wallpapers}/landscapes/salty_mountains.png (100%) rename {wallpapers => system/wallpapers}/landscapes/shaded_landscape.png (100%) rename {wallpapers => system/wallpapers}/landscapes/tropic_island_day.jpg (100%) rename {wallpapers => system/wallpapers}/landscapes/tropic_island_evening.jpg (100%) rename {wallpapers => system/wallpapers}/landscapes/tropic_island_morning.jpg (100%) rename {wallpapers => system/wallpapers}/landscapes/tropic_island_night.jpg (100%) rename {wallpapers => system/wallpapers}/landscapes/yosemite.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_full_blue.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_full_flamingo.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_full_green.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_full_lavender.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_full_magenta.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_full_maroon.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_full_peach.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_full_pink.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_full_red.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_full_rosewater.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_full_sky.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_full_teal.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_full_yellow.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_gap_blue.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_gap_flamingo.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_gap_green.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_gap_lavender.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_gap_magenta.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_gap_maroon.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_gap_peach.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_gap_pink.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_gap_red.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_gap_rosewater.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_gap_sky.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_gap_teal.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_gap_yellow.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_side_blue.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_side_flamingo.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_side_green.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_side_lavender.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_side_magenta.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_side_maroon.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_side_peach.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_side_pink.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_side_red.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_side_rosewater.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_side_sky.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_side_teal.png (100%) rename {wallpapers => system/wallpapers}/mandelbrot/mandelbrot_side_yellow.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/.comments/catppuccin_triangle.png.xml (100%) rename {wallpapers => system/wallpapers}/minimalistic/.comments/heart.jpg.xml (100%) rename {wallpapers => system/wallpapers}/minimalistic/black5_unicat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/blue-cat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/blue_unicat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/buttons.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/catppuccin_triangle.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/cats.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/dark-cat-rosewater.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/dark-cat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/darker_unicat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/flamingo-cat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/flamingo_unicat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/gradient-synth-cat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/green-cat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/hashtags-black.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/hashtags-new.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/heart.jpg (100%) rename {wallpapers => system/wallpapers}/minimalistic/hearts.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/lavender-cat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/list-aligned-left.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/list-aligned-right.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/list-horizontal.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/magenta-cat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/maroon-cat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/peach-cat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/peach_unicat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/pink-cat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/pink_unicat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/red-cat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/red_unicat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/romb.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/rosewater-cat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/sky-cat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/sports.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/teal-cat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/teal_unicat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/tetris.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/unicat.png (100%) rename {wallpapers => system/wallpapers}/minimalistic/yellow-cat.png (100%) rename {wallpapers => system/wallpapers}/misc/cat-sound.png (100%) rename {wallpapers => system/wallpapers}/misc/cat_bunnies.png (100%) rename {wallpapers => system/wallpapers}/misc/cat_colors.png (100%) rename {wallpapers => system/wallpapers}/misc/cat_pacman.png (100%) rename {wallpapers => system/wallpapers}/misc/comfy-home.png (100%) rename {wallpapers => system/wallpapers}/misc/doggocat.png (100%) rename {wallpapers => system/wallpapers}/misc/feet-on-the-dashboard.png (100%) rename {wallpapers => system/wallpapers}/misc/lonely-fish.png (100%) rename {wallpapers => system/wallpapers}/misc/rainbow-cat.png (100%) rename {wallpapers => system/wallpapers}/misc/rainbow.png (100%) rename {wallpapers => system/wallpapers}/misc/virus.png (100%) rename {wallpapers => system/wallpapers}/misc/windows-error.jpg (100%) rename {wallpapers => system/wallpapers}/os/.comments/void-1920x1080.png.xml (100%) rename {wallpapers => system/wallpapers}/os/alpine-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/alpine-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/alpine-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/android-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/android-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/android-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/apple-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/apple-blue-black-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/apple-colors-big-4k.png (100%) rename {wallpapers => system/wallpapers}/os/apple-colors-small-4k.png (100%) rename {wallpapers => system/wallpapers}/os/apple-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/apple-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/arch-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/arch-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/arch-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/arch-rainbow-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/arco-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/arco-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/arco-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/artix-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/artix-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/artix-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/centos-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/crystal-linux-4k.png (100%) rename {wallpapers => system/wallpapers}/os/crystal-linux-magenta_blue1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/crystal-linux-magenta_pink1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/debian-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/debian-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/debian-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/deepin-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/deepin-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/deepin-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/elementary-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/elementary-sky-lavender-ascii.png (100%) rename {wallpapers => system/wallpapers}/os/endeavour-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/endeavour-blue-black-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/endeavour-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/fedora-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/fedora-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/fedora-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/freebsd-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/freebsd-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/freebsd-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/garuda-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/gentoo-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/manjaro-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/manjaro-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/manjaro-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/mint-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/mint-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/mint-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/mxlinux-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/mxlinux-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/mxlinux-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/nix-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/nix-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/nix-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/opensuse-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/opensuse-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/opensuse-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/pop-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/pop-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/pop-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/raspberry-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/raspberry-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/raspberry-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/solus-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/solus-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/solus-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/tux-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/tux-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/tux-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/ubuntu-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/ubuntu-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/ubuntu-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/various-arch-1-4k.png (100%) rename {wallpapers => system/wallpapers}/os/various-arch-2-4k.png (100%) rename {wallpapers => system/wallpapers}/os/various-os-1-4k.png (100%) rename {wallpapers => system/wallpapers}/os/various-os-2-4k.png (100%) rename {wallpapers => system/wallpapers}/os/various-os-3-4k.png (100%) rename {wallpapers => system/wallpapers}/os/void-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/void-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/void-black3-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/void-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/void-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/windows-black.png (100%) rename {wallpapers => system/wallpapers}/os/windows-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/windows-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/zorin-black-4k.png (100%) rename {wallpapers => system/wallpapers}/os/zorin-magenta-blue-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/os/zorin-magenta-pink-1920x1080.png (100%) rename {wallpapers => system/wallpapers}/patterns/emojis.png (100%) rename {wallpapers => system/wallpapers}/patterns/line_icons.png (100%) rename {wallpapers => system/wallpapers}/solids/bkg1.png (100%) rename {wallpapers => system/wallpapers}/solids/bkg2.png (100%) rename {wallpapers => system/wallpapers}/solids/bkg3.png (100%) rename {wallpapers => system/wallpapers}/solids/bkg4.png (100%) rename {wallpapers => system/wallpapers}/solids/bkg5.png (100%) rename {wallpapers => system/wallpapers}/solids/blue.png (100%) rename {wallpapers => system/wallpapers}/solids/cyan.png (100%) rename {wallpapers => system/wallpapers}/solids/flamingo.png (100%) rename {wallpapers => system/wallpapers}/solids/gray.png (100%) rename {wallpapers => system/wallpapers}/solids/green.png (100%) rename {wallpapers => system/wallpapers}/solids/magenta.png (100%) rename {wallpapers => system/wallpapers}/solids/peach.png (100%) rename {wallpapers => system/wallpapers}/solids/pink.png (100%) rename {wallpapers => system/wallpapers}/solids/red.png (100%) rename {wallpapers => system/wallpapers}/solids/white.png (100%) rename {wallpapers => system/wallpapers}/solids/yellow.png (100%) rename {wallpapers => system/wallpapers}/wallpaper.jpg (100%) rename {wallpapers => system/wallpapers}/waves/Waves Dark 6016x6016.jpg (100%) rename {wallpapers => system/wallpapers}/waves/Waves Dark Alt 6016x6016.jpg (100%) rename {wallpapers => system/wallpapers}/waves/Waves Light 6016x6016.jpg (100%) rename {wallpapers => system/wallpapers}/waves/cat-blue-eye.png (100%) rename {wallpapers => system/wallpapers}/waves/cat-waves.png (100%) rename {wallpapers => system/wallpapers}/waves/wavy_lines_v01_5120x2880.png (100%) rename {wallpapers => system/wallpapers}/waves/wavy_lines_v02_5120x2880.png (100%) rename {wallpapers => system/wallpapers}/waves/wavy_lines_v03_5120x2880.png (100%) diff --git a/flake.nix b/flake.nix index 394ab151..59f865f1 100644 --- a/flake.nix +++ b/flake.nix @@ -73,7 +73,6 @@ outputs = { self, nixpkgs, home-manager, stylix, anyrun, ... }@inputs: let - flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main"; catppuccin-themes = with inputs; { alacritty = "${catppuccin-alacritty}/catppuccin-macchiato.yml"; bat = "${catppuccin-bat}/Catppuccin-macchiato.tmTheme"; @@ -97,7 +96,19 @@ systemModules = [ ./system/hyprland.nix ]; serviceModules = [ ./services/sshd/default.nix ./services/syncthing/default.nix ]; - homeModules = [ ./home/default.nix ]; + homeModules = [ + ./home/accounts/default.nix + ./home/emacs/default.nix + ./home/ferdium/default.nix + ./home/hyprland/default.nix + ./home/alacritty.nix + ./home/default.nix + ./home/firefox.nix + ./home/kdeconnect.nix + ./home/media.nix + ./home/pass.nix + ./home/zathura.nix + ]; stateVersion = "23.05"; }; systemConfig = { hostName ? default.hostName, user ? default.user @@ -107,177 +118,14 @@ , homeModules ? default.homeModules, stateVersion ? default.stateVersion }: let - specialArgs = { inherit hostName user group anyrun; }; + specialArgs = { + inherit hostName user anyrun; + inherit (inputs) catppuccin-base16; + }; extraSpecialArgs = specialArgs // { inherit catppuccin-themes; inherit (inputs) doom-emacs gitui; }; - commonModule = { lib, pkgs, ... }: { - stylix = { - autoEnable = false; - image = ./wallpapers/waves/cat-waves.png; - base16Scheme = - "${inputs.catppuccin-base16}/base16/macchiato.yaml"; - fonts = { - emoji = { - name = "Noto Color Emoji"; - package = pkgs.noto-fonts-emoji; - }; - monospace = { - name = "Fira Mono"; - package = pkgs.fira-mono; - }; - sansSerif = { - name = "Fira Sans"; - package = pkgs.fira; - }; - serif = { - name = "Fira Sans"; - package = pkgs.fira; - }; - }; - homeManagerIntegration.followSystem = true; - targets = { - chromium.enable = true; - console.enable = true; - grub = { - enable = true; - useImage = true; - }; - }; - }; - fonts = { - packages = with pkgs; [ - fira - fira-mono - fira-code - (nerdfonts.override { fonts = [ "FiraCode" ]; }) - dejavu_fonts - noto-fonts-emoji - font-awesome - material-symbols - emacs-all-the-icons-fonts - material-design-icons - weather-icons - vscode-extensions.file-icons.file-icons - ]; - fontconfig = { - enable = true; - defaultFonts = { - serif = [ "Fira Sans" "DejaVu Sans" ]; - sansSerif = [ "Fira Sans" "DejaVu Sans" ]; - monospace = [ "Fira Mono" "DejaVu Sans Mono" ]; - emoji = [ "Noto Color Emoji" ]; - }; - }; - }; - nix = { - settings = { - experimental-features = [ "nix-command" "flakes" ]; - auto-optimise-store = true; - }; - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; - }; - extraOptions = '' - keep-outputs = true - keep-derivations = true - min-free = ${toString (100 * 1024 * 1024)} - max-free = ${toString (1024 * 1024 * 1024)} - ''; - }; - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "steam" - "steam-original" - "steam-run" - "discord" - "nomachine-client" - ]; - networking = { - inherit hostName; - networkmanager.enable = true; - nameservers = [ "9.9.9.9" ]; - }; - environment = { - systemPackages = with pkgs; [ libsecret git neofetch nitch ]; - localBinInPath = true; - shellAliases.rebuild = '' - sudo nixos-rebuild switch --flake "${flakeURL}" --refresh \ - && hyprctl reload \ - && doom sync -p - ''; - }; - services.power-profiles-daemon.enable = true; - virtualisation.podman.enable = true; - time.timeZone = "Europe/London"; - i18n = let locale = "en_GB.UTF-8"; - in { - # Select internationalisation properties. - defaultLocale = locale; - extraLocaleSettings = { - LC_ADDRESS = locale; - LC_IDENTIFICATION = locale; - LC_MEASUREMENT = locale; - LC_MONETARY = locale; - LC_NAME = locale; - LC_NUMERIC = locale; - LC_PAPER = locale; - LC_TELEPHONE = locale; - LC_TIME = locale; - }; - }; - programs.${shell}.enable = true; - system = { - inherit stateVersion; - autoUpgrade = { - enable = true; - dates = "02:00"; - allowReboot = false; - flake = flakeURL; - }; - }; - users.users.${user} = { - inherit group; - isNormalUser = true; - description = "Evie Litherland-Smith"; - extraGroups = [ "networkmanager" "wheel" "video" ]; - shell = pkgs.${shell}; - initialHashedPassword = - "$y$j9T$tHIPQt09Kf3KH2eIRze3g/$2mwSlcq27DTGvHNPJ5EP9/1CfL3bXP0F6oS/Vuffmn3"; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANfkqd5lPTsSPU3SRYnAa1UjCYDmDeBTyzq5McmWlm6 xenia@Vanguard" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINI1dWlS16Keil0MGPWmMsBzx8F9ylfz+fRwxUr8/tZ/ ion" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDI44C35I2x9tqzeZDmIpbzmGJWXfATn/Wp5KzVRdlCi root@debian" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKMVEXJTqWkrpmvinPJGsSvome9bCd0CM4iu13aVG6UZ elitherl@Ronin" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ/ZSSCN5sqrA+tdoIZr5EUm5DRuBV4dQ7J+QBEtUwUU xenia@Northstar" - ]; - }; - home-manager = { - inherit extraSpecialArgs; - useGlobalPkgs = true; - useUserPackages = true; - users.${user} = let - username = user; - homeDirectory = "/home/${user}"; - in { - imports = [ ./hosts/${hostName}/home.nix ./home/default.nix ] - ++ homeModules; - home = { inherit username homeDirectory stateVersion; }; - programs.home-manager.enable = true; - stylix.targets.xresources.enable = true; - xdg.userDirs = { - enable = true; - createDirectories = true; - extraConfig = { - XDG_PROJECTS_DIR = "${homeDirectory}/Projects"; - }; - }; - }; - }; - }; in nixpkgs.lib.nixosSystem { inherit system specialArgs; modules = [ @@ -285,7 +133,49 @@ ./hosts/${hostName}/hardware-configuration.nix home-manager.nixosModules.home-manager stylix.nixosModules.stylix - commonModule + ({ pkgs, ... }: { + programs.${shell}.enable = true; + system = { inherit stateVersion; }; + networking = { inherit hostName; }; + users.users.${user} = { + inherit group; + isNormalUser = true; + description = "Evie Litherland-Smith"; + extraGroups = [ "networkmanager" "wheel" "video" ]; + shell = pkgs.${shell}; + initialHashedPassword = + "$y$j9T$tHIPQt09Kf3KH2eIRze3g/$2mwSlcq27DTGvHNPJ5EP9/1CfL3bXP0F6oS/Vuffmn3"; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANfkqd5lPTsSPU3SRYnAa1UjCYDmDeBTyzq5McmWlm6 xenia@Vanguard" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINI1dWlS16Keil0MGPWmMsBzx8F9ylfz+fRwxUr8/tZ/ ion" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDI44C35I2x9tqzeZDmIpbzmGJWXfATn/Wp5KzVRdlCi root@debian" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKMVEXJTqWkrpmvinPJGsSvome9bCd0CM4iu13aVG6UZ elitherl@Ronin" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ/ZSSCN5sqrA+tdoIZr5EUm5DRuBV4dQ7J+QBEtUwUU xenia@Northstar" + ]; + }; + home-manager = { + inherit extraSpecialArgs; + useGlobalPkgs = true; + useUserPackages = true; + users.${user} = let + username = user; + homeDirectory = "/home/${user}"; + in { + imports = [ ./hosts/${hostName}/home.nix ./home/default.nix ] + ++ homeModules; + home = { inherit username homeDirectory stateVersion; }; + programs.home-manager.enable = true; + stylix.targets.xresources.enable = true; + xdg.userDirs = { + enable = true; + createDirectories = true; + extraConfig = { + XDG_PROJECTS_DIR = "${homeDirectory}/Projects"; + }; + }; + }; + }; + }) ] ++ systemModules ++ serviceModules; }; in { @@ -297,7 +187,7 @@ system = "x86_64-linux"; in systemConfig { inherit hostName user system; - systemModules = [ ]; + systemModules = [ ./system/default.nix ]; serviceModules = [ # ./services/adguardhome/default.nix ./services/gitea/default.nix @@ -310,7 +200,7 @@ ./services/traefik/nextcloud.nix # ./services/traefik/qbittorrent.nix ]; - homeModules = [ ./home/git.nix ./home/ssh.nix ]; + homeModules = [ ./home/default.nix ]; }; Northstar = let diff --git a/home/default.nix b/home/default.nix index a7517e29..09885f3b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,26 +1,9 @@ -{ config, pkgs, catppuccin-themes, ... }: +{ config, lib, pkgs, catppuccin-themes, gitui, ... }: { - imports = [ - ./alacritty.nix - ./firefox.nix - ./fzf.nix - ./git.nix - ./media.nix - ./pass.nix - ./ssh.nix - ./starship.nix - ./tmux.nix - ./zathura.nix - ./hyprland/default.nix - ./emacs/default.nix - ./accounts/default.nix - ./ferdium/default.nix - ]; - home.packages = with pkgs; [ dig silver-searcher gnumake ]; - services.kdeconnect = { - enable = true; - indicator = true; + stylix.targets = { + fzf.enable = true; + tmux.enable = true; }; programs = { bash.enable = true; @@ -37,6 +20,202 @@ enableBashIntegration = true; enableZshIntegration = true; }; + fzf = { + enable = true; + enableBashIntegration = true; + enableZshIntegration = true; + }; + git = { + enable = true; + package = pkgs.gitFull; + userName = "Evie Litherland-Smith"; + userEmail = lib.mkDefault "evie@xenia.me.uk"; + delta = { + enable = true; + options = { + blame-code-style = "syntax"; + line-numbers = true; + navigate = true; + side-by-side = true; + syntax-theme = "Catppuccin"; + zero-style = "dim syntax"; + }; + }; + extraConfig = { + pull.rebase = false; + init.defaultBranch = "main"; + credential.helper = "${pkgs.gitFull}/bin/git-credential-libsecret"; + }; + }; + gitui = { + enable = true; + keyConfig = builtins.readFile "${gitui}/vim_style_key_config.ron"; + theme = builtins.readFile catppuccin-themes.gitui; + }; + bat = { + enable = true; + config.theme = "Catppuccin"; + themes.Catppuccin = builtins.readFile catppuccin-themes.bat; + }; + ssh = { + enable = true; + forwardAgent = true; + serverAliveInterval = 15; + serverAliveCountMax = 3; + controlMaster = "auto"; + controlPersist = "10s"; + extraConfig = '' + AddKeysToAgent=yes + SetEnv TERM=xterm-256color + ''; + matchBlocks = { + "vanguard" = { + user = "xenia"; + hostname = "192.168.1.166"; + }; + "legion" = { + user = "xenia"; + hostname = "192.168.1.230"; + }; + "ionos" = { + user = "root"; + hostname = "77.68.67.133"; + }; + "freia".hostname = "freia020.hpc.l"; + "freia???" = + lib.hm.dag.entryAfter [ "freia" ] { hostname = "%h.hpc.l"; }; + "heimdall".hostname = "heimdall003.jet.uk"; + "heimdall???" = + lib.hm.dag.entryAfter [ "heimdall" ] { hostname = "%h.jet.uk"; }; + "freia* heimdall*" = lib.hm.dag.entryAfter [ + "freia" + "freia???" + "heimdall" + "heimdall???" + ] { + user = "elitherl"; + compression = true; + }; + "git*".user = "git"; + }; + }; + starship = { + enable = true; + enableBashIntegration = true; + enableZshIntegration = true; + settings = { + inherit (builtins.fromTOML + (builtins.readFile catppuccin-themes.starship)) + palettes; + command_timeout = 1000; + add_newline = true; + palette = "catppuccin_macchiato"; + character = { + success_symbol = "[[󱢠](green) ❯](maroon)"; + error_symbol = "[❯](red)"; + }; + directory = { + truncation_length = 2; + fish_style_pwd_dir_length = 1; + read_only = " 󰉐"; + style = "bold lavender"; + truncate_to_repo = false; + before_repo_root_style = "bold lavender"; + repo_root_style = "bold teal"; + }; + line_break.disabled = false; + git_branch = { + symbol = "󰘬"; + only_attached = true; + ignore_branches = [ "master" "main" ]; + }; + git_commit = { + format = "[󰜘 $hash$tag]($style) "; + tag_symbol = "󰓹"; + tag_disabled = false; + }; + git_metrics.disabled = false; + hostname = { + ssh_only = true; + ssh_symbol = "󰢹 "; + style = "bold green"; + }; + localip.disabled = false; + memory_usage = { + disabled = false; + symbol = "󰍛 "; + }; + nix_shell.symbol = "󱄅 "; + os = { + disabled = false; + format = "on [$symbol $name ]($style)"; + style = "bold blue"; + symbols = { + Alpine = " "; + Android = " "; + Arch = " "; + CentOS = " "; + Debian = " "; + EndeavourOS = " "; + Fedora = " "; + FreeBSD = " "; + Gentoo = " "; + Illumos = " "; + Linux = " "; + Macos = " "; + Manjaro = " "; + Mint = "󰣭 "; + NixOS = " "; + OpenBSD = " "; + openSUSE = " "; + Pop = " "; + Raspbian = " "; + Redhat = " "; + RedHatEnterprise = " "; + Solus = " "; + SUSE = " "; + Ubuntu = " "; + Unknown = " "; + Windows = " "; + }; + }; + python = { + symbol = "󰌠 "; + python_binary = "python3"; + }; + shell = { + disabled = false; + format = "using [$indicator ]($style)"; + }; + sudo = { + disabled = false; + symbol = "󰪋 "; + }; + }; + }; + tmux = { + enable = true; + baseIndex = 1; + clock24 = true; + keyMode = "emacs"; + mouse = true; + secureSocket = true; + sensibleOnTop = true; + shortcut = "Space"; + terminal = "xterm-256color"; + plugins = with pkgs.tmuxPlugins; [ yank tmux-fzf catppuccin ]; + extraConfig = '' + # https://old.reddit.com/r/tmux/comments/mesrci/tmux_2_doesnt_seem_to_use_256_colors/ + set -ga terminal-overrides ",*256col*,alacritty:Tc" + set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q' + set-environment -g COLORTERM "truecolor" + + # easy-to-remember split pane commands + bind | split-window -h -c "#{pane_current_path}" + bind - split-window -v -c "#{pane_current_path}" + bind c new-window -c "#{pane_current_path}" + ''; + }; zsh = { enable = true; enableAutosuggestions = true; diff --git a/home/fzf.nix b/home/fzf.nix deleted file mode 100644 index 1dff8c07..00000000 --- a/home/fzf.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: - -{ - stylix.targets.fzf.enable = true; - programs.fzf = { - enable = true; - enableBashIntegration = true; - enableZshIntegration = true; - }; - -} diff --git a/home/git.nix b/home/git.nix deleted file mode 100644 index c0b4d9ee..00000000 --- a/home/git.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, pkgs, catppuccin-themes, gitui, ... }: { - programs = { - git = { - enable = true; - package = pkgs.gitFull; - userName = "Evie Litherland-Smith"; - userEmail = lib.mkDefault "evie@xenia.me.uk"; - delta = { - enable = true; - options = { - blame-code-style = "syntax"; - line-numbers = true; - navigate = true; - side-by-side = true; - syntax-theme = "Catppuccin"; - zero-style = "dim syntax"; - }; - }; - extraConfig = { - pull.rebase = false; - init.defaultBranch = "main"; - credential.helper = "${pkgs.gitFull}/bin/git-credential-libsecret"; - }; - }; - gitui = { - enable = true; - keyConfig = builtins.readFile "${gitui}/vim_style_key_config.ron"; - theme = builtins.readFile catppuccin-themes.gitui; - }; - bat = { - enable = true; - config.theme = "Catppuccin"; - themes.Catppuccin = builtins.readFile catppuccin-themes.bat; - }; - }; -} diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index af908102..73ff6780 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -9,13 +9,6 @@ ./anyrun.nix ./gtk.nix ]; - home.packages = with pkgs; [ - signal-desktop - remmina - libreoffice - zotero - minesweep-rs - ]; programs.rofi = { package = pkgs.rofi-wayland; terminal = "${pkgs.alacritty}/bin/alacritty"; diff --git a/home/kdeconnect.nix b/home/kdeconnect.nix new file mode 100644 index 00000000..247faef9 --- /dev/null +++ b/home/kdeconnect.nix @@ -0,0 +1,8 @@ +{ config, lib, pkgs, ... }: + +{ + services.kdeconnect = { + enable = true; + indicator = true; + }; +} diff --git a/home/ssh.nix b/home/ssh.nix deleted file mode 100644 index 95f31a3f..00000000 --- a/home/ssh.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - home.packages = with pkgs; [ sshfs ]; - programs = { - ssh = { - enable = true; - forwardAgent = true; - serverAliveInterval = 15; - serverAliveCountMax = 3; - controlMaster = "auto"; - controlPersist = "10s"; - extraConfig = '' - AddKeysToAgent=yes - SetEnv TERM=xterm-256color - ''; - matchBlocks = { - "vanguard" = { - user = "xenia"; - hostname = "192.168.1.166"; - }; - "legion" = { - user = "xenia"; - hostname = "192.168.1.230"; - }; - "ionos" = { - user = "root"; - hostname = "77.68.67.133"; - }; - "freia".hostname = "freia020.hpc.l"; - "freia???" = - lib.hm.dag.entryAfter [ "freia" ] { hostname = "%h.hpc.l"; }; - "heimdall".hostname = "heimdall003.jet.uk"; - "heimdall???" = - lib.hm.dag.entryAfter [ "heimdall" ] { hostname = "%h.jet.uk"; }; - "freia* heimdall*" = lib.hm.dag.entryAfter [ - "freia" - "freia???" - "heimdall" - "heimdall???" - ] { - user = "elitherl"; - compression = true; - }; - "git*".user = "git"; - }; - }; - }; -} diff --git a/home/starship.nix b/home/starship.nix deleted file mode 100644 index ee783017..00000000 --- a/home/starship.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ catppuccin-themes, ... }: - -{ - programs.starship = { - enable = true; - enableBashIntegration = true; - enableZshIntegration = true; - settings = { - inherit (builtins.fromTOML (builtins.readFile catppuccin-themes.starship)) - palettes; - command_timeout = 1000; - add_newline = true; - palette = "catppuccin_macchiato"; - character = { - success_symbol = "[[󱢠](green) ❯](maroon)"; - error_symbol = "[❯](red)"; - }; - directory = { - truncation_length = 2; - fish_style_pwd_dir_length = 1; - read_only = " 󰉐"; - style = "bold lavender"; - truncate_to_repo = false; - before_repo_root_style = "bold lavender"; - repo_root_style = "bold teal"; - }; - line_break.disabled = false; - git_branch = { - symbol = "󰘬"; - only_attached = true; - ignore_branches = [ "master" "main" ]; - }; - git_commit = { - format = "[󰜘 $hash$tag]($style) "; - tag_symbol = "󰓹"; - tag_disabled = false; - }; - git_metrics.disabled = false; - hostname = { - ssh_only = true; - ssh_symbol = "󰢹 "; - style = "bold green"; - }; - localip.disabled = false; - memory_usage = { - disabled = false; - symbol = "󰍛 "; - }; - nix_shell.symbol = "󱄅 "; - os = { - disabled = false; - format = "on [$symbol $name ]($style)"; - style = "bold blue"; - symbols = { - Alpine = " "; - Android = " "; - Arch = " "; - CentOS = " "; - Debian = " "; - EndeavourOS = " "; - Fedora = " "; - FreeBSD = " "; - Gentoo = " "; - Illumos = " "; - Linux = " "; - Macos = " "; - Manjaro = " "; - Mint = "󰣭 "; - NixOS = " "; - OpenBSD = " "; - openSUSE = " "; - Pop = " "; - Raspbian = " "; - Redhat = " "; - RedHatEnterprise = " "; - Solus = " "; - SUSE = " "; - Ubuntu = " "; - Unknown = " "; - Windows = " "; - }; - }; - python = { - symbol = "󰌠 "; - python_binary = "python3"; - }; - shell = { - disabled = false; - format = "using [$indicator ]($style)"; - }; - sudo = { - disabled = false; - symbol = "󰪋 "; - }; - }; - }; -} diff --git a/home/tmux.nix b/home/tmux.nix deleted file mode 100644 index 53b979e9..00000000 --- a/home/tmux.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, ... }: - -{ - stylix.targets.tmux.enable = true; - programs.tmux = { - enable = true; - baseIndex = 1; - clock24 = true; - keyMode = "vi"; - mouse = true; - secureSocket = true; - sensibleOnTop = true; - shortcut = "Space"; - terminal = "xterm-256color"; - plugins = with pkgs.tmuxPlugins; [ yank tmux-fzf catppuccin ]; - extraConfig = '' - # https://old.reddit.com/r/tmux/comments/mesrci/tmux_2_doesnt_seem_to_use_256_colors/ - set -ga terminal-overrides ",*256col*,alacritty:Tc" - set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q' - set-environment -g COLORTERM "truecolor" - - # easy-to-remember split pane commands - bind | split-window -h -c "#{pane_current_path}" - bind - split-window -v -c "#{pane_current_path}" - bind c new-window -c "#{pane_current_path}" - ''; - }; -} diff --git a/hosts/Ronin/configuration.nix b/hosts/Ronin/configuration.nix index 38cd5cdb..a49b32bc 100644 --- a/hosts/Ronin/configuration.nix +++ b/hosts/Ronin/configuration.nix @@ -1,7 +1,7 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ lib, ... }: { +{ config, lib, pkgs, ... }: { # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -15,9 +15,12 @@ boot.initrd.luks.devices."luks-761eeb11-3091-4142-9232-4fb33165eccd".keyFile = "/crypto_keyfile.bin"; - environment.etc."ppp/options".text = '' - ipcp-accept-remote - ''; + environment = { + etc."ppp/options".text = '' + ipcp-accept-remote + ''; + systemPackages = with pkgs; [ openfortivpn ]; + }; services.syncthing.settings.folders = { "Archive".enable = false; "Books".enable = false; diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix index c817ec24..e32c17ed 100644 --- a/hosts/Ronin/home.nix +++ b/hosts/Ronin/home.nix @@ -1,7 +1,6 @@ { config, pkgs, lib, ... }: { - home.packages = with pkgs; [ openfortivpn nomachine-client ]; programs = { git.userEmail = "evie.litherland-smith@ukaea.uk"; firefox.profiles.default.settings."browser.startup.homepage" = diff --git a/hosts/Scorch/home.nix b/hosts/Scorch/home.nix index 13b98233..5e93c05a 100644 --- a/hosts/Scorch/home.nix +++ b/hosts/Scorch/home.nix @@ -1,7 +1,6 @@ { config, pkgs, lib, ... }: { - home.packages = with pkgs; [ nomachine-client ]; programs = { git.userEmail = "evie.litherland-smith@ukaea.uk"; firefox.profiles.default.settings."browser.startup.homepage" = diff --git a/hosts/Vanguard/home.nix b/hosts/Vanguard/home.nix index 6806b6f0..9110f0cc 100644 --- a/hosts/Vanguard/home.nix +++ b/hosts/Vanguard/home.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { - home.packages = with pkgs; [ nomachine-client ]; xdg.configFile."hypr/extra.conf".text = '' monitor=DP-1,highrr,0x0,1.00 monitor=HDMI-A-1,highres,1920x325,1.00 diff --git a/services/syncthing/default.nix b/services/syncthing/default.nix index e7e753bb..1b4244ec 100644 --- a/services/syncthing/default.nix +++ b/services/syncthing/default.nix @@ -1,10 +1,11 @@ -{ lib, user, group, ... }: +{ config, lib, pkgs, user, ... }: let devices = [ "Legion" "Northstar" "Ronin" "Scorch" "Vanguard" ]; devicesWithPhone = devices ++ [ "Ion" ]; in { services.syncthing = { - inherit user group; + inherit user; + inherit (config.users.users.${user}) group; enable = true; dataDir = lib.mkDefault "/home/${user}"; systemService = true; diff --git a/system/default.nix b/system/default.nix new file mode 100644 index 00000000..702d23e5 --- /dev/null +++ b/system/default.nix @@ -0,0 +1,76 @@ +{ config, lib, pkgs, ... }: +let flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main"; +in { + nix = { + settings = { + experimental-features = [ "nix-command" "flakes" ]; + auto-optimise-store = true; + }; + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 30d"; + }; + extraOptions = '' + keep-outputs = true + keep-derivations = true + min-free = ${toString (100 * 1024 * 1024)} + max-free = ${toString (1024 * 1024 * 1024)} + ''; + }; + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-run" + "nomachine-client" + ]; + networking = { + networkmanager.enable = true; + nameservers = [ "9.9.9.9" ]; + }; + environment = { + systemPackages = with pkgs; [ + libsecret + git + neofetch + nitch + dig + silver-searcher + gnumake + ]; + localBinInPath = true; + shellAliases.rebuild = '' + sudo nixos-rebuild switch --flake "${flakeURL}" --refresh \ + && hyprctl reload \ + && doom sync -p + ''; + }; + console.keyMap = "uk"; + programs.ssh.startAgent = true; + services.power-profiles-daemon.enable = true; + virtualisation.podman.enable = true; + time.timeZone = "Europe/London"; + i18n = let locale = "en_GB.UTF-8"; + in { + # Select internationalisation properties. + defaultLocale = locale; + extraLocaleSettings = { + LC_ADDRESS = locale; + LC_IDENTIFICATION = locale; + LC_MEASUREMENT = locale; + LC_MONETARY = locale; + LC_NAME = locale; + LC_NUMERIC = locale; + LC_PAPER = locale; + LC_TELEPHONE = locale; + LC_TIME = locale; + }; + }; + system.autoUpgrade = { + enable = true; + dates = "02:00"; + allowReboot = false; + flake = flakeURL; + }; +} diff --git a/system/desktop.nix b/system/desktop.nix index bf605536..7ffba12e 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -1,7 +1,7 @@ -{ pkgs, ... }: +{ config, lib, pkgs, catppuccin-base16, ... }: { - imports = [ ./firefox.nix ]; + imports = [ ./default.nix ./firefox.nix ]; environment.systemPackages = with pkgs; with libsForQt5.qt5; [ dex @@ -16,7 +16,70 @@ protonvpn-cli protonvpn-gui qbittorrent + signal-desktop + remmina + libreoffice + zotero + minesweep-rs + nomachine-client ]; + stylix = { + autoEnable = false; + image = ./wallpapers/waves/cat-waves.png; + base16Scheme = "${catppuccin-base16}/base16/macchiato.yaml"; + fonts = { + emoji = { + name = "Noto Color Emoji"; + package = pkgs.noto-fonts-emoji; + }; + monospace = { + name = "Fira Mono"; + package = pkgs.fira-mono; + }; + sansSerif = { + name = "Fira Sans"; + package = pkgs.fira; + }; + serif = { + name = "Fira Sans"; + package = pkgs.fira; + }; + }; + homeManagerIntegration.followSystem = true; + targets = { + chromium.enable = true; + console.enable = true; + grub = { + enable = true; + useImage = true; + }; + }; + }; + fonts = { + packages = with pkgs; [ + fira + fira-mono + fira-code + (nerdfonts.override { fonts = [ "FiraCode" ]; }) + dejavu_fonts + noto-fonts-emoji + font-awesome + material-symbols + emacs-all-the-icons-fonts + material-design-icons + weather-icons + vscode-extensions.file-icons.file-icons + ]; + fontconfig = { + enable = true; + defaultFonts = { + serif = [ "Fira Sans" "DejaVu Sans" ]; + sansSerif = [ "Fira Sans" "DejaVu Sans" ]; + monospace = [ "Fira Mono" "DejaVu Sans Mono" ]; + emoji = [ "Noto Color Emoji" ]; + }; + }; + }; security = { rtkit.enable = true; pam.services.gtklock.enableGnomeKeyring = true; @@ -46,9 +109,7 @@ }; }; }; - console.keyMap = "uk"; programs = { - ssh.startAgent = true; seahorse.enable = true; dconf.enable = true; light.enable = true; diff --git a/system/gamescope.nix b/system/gamescope.nix index 18077e8a..79ae35ac 100644 --- a/system/gamescope.nix +++ b/system/gamescope.nix @@ -2,6 +2,7 @@ { imports = [ ./desktop.nix ./steam.nix ]; + programs.steam.gamescopeSession.enable = true; services.greetd.settings = rec { default_session.command = '' gamescope\ diff --git a/system/steam.nix b/system/steam.nix index 24300c40..f0fc6347 100644 --- a/system/steam.nix +++ b/system/steam.nix @@ -1,7 +1,7 @@ -{ pkgs, ... }: +{ config, lib, pkgs, ... }: { - environment.systemPackages = with pkgs; [ prismlauncher discord ]; + environment.systemPackages = with pkgs; [ prismlauncher ]; hardware = { opengl.driSupport32Bit = true; steam-hardware.enable = true; @@ -15,7 +15,7 @@ steam = { enable = true; remotePlay.openFirewall = true; - gamescopeSession.enable = true; + gamescopeSession.enable = lib.mkDefault false; }; }; } diff --git a/wallpapers/LICENSE b/system/wallpapers/LICENSE similarity index 100% rename from wallpapers/LICENSE rename to system/wallpapers/LICENSE diff --git a/wallpapers/README.md b/system/wallpapers/README.md similarity index 100% rename from wallpapers/README.md rename to system/wallpapers/README.md diff --git a/wallpapers/blake.png b/system/wallpapers/blake.png similarity index 100% rename from wallpapers/blake.png rename to system/wallpapers/blake.png diff --git a/wallpapers/dithered/barn.png b/system/wallpapers/dithered/barn.png similarity index 100% rename from wallpapers/dithered/barn.png rename to system/wallpapers/dithered/barn.png diff --git a/wallpapers/dithered/lighthouse.png b/system/wallpapers/dithered/lighthouse.png similarity index 100% rename from wallpapers/dithered/lighthouse.png rename to system/wallpapers/dithered/lighthouse.png diff --git a/wallpapers/dithered/marketplace.png b/system/wallpapers/dithered/marketplace.png similarity index 100% rename from wallpapers/dithered/marketplace.png rename to system/wallpapers/dithered/marketplace.png diff --git a/wallpapers/dithered/motorbikes.png b/system/wallpapers/dithered/motorbikes.png similarity index 100% rename from wallpapers/dithered/motorbikes.png rename to system/wallpapers/dithered/motorbikes.png diff --git a/wallpapers/flatppuccin/flatppuccin_4k_macchiato.png b/system/wallpapers/flatppuccin/flatppuccin_4k_macchiato.png similarity index 100% rename from wallpapers/flatppuccin/flatppuccin_4k_macchiato.png rename to system/wallpapers/flatppuccin/flatppuccin_4k_macchiato.png diff --git a/wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png b/system/wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png similarity index 100% rename from wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png rename to system/wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png diff --git a/wallpapers/gradients/bkg1_bkg5.png b/system/wallpapers/gradients/bkg1_bkg5.png similarity index 100% rename from wallpapers/gradients/bkg1_bkg5.png rename to system/wallpapers/gradients/bkg1_bkg5.png diff --git a/wallpapers/gradients/bkg3_bkg5.png b/system/wallpapers/gradients/bkg3_bkg5.png similarity index 100% rename from wallpapers/gradients/bkg3_bkg5.png rename to system/wallpapers/gradients/bkg3_bkg5.png diff --git a/wallpapers/gradients/blue_bkg5.png b/system/wallpapers/gradients/blue_bkg5.png similarity index 100% rename from wallpapers/gradients/blue_bkg5.png rename to system/wallpapers/gradients/blue_bkg5.png diff --git a/wallpapers/gradients/blue_green.png b/system/wallpapers/gradients/blue_green.png similarity index 100% rename from wallpapers/gradients/blue_green.png rename to system/wallpapers/gradients/blue_green.png diff --git a/wallpapers/gradients/cyan_bkg5.png b/system/wallpapers/gradients/cyan_bkg5.png similarity index 100% rename from wallpapers/gradients/cyan_bkg5.png rename to system/wallpapers/gradients/cyan_bkg5.png diff --git a/wallpapers/gradients/flamingo_bkg1.png b/system/wallpapers/gradients/flamingo_bkg1.png similarity index 100% rename from wallpapers/gradients/flamingo_bkg1.png rename to system/wallpapers/gradients/flamingo_bkg1.png diff --git a/wallpapers/gradients/flamingo_bkg5.png b/system/wallpapers/gradients/flamingo_bkg5.png similarity index 100% rename from wallpapers/gradients/flamingo_bkg5.png rename to system/wallpapers/gradients/flamingo_bkg5.png diff --git a/wallpapers/gradients/flamingo_peach.png b/system/wallpapers/gradients/flamingo_peach.png similarity index 100% rename from wallpapers/gradients/flamingo_peach.png rename to system/wallpapers/gradients/flamingo_peach.png diff --git a/wallpapers/gradients/flamingo_yellow.png b/system/wallpapers/gradients/flamingo_yellow.png similarity index 100% rename from wallpapers/gradients/flamingo_yellow.png rename to system/wallpapers/gradients/flamingo_yellow.png diff --git a/wallpapers/gradients/green_bkg5.png b/system/wallpapers/gradients/green_bkg5.png similarity index 100% rename from wallpapers/gradients/green_bkg5.png rename to system/wallpapers/gradients/green_bkg5.png diff --git a/wallpapers/gradients/magenta_blue.png b/system/wallpapers/gradients/magenta_blue.png similarity index 100% rename from wallpapers/gradients/magenta_blue.png rename to system/wallpapers/gradients/magenta_blue.png diff --git a/wallpapers/gradients/magenta_pink.png b/system/wallpapers/gradients/magenta_pink.png similarity index 100% rename from wallpapers/gradients/magenta_pink.png rename to system/wallpapers/gradients/magenta_pink.png diff --git a/wallpapers/gradients/peach_bkg5.png b/system/wallpapers/gradients/peach_bkg5.png similarity index 100% rename from wallpapers/gradients/peach_bkg5.png rename to system/wallpapers/gradients/peach_bkg5.png diff --git a/wallpapers/gradients/red_bkg5.png b/system/wallpapers/gradients/red_bkg5.png similarity index 100% rename from wallpapers/gradients/red_bkg5.png rename to system/wallpapers/gradients/red_bkg5.png diff --git a/wallpapers/gradients/red_peach.png b/system/wallpapers/gradients/red_peach.png similarity index 100% rename from wallpapers/gradients/red_peach.png rename to system/wallpapers/gradients/red_peach.png diff --git a/wallpapers/gradients/red_pink.png b/system/wallpapers/gradients/red_pink.png similarity index 100% rename from wallpapers/gradients/red_pink.png rename to system/wallpapers/gradients/red_pink.png diff --git a/wallpapers/landscapes/Clearday.jpg b/system/wallpapers/landscapes/Clearday.jpg similarity index 100% rename from wallpapers/landscapes/Clearday.jpg rename to system/wallpapers/landscapes/Clearday.jpg diff --git a/wallpapers/landscapes/Clearnight.jpg b/system/wallpapers/landscapes/Clearnight.jpg similarity index 100% rename from wallpapers/landscapes/Clearnight.jpg rename to system/wallpapers/landscapes/Clearnight.jpg diff --git a/wallpapers/landscapes/Cloudsday.jpg b/system/wallpapers/landscapes/Cloudsday.jpg similarity index 100% rename from wallpapers/landscapes/Cloudsday.jpg rename to system/wallpapers/landscapes/Cloudsday.jpg diff --git a/wallpapers/landscapes/Cloudsnight.jpg b/system/wallpapers/landscapes/Cloudsnight.jpg similarity index 100% rename from wallpapers/landscapes/Cloudsnight.jpg rename to system/wallpapers/landscapes/Cloudsnight.jpg diff --git a/wallpapers/landscapes/Rainnight.jpg b/system/wallpapers/landscapes/Rainnight.jpg similarity index 100% rename from wallpapers/landscapes/Rainnight.jpg rename to system/wallpapers/landscapes/Rainnight.jpg diff --git a/wallpapers/landscapes/evening-sky.png b/system/wallpapers/landscapes/evening-sky.png similarity index 100% rename from wallpapers/landscapes/evening-sky.png rename to system/wallpapers/landscapes/evening-sky.png diff --git a/wallpapers/landscapes/forrest.png b/system/wallpapers/landscapes/forrest.png similarity index 100% rename from wallpapers/landscapes/forrest.png rename to system/wallpapers/landscapes/forrest.png diff --git a/wallpapers/landscapes/salty_mountains.png b/system/wallpapers/landscapes/salty_mountains.png similarity index 100% rename from wallpapers/landscapes/salty_mountains.png rename to system/wallpapers/landscapes/salty_mountains.png diff --git a/wallpapers/landscapes/shaded_landscape.png b/system/wallpapers/landscapes/shaded_landscape.png similarity index 100% rename from wallpapers/landscapes/shaded_landscape.png rename to system/wallpapers/landscapes/shaded_landscape.png diff --git a/wallpapers/landscapes/tropic_island_day.jpg b/system/wallpapers/landscapes/tropic_island_day.jpg similarity index 100% rename from wallpapers/landscapes/tropic_island_day.jpg rename to system/wallpapers/landscapes/tropic_island_day.jpg diff --git a/wallpapers/landscapes/tropic_island_evening.jpg b/system/wallpapers/landscapes/tropic_island_evening.jpg similarity index 100% rename from wallpapers/landscapes/tropic_island_evening.jpg rename to system/wallpapers/landscapes/tropic_island_evening.jpg diff --git a/wallpapers/landscapes/tropic_island_morning.jpg b/system/wallpapers/landscapes/tropic_island_morning.jpg similarity index 100% rename from wallpapers/landscapes/tropic_island_morning.jpg rename to system/wallpapers/landscapes/tropic_island_morning.jpg diff --git a/wallpapers/landscapes/tropic_island_night.jpg b/system/wallpapers/landscapes/tropic_island_night.jpg similarity index 100% rename from wallpapers/landscapes/tropic_island_night.jpg rename to system/wallpapers/landscapes/tropic_island_night.jpg diff --git a/wallpapers/landscapes/yosemite.png b/system/wallpapers/landscapes/yosemite.png similarity index 100% rename from wallpapers/landscapes/yosemite.png rename to system/wallpapers/landscapes/yosemite.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_blue.png b/system/wallpapers/mandelbrot/mandelbrot_full_blue.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_blue.png rename to system/wallpapers/mandelbrot/mandelbrot_full_blue.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_flamingo.png b/system/wallpapers/mandelbrot/mandelbrot_full_flamingo.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_flamingo.png rename to system/wallpapers/mandelbrot/mandelbrot_full_flamingo.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_green.png b/system/wallpapers/mandelbrot/mandelbrot_full_green.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_green.png rename to system/wallpapers/mandelbrot/mandelbrot_full_green.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_lavender.png b/system/wallpapers/mandelbrot/mandelbrot_full_lavender.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_lavender.png rename to system/wallpapers/mandelbrot/mandelbrot_full_lavender.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_magenta.png b/system/wallpapers/mandelbrot/mandelbrot_full_magenta.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_magenta.png rename to system/wallpapers/mandelbrot/mandelbrot_full_magenta.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_maroon.png b/system/wallpapers/mandelbrot/mandelbrot_full_maroon.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_maroon.png rename to system/wallpapers/mandelbrot/mandelbrot_full_maroon.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_peach.png b/system/wallpapers/mandelbrot/mandelbrot_full_peach.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_peach.png rename to system/wallpapers/mandelbrot/mandelbrot_full_peach.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_pink.png b/system/wallpapers/mandelbrot/mandelbrot_full_pink.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_pink.png rename to system/wallpapers/mandelbrot/mandelbrot_full_pink.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_red.png b/system/wallpapers/mandelbrot/mandelbrot_full_red.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_red.png rename to system/wallpapers/mandelbrot/mandelbrot_full_red.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_rosewater.png b/system/wallpapers/mandelbrot/mandelbrot_full_rosewater.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_rosewater.png rename to system/wallpapers/mandelbrot/mandelbrot_full_rosewater.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_sky.png b/system/wallpapers/mandelbrot/mandelbrot_full_sky.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_sky.png rename to system/wallpapers/mandelbrot/mandelbrot_full_sky.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_teal.png b/system/wallpapers/mandelbrot/mandelbrot_full_teal.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_teal.png rename to system/wallpapers/mandelbrot/mandelbrot_full_teal.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_yellow.png b/system/wallpapers/mandelbrot/mandelbrot_full_yellow.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_yellow.png rename to system/wallpapers/mandelbrot/mandelbrot_full_yellow.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_blue.png b/system/wallpapers/mandelbrot/mandelbrot_gap_blue.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_blue.png rename to system/wallpapers/mandelbrot/mandelbrot_gap_blue.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_flamingo.png b/system/wallpapers/mandelbrot/mandelbrot_gap_flamingo.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_flamingo.png rename to system/wallpapers/mandelbrot/mandelbrot_gap_flamingo.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_green.png b/system/wallpapers/mandelbrot/mandelbrot_gap_green.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_green.png rename to system/wallpapers/mandelbrot/mandelbrot_gap_green.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_lavender.png b/system/wallpapers/mandelbrot/mandelbrot_gap_lavender.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_lavender.png rename to system/wallpapers/mandelbrot/mandelbrot_gap_lavender.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_magenta.png b/system/wallpapers/mandelbrot/mandelbrot_gap_magenta.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_magenta.png rename to system/wallpapers/mandelbrot/mandelbrot_gap_magenta.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_maroon.png b/system/wallpapers/mandelbrot/mandelbrot_gap_maroon.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_maroon.png rename to system/wallpapers/mandelbrot/mandelbrot_gap_maroon.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_peach.png b/system/wallpapers/mandelbrot/mandelbrot_gap_peach.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_peach.png rename to system/wallpapers/mandelbrot/mandelbrot_gap_peach.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_pink.png b/system/wallpapers/mandelbrot/mandelbrot_gap_pink.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_pink.png rename to system/wallpapers/mandelbrot/mandelbrot_gap_pink.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_red.png b/system/wallpapers/mandelbrot/mandelbrot_gap_red.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_red.png rename to system/wallpapers/mandelbrot/mandelbrot_gap_red.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_rosewater.png b/system/wallpapers/mandelbrot/mandelbrot_gap_rosewater.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_rosewater.png rename to system/wallpapers/mandelbrot/mandelbrot_gap_rosewater.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_sky.png b/system/wallpapers/mandelbrot/mandelbrot_gap_sky.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_sky.png rename to system/wallpapers/mandelbrot/mandelbrot_gap_sky.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_teal.png b/system/wallpapers/mandelbrot/mandelbrot_gap_teal.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_teal.png rename to system/wallpapers/mandelbrot/mandelbrot_gap_teal.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_yellow.png b/system/wallpapers/mandelbrot/mandelbrot_gap_yellow.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_yellow.png rename to system/wallpapers/mandelbrot/mandelbrot_gap_yellow.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_blue.png b/system/wallpapers/mandelbrot/mandelbrot_side_blue.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_blue.png rename to system/wallpapers/mandelbrot/mandelbrot_side_blue.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_flamingo.png b/system/wallpapers/mandelbrot/mandelbrot_side_flamingo.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_flamingo.png rename to system/wallpapers/mandelbrot/mandelbrot_side_flamingo.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_green.png b/system/wallpapers/mandelbrot/mandelbrot_side_green.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_green.png rename to system/wallpapers/mandelbrot/mandelbrot_side_green.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_lavender.png b/system/wallpapers/mandelbrot/mandelbrot_side_lavender.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_lavender.png rename to system/wallpapers/mandelbrot/mandelbrot_side_lavender.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_magenta.png b/system/wallpapers/mandelbrot/mandelbrot_side_magenta.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_magenta.png rename to system/wallpapers/mandelbrot/mandelbrot_side_magenta.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_maroon.png b/system/wallpapers/mandelbrot/mandelbrot_side_maroon.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_maroon.png rename to system/wallpapers/mandelbrot/mandelbrot_side_maroon.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_peach.png b/system/wallpapers/mandelbrot/mandelbrot_side_peach.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_peach.png rename to system/wallpapers/mandelbrot/mandelbrot_side_peach.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_pink.png b/system/wallpapers/mandelbrot/mandelbrot_side_pink.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_pink.png rename to system/wallpapers/mandelbrot/mandelbrot_side_pink.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_red.png b/system/wallpapers/mandelbrot/mandelbrot_side_red.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_red.png rename to system/wallpapers/mandelbrot/mandelbrot_side_red.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_rosewater.png b/system/wallpapers/mandelbrot/mandelbrot_side_rosewater.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_rosewater.png rename to system/wallpapers/mandelbrot/mandelbrot_side_rosewater.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_sky.png b/system/wallpapers/mandelbrot/mandelbrot_side_sky.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_sky.png rename to system/wallpapers/mandelbrot/mandelbrot_side_sky.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_teal.png b/system/wallpapers/mandelbrot/mandelbrot_side_teal.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_teal.png rename to system/wallpapers/mandelbrot/mandelbrot_side_teal.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_yellow.png b/system/wallpapers/mandelbrot/mandelbrot_side_yellow.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_yellow.png rename to system/wallpapers/mandelbrot/mandelbrot_side_yellow.png diff --git a/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml b/system/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml similarity index 100% rename from wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml rename to system/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml diff --git a/wallpapers/minimalistic/.comments/heart.jpg.xml b/system/wallpapers/minimalistic/.comments/heart.jpg.xml similarity index 100% rename from wallpapers/minimalistic/.comments/heart.jpg.xml rename to system/wallpapers/minimalistic/.comments/heart.jpg.xml diff --git a/wallpapers/minimalistic/black5_unicat.png b/system/wallpapers/minimalistic/black5_unicat.png similarity index 100% rename from wallpapers/minimalistic/black5_unicat.png rename to system/wallpapers/minimalistic/black5_unicat.png diff --git a/wallpapers/minimalistic/blue-cat.png b/system/wallpapers/minimalistic/blue-cat.png similarity index 100% rename from wallpapers/minimalistic/blue-cat.png rename to system/wallpapers/minimalistic/blue-cat.png diff --git a/wallpapers/minimalistic/blue_unicat.png b/system/wallpapers/minimalistic/blue_unicat.png similarity index 100% rename from wallpapers/minimalistic/blue_unicat.png rename to system/wallpapers/minimalistic/blue_unicat.png diff --git a/wallpapers/minimalistic/buttons.png b/system/wallpapers/minimalistic/buttons.png similarity index 100% rename from wallpapers/minimalistic/buttons.png rename to system/wallpapers/minimalistic/buttons.png diff --git a/wallpapers/minimalistic/catppuccin_triangle.png b/system/wallpapers/minimalistic/catppuccin_triangle.png similarity index 100% rename from wallpapers/minimalistic/catppuccin_triangle.png rename to system/wallpapers/minimalistic/catppuccin_triangle.png diff --git a/wallpapers/minimalistic/cats.png b/system/wallpapers/minimalistic/cats.png similarity index 100% rename from wallpapers/minimalistic/cats.png rename to system/wallpapers/minimalistic/cats.png diff --git a/wallpapers/minimalistic/dark-cat-rosewater.png b/system/wallpapers/minimalistic/dark-cat-rosewater.png similarity index 100% rename from wallpapers/minimalistic/dark-cat-rosewater.png rename to system/wallpapers/minimalistic/dark-cat-rosewater.png diff --git a/wallpapers/minimalistic/dark-cat.png b/system/wallpapers/minimalistic/dark-cat.png similarity index 100% rename from wallpapers/minimalistic/dark-cat.png rename to system/wallpapers/minimalistic/dark-cat.png diff --git a/wallpapers/minimalistic/darker_unicat.png b/system/wallpapers/minimalistic/darker_unicat.png similarity index 100% rename from wallpapers/minimalistic/darker_unicat.png rename to system/wallpapers/minimalistic/darker_unicat.png diff --git a/wallpapers/minimalistic/flamingo-cat.png b/system/wallpapers/minimalistic/flamingo-cat.png similarity index 100% rename from wallpapers/minimalistic/flamingo-cat.png rename to system/wallpapers/minimalistic/flamingo-cat.png diff --git a/wallpapers/minimalistic/flamingo_unicat.png b/system/wallpapers/minimalistic/flamingo_unicat.png similarity index 100% rename from wallpapers/minimalistic/flamingo_unicat.png rename to system/wallpapers/minimalistic/flamingo_unicat.png diff --git a/wallpapers/minimalistic/gradient-synth-cat.png b/system/wallpapers/minimalistic/gradient-synth-cat.png similarity index 100% rename from wallpapers/minimalistic/gradient-synth-cat.png rename to system/wallpapers/minimalistic/gradient-synth-cat.png diff --git a/wallpapers/minimalistic/green-cat.png b/system/wallpapers/minimalistic/green-cat.png similarity index 100% rename from wallpapers/minimalistic/green-cat.png rename to system/wallpapers/minimalistic/green-cat.png diff --git a/wallpapers/minimalistic/hashtags-black.png b/system/wallpapers/minimalistic/hashtags-black.png similarity index 100% rename from wallpapers/minimalistic/hashtags-black.png rename to system/wallpapers/minimalistic/hashtags-black.png diff --git a/wallpapers/minimalistic/hashtags-new.png b/system/wallpapers/minimalistic/hashtags-new.png similarity index 100% rename from wallpapers/minimalistic/hashtags-new.png rename to system/wallpapers/minimalistic/hashtags-new.png diff --git a/wallpapers/minimalistic/heart.jpg b/system/wallpapers/minimalistic/heart.jpg similarity index 100% rename from wallpapers/minimalistic/heart.jpg rename to system/wallpapers/minimalistic/heart.jpg diff --git a/wallpapers/minimalistic/hearts.png b/system/wallpapers/minimalistic/hearts.png similarity index 100% rename from wallpapers/minimalistic/hearts.png rename to system/wallpapers/minimalistic/hearts.png diff --git a/wallpapers/minimalistic/lavender-cat.png b/system/wallpapers/minimalistic/lavender-cat.png similarity index 100% rename from wallpapers/minimalistic/lavender-cat.png rename to system/wallpapers/minimalistic/lavender-cat.png diff --git a/wallpapers/minimalistic/list-aligned-left.png b/system/wallpapers/minimalistic/list-aligned-left.png similarity index 100% rename from wallpapers/minimalistic/list-aligned-left.png rename to system/wallpapers/minimalistic/list-aligned-left.png diff --git a/wallpapers/minimalistic/list-aligned-right.png b/system/wallpapers/minimalistic/list-aligned-right.png similarity index 100% rename from wallpapers/minimalistic/list-aligned-right.png rename to system/wallpapers/minimalistic/list-aligned-right.png diff --git a/wallpapers/minimalistic/list-horizontal.png b/system/wallpapers/minimalistic/list-horizontal.png similarity index 100% rename from wallpapers/minimalistic/list-horizontal.png rename to system/wallpapers/minimalistic/list-horizontal.png diff --git a/wallpapers/minimalistic/magenta-cat.png b/system/wallpapers/minimalistic/magenta-cat.png similarity index 100% rename from wallpapers/minimalistic/magenta-cat.png rename to system/wallpapers/minimalistic/magenta-cat.png diff --git a/wallpapers/minimalistic/maroon-cat.png b/system/wallpapers/minimalistic/maroon-cat.png similarity index 100% rename from wallpapers/minimalistic/maroon-cat.png rename to system/wallpapers/minimalistic/maroon-cat.png diff --git a/wallpapers/minimalistic/peach-cat.png b/system/wallpapers/minimalistic/peach-cat.png similarity index 100% rename from wallpapers/minimalistic/peach-cat.png rename to system/wallpapers/minimalistic/peach-cat.png diff --git a/wallpapers/minimalistic/peach_unicat.png b/system/wallpapers/minimalistic/peach_unicat.png similarity index 100% rename from wallpapers/minimalistic/peach_unicat.png rename to system/wallpapers/minimalistic/peach_unicat.png diff --git a/wallpapers/minimalistic/pink-cat.png b/system/wallpapers/minimalistic/pink-cat.png similarity index 100% rename from wallpapers/minimalistic/pink-cat.png rename to system/wallpapers/minimalistic/pink-cat.png diff --git a/wallpapers/minimalistic/pink_unicat.png b/system/wallpapers/minimalistic/pink_unicat.png similarity index 100% rename from wallpapers/minimalistic/pink_unicat.png rename to system/wallpapers/minimalistic/pink_unicat.png diff --git a/wallpapers/minimalistic/red-cat.png b/system/wallpapers/minimalistic/red-cat.png similarity index 100% rename from wallpapers/minimalistic/red-cat.png rename to system/wallpapers/minimalistic/red-cat.png diff --git a/wallpapers/minimalistic/red_unicat.png b/system/wallpapers/minimalistic/red_unicat.png similarity index 100% rename from wallpapers/minimalistic/red_unicat.png rename to system/wallpapers/minimalistic/red_unicat.png diff --git a/wallpapers/minimalistic/romb.png b/system/wallpapers/minimalistic/romb.png similarity index 100% rename from wallpapers/minimalistic/romb.png rename to system/wallpapers/minimalistic/romb.png diff --git a/wallpapers/minimalistic/rosewater-cat.png b/system/wallpapers/minimalistic/rosewater-cat.png similarity index 100% rename from wallpapers/minimalistic/rosewater-cat.png rename to system/wallpapers/minimalistic/rosewater-cat.png diff --git a/wallpapers/minimalistic/sky-cat.png b/system/wallpapers/minimalistic/sky-cat.png similarity index 100% rename from wallpapers/minimalistic/sky-cat.png rename to system/wallpapers/minimalistic/sky-cat.png diff --git a/wallpapers/minimalistic/sports.png b/system/wallpapers/minimalistic/sports.png similarity index 100% rename from wallpapers/minimalistic/sports.png rename to system/wallpapers/minimalistic/sports.png diff --git a/wallpapers/minimalistic/teal-cat.png b/system/wallpapers/minimalistic/teal-cat.png similarity index 100% rename from wallpapers/minimalistic/teal-cat.png rename to system/wallpapers/minimalistic/teal-cat.png diff --git a/wallpapers/minimalistic/teal_unicat.png b/system/wallpapers/minimalistic/teal_unicat.png similarity index 100% rename from wallpapers/minimalistic/teal_unicat.png rename to system/wallpapers/minimalistic/teal_unicat.png diff --git a/wallpapers/minimalistic/tetris.png b/system/wallpapers/minimalistic/tetris.png similarity index 100% rename from wallpapers/minimalistic/tetris.png rename to system/wallpapers/minimalistic/tetris.png diff --git a/wallpapers/minimalistic/unicat.png b/system/wallpapers/minimalistic/unicat.png similarity index 100% rename from wallpapers/minimalistic/unicat.png rename to system/wallpapers/minimalistic/unicat.png diff --git a/wallpapers/minimalistic/yellow-cat.png b/system/wallpapers/minimalistic/yellow-cat.png similarity index 100% rename from wallpapers/minimalistic/yellow-cat.png rename to system/wallpapers/minimalistic/yellow-cat.png diff --git a/wallpapers/misc/cat-sound.png b/system/wallpapers/misc/cat-sound.png similarity index 100% rename from wallpapers/misc/cat-sound.png rename to system/wallpapers/misc/cat-sound.png diff --git a/wallpapers/misc/cat_bunnies.png b/system/wallpapers/misc/cat_bunnies.png similarity index 100% rename from wallpapers/misc/cat_bunnies.png rename to system/wallpapers/misc/cat_bunnies.png diff --git a/wallpapers/misc/cat_colors.png b/system/wallpapers/misc/cat_colors.png similarity index 100% rename from wallpapers/misc/cat_colors.png rename to system/wallpapers/misc/cat_colors.png diff --git a/wallpapers/misc/cat_pacman.png b/system/wallpapers/misc/cat_pacman.png similarity index 100% rename from wallpapers/misc/cat_pacman.png rename to system/wallpapers/misc/cat_pacman.png diff --git a/wallpapers/misc/comfy-home.png b/system/wallpapers/misc/comfy-home.png similarity index 100% rename from wallpapers/misc/comfy-home.png rename to system/wallpapers/misc/comfy-home.png diff --git a/wallpapers/misc/doggocat.png b/system/wallpapers/misc/doggocat.png similarity index 100% rename from wallpapers/misc/doggocat.png rename to system/wallpapers/misc/doggocat.png diff --git a/wallpapers/misc/feet-on-the-dashboard.png b/system/wallpapers/misc/feet-on-the-dashboard.png similarity index 100% rename from wallpapers/misc/feet-on-the-dashboard.png rename to system/wallpapers/misc/feet-on-the-dashboard.png diff --git a/wallpapers/misc/lonely-fish.png b/system/wallpapers/misc/lonely-fish.png similarity index 100% rename from wallpapers/misc/lonely-fish.png rename to system/wallpapers/misc/lonely-fish.png diff --git a/wallpapers/misc/rainbow-cat.png b/system/wallpapers/misc/rainbow-cat.png similarity index 100% rename from wallpapers/misc/rainbow-cat.png rename to system/wallpapers/misc/rainbow-cat.png diff --git a/wallpapers/misc/rainbow.png b/system/wallpapers/misc/rainbow.png similarity index 100% rename from wallpapers/misc/rainbow.png rename to system/wallpapers/misc/rainbow.png diff --git a/wallpapers/misc/virus.png b/system/wallpapers/misc/virus.png similarity index 100% rename from wallpapers/misc/virus.png rename to system/wallpapers/misc/virus.png diff --git a/wallpapers/misc/windows-error.jpg b/system/wallpapers/misc/windows-error.jpg similarity index 100% rename from wallpapers/misc/windows-error.jpg rename to system/wallpapers/misc/windows-error.jpg diff --git a/wallpapers/os/.comments/void-1920x1080.png.xml b/system/wallpapers/os/.comments/void-1920x1080.png.xml similarity index 100% rename from wallpapers/os/.comments/void-1920x1080.png.xml rename to system/wallpapers/os/.comments/void-1920x1080.png.xml diff --git a/wallpapers/os/alpine-black-4k.png b/system/wallpapers/os/alpine-black-4k.png similarity index 100% rename from wallpapers/os/alpine-black-4k.png rename to system/wallpapers/os/alpine-black-4k.png diff --git a/wallpapers/os/alpine-magenta-blue-1920x1080.png b/system/wallpapers/os/alpine-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/alpine-magenta-blue-1920x1080.png rename to system/wallpapers/os/alpine-magenta-blue-1920x1080.png diff --git a/wallpapers/os/alpine-magenta-pink-1920x1080.png b/system/wallpapers/os/alpine-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/alpine-magenta-pink-1920x1080.png rename to system/wallpapers/os/alpine-magenta-pink-1920x1080.png diff --git a/wallpapers/os/android-black-4k.png b/system/wallpapers/os/android-black-4k.png similarity index 100% rename from wallpapers/os/android-black-4k.png rename to system/wallpapers/os/android-black-4k.png diff --git a/wallpapers/os/android-magenta-blue-1920x1080.png b/system/wallpapers/os/android-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/android-magenta-blue-1920x1080.png rename to system/wallpapers/os/android-magenta-blue-1920x1080.png diff --git a/wallpapers/os/android-magenta-pink-1920x1080.png b/system/wallpapers/os/android-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/android-magenta-pink-1920x1080.png rename to system/wallpapers/os/android-magenta-pink-1920x1080.png diff --git a/wallpapers/os/apple-black-4k.png b/system/wallpapers/os/apple-black-4k.png similarity index 100% rename from wallpapers/os/apple-black-4k.png rename to system/wallpapers/os/apple-black-4k.png diff --git a/wallpapers/os/apple-blue-black-1920x1080.png b/system/wallpapers/os/apple-blue-black-1920x1080.png similarity index 100% rename from wallpapers/os/apple-blue-black-1920x1080.png rename to system/wallpapers/os/apple-blue-black-1920x1080.png diff --git a/wallpapers/os/apple-colors-big-4k.png b/system/wallpapers/os/apple-colors-big-4k.png similarity index 100% rename from wallpapers/os/apple-colors-big-4k.png rename to system/wallpapers/os/apple-colors-big-4k.png diff --git a/wallpapers/os/apple-colors-small-4k.png b/system/wallpapers/os/apple-colors-small-4k.png similarity index 100% rename from wallpapers/os/apple-colors-small-4k.png rename to system/wallpapers/os/apple-colors-small-4k.png diff --git a/wallpapers/os/apple-magenta-blue-1920x1080.png b/system/wallpapers/os/apple-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/apple-magenta-blue-1920x1080.png rename to system/wallpapers/os/apple-magenta-blue-1920x1080.png diff --git a/wallpapers/os/apple-magenta-pink-1920x1080.png b/system/wallpapers/os/apple-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/apple-magenta-pink-1920x1080.png rename to system/wallpapers/os/apple-magenta-pink-1920x1080.png diff --git a/wallpapers/os/arch-black-4k.png b/system/wallpapers/os/arch-black-4k.png similarity index 100% rename from wallpapers/os/arch-black-4k.png rename to system/wallpapers/os/arch-black-4k.png diff --git a/wallpapers/os/arch-magenta-blue-1920x1080.png b/system/wallpapers/os/arch-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/arch-magenta-blue-1920x1080.png rename to system/wallpapers/os/arch-magenta-blue-1920x1080.png diff --git a/wallpapers/os/arch-magenta-pink-1920x1080.png b/system/wallpapers/os/arch-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/arch-magenta-pink-1920x1080.png rename to system/wallpapers/os/arch-magenta-pink-1920x1080.png diff --git a/wallpapers/os/arch-rainbow-1920x1080.png b/system/wallpapers/os/arch-rainbow-1920x1080.png similarity index 100% rename from wallpapers/os/arch-rainbow-1920x1080.png rename to system/wallpapers/os/arch-rainbow-1920x1080.png diff --git a/wallpapers/os/arco-black-4k.png b/system/wallpapers/os/arco-black-4k.png similarity index 100% rename from wallpapers/os/arco-black-4k.png rename to system/wallpapers/os/arco-black-4k.png diff --git a/wallpapers/os/arco-magenta-blue-1920x1080.png b/system/wallpapers/os/arco-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/arco-magenta-blue-1920x1080.png rename to system/wallpapers/os/arco-magenta-blue-1920x1080.png diff --git a/wallpapers/os/arco-magenta-pink-1920x1080.png b/system/wallpapers/os/arco-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/arco-magenta-pink-1920x1080.png rename to system/wallpapers/os/arco-magenta-pink-1920x1080.png diff --git a/wallpapers/os/artix-black-4k.png b/system/wallpapers/os/artix-black-4k.png similarity index 100% rename from wallpapers/os/artix-black-4k.png rename to system/wallpapers/os/artix-black-4k.png diff --git a/wallpapers/os/artix-magenta-blue-1920x1080.png b/system/wallpapers/os/artix-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/artix-magenta-blue-1920x1080.png rename to system/wallpapers/os/artix-magenta-blue-1920x1080.png diff --git a/wallpapers/os/artix-magenta-pink-1920x1080.png b/system/wallpapers/os/artix-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/artix-magenta-pink-1920x1080.png rename to system/wallpapers/os/artix-magenta-pink-1920x1080.png diff --git a/wallpapers/os/centos-black-4k.png b/system/wallpapers/os/centos-black-4k.png similarity index 100% rename from wallpapers/os/centos-black-4k.png rename to system/wallpapers/os/centos-black-4k.png diff --git a/wallpapers/os/crystal-linux-4k.png b/system/wallpapers/os/crystal-linux-4k.png similarity index 100% rename from wallpapers/os/crystal-linux-4k.png rename to system/wallpapers/os/crystal-linux-4k.png diff --git a/wallpapers/os/crystal-linux-magenta_blue1920x1080.png b/system/wallpapers/os/crystal-linux-magenta_blue1920x1080.png similarity index 100% rename from wallpapers/os/crystal-linux-magenta_blue1920x1080.png rename to system/wallpapers/os/crystal-linux-magenta_blue1920x1080.png diff --git a/wallpapers/os/crystal-linux-magenta_pink1920x1080.png b/system/wallpapers/os/crystal-linux-magenta_pink1920x1080.png similarity index 100% rename from wallpapers/os/crystal-linux-magenta_pink1920x1080.png rename to system/wallpapers/os/crystal-linux-magenta_pink1920x1080.png diff --git a/wallpapers/os/debian-black-4k.png b/system/wallpapers/os/debian-black-4k.png similarity index 100% rename from wallpapers/os/debian-black-4k.png rename to system/wallpapers/os/debian-black-4k.png diff --git a/wallpapers/os/debian-magenta-blue-1920x1080.png b/system/wallpapers/os/debian-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/debian-magenta-blue-1920x1080.png rename to system/wallpapers/os/debian-magenta-blue-1920x1080.png diff --git a/wallpapers/os/debian-magenta-pink-1920x1080.png b/system/wallpapers/os/debian-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/debian-magenta-pink-1920x1080.png rename to system/wallpapers/os/debian-magenta-pink-1920x1080.png diff --git a/wallpapers/os/deepin-black-4k.png b/system/wallpapers/os/deepin-black-4k.png similarity index 100% rename from wallpapers/os/deepin-black-4k.png rename to system/wallpapers/os/deepin-black-4k.png diff --git a/wallpapers/os/deepin-magenta-blue-1920x1080.png b/system/wallpapers/os/deepin-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/deepin-magenta-blue-1920x1080.png rename to system/wallpapers/os/deepin-magenta-blue-1920x1080.png diff --git a/wallpapers/os/deepin-magenta-pink-1920x1080.png b/system/wallpapers/os/deepin-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/deepin-magenta-pink-1920x1080.png rename to system/wallpapers/os/deepin-magenta-pink-1920x1080.png diff --git a/wallpapers/os/elementary-black-4k.png b/system/wallpapers/os/elementary-black-4k.png similarity index 100% rename from wallpapers/os/elementary-black-4k.png rename to system/wallpapers/os/elementary-black-4k.png diff --git a/wallpapers/os/elementary-sky-lavender-ascii.png b/system/wallpapers/os/elementary-sky-lavender-ascii.png similarity index 100% rename from wallpapers/os/elementary-sky-lavender-ascii.png rename to system/wallpapers/os/elementary-sky-lavender-ascii.png diff --git a/wallpapers/os/endeavour-black-4k.png b/system/wallpapers/os/endeavour-black-4k.png similarity index 100% rename from wallpapers/os/endeavour-black-4k.png rename to system/wallpapers/os/endeavour-black-4k.png diff --git a/wallpapers/os/endeavour-blue-black-1920x1080.png b/system/wallpapers/os/endeavour-blue-black-1920x1080.png similarity index 100% rename from wallpapers/os/endeavour-blue-black-1920x1080.png rename to system/wallpapers/os/endeavour-blue-black-1920x1080.png diff --git a/wallpapers/os/endeavour-magenta-pink-1920x1080.png b/system/wallpapers/os/endeavour-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/endeavour-magenta-pink-1920x1080.png rename to system/wallpapers/os/endeavour-magenta-pink-1920x1080.png diff --git a/wallpapers/os/fedora-black-4k.png b/system/wallpapers/os/fedora-black-4k.png similarity index 100% rename from wallpapers/os/fedora-black-4k.png rename to system/wallpapers/os/fedora-black-4k.png diff --git a/wallpapers/os/fedora-magenta-blue-1920x1080.png b/system/wallpapers/os/fedora-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/fedora-magenta-blue-1920x1080.png rename to system/wallpapers/os/fedora-magenta-blue-1920x1080.png diff --git a/wallpapers/os/fedora-magenta-pink-1920x1080.png b/system/wallpapers/os/fedora-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/fedora-magenta-pink-1920x1080.png rename to system/wallpapers/os/fedora-magenta-pink-1920x1080.png diff --git a/wallpapers/os/freebsd-black-4k.png b/system/wallpapers/os/freebsd-black-4k.png similarity index 100% rename from wallpapers/os/freebsd-black-4k.png rename to system/wallpapers/os/freebsd-black-4k.png diff --git a/wallpapers/os/freebsd-magenta-blue-1920x1080.png b/system/wallpapers/os/freebsd-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/freebsd-magenta-blue-1920x1080.png rename to system/wallpapers/os/freebsd-magenta-blue-1920x1080.png diff --git a/wallpapers/os/freebsd-magenta-pink-1920x1080.png b/system/wallpapers/os/freebsd-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/freebsd-magenta-pink-1920x1080.png rename to system/wallpapers/os/freebsd-magenta-pink-1920x1080.png diff --git a/wallpapers/os/garuda-black-4k.png b/system/wallpapers/os/garuda-black-4k.png similarity index 100% rename from wallpapers/os/garuda-black-4k.png rename to system/wallpapers/os/garuda-black-4k.png diff --git a/wallpapers/os/gentoo-black-4k.png b/system/wallpapers/os/gentoo-black-4k.png similarity index 100% rename from wallpapers/os/gentoo-black-4k.png rename to system/wallpapers/os/gentoo-black-4k.png diff --git a/wallpapers/os/manjaro-black-4k.png b/system/wallpapers/os/manjaro-black-4k.png similarity index 100% rename from wallpapers/os/manjaro-black-4k.png rename to system/wallpapers/os/manjaro-black-4k.png diff --git a/wallpapers/os/manjaro-magenta-blue-1920x1080.png b/system/wallpapers/os/manjaro-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/manjaro-magenta-blue-1920x1080.png rename to system/wallpapers/os/manjaro-magenta-blue-1920x1080.png diff --git a/wallpapers/os/manjaro-magenta-pink-1920x1080.png b/system/wallpapers/os/manjaro-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/manjaro-magenta-pink-1920x1080.png rename to system/wallpapers/os/manjaro-magenta-pink-1920x1080.png diff --git a/wallpapers/os/mint-black-4k.png b/system/wallpapers/os/mint-black-4k.png similarity index 100% rename from wallpapers/os/mint-black-4k.png rename to system/wallpapers/os/mint-black-4k.png diff --git a/wallpapers/os/mint-magenta-blue-1920x1080.png b/system/wallpapers/os/mint-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/mint-magenta-blue-1920x1080.png rename to system/wallpapers/os/mint-magenta-blue-1920x1080.png diff --git a/wallpapers/os/mint-magenta-pink-1920x1080.png b/system/wallpapers/os/mint-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/mint-magenta-pink-1920x1080.png rename to system/wallpapers/os/mint-magenta-pink-1920x1080.png diff --git a/wallpapers/os/mxlinux-black-4k.png b/system/wallpapers/os/mxlinux-black-4k.png similarity index 100% rename from wallpapers/os/mxlinux-black-4k.png rename to system/wallpapers/os/mxlinux-black-4k.png diff --git a/wallpapers/os/mxlinux-magenta-blue-1920x1080.png b/system/wallpapers/os/mxlinux-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/mxlinux-magenta-blue-1920x1080.png rename to system/wallpapers/os/mxlinux-magenta-blue-1920x1080.png diff --git a/wallpapers/os/mxlinux-magenta-pink-1920x1080.png b/system/wallpapers/os/mxlinux-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/mxlinux-magenta-pink-1920x1080.png rename to system/wallpapers/os/mxlinux-magenta-pink-1920x1080.png diff --git a/wallpapers/os/nix-black-4k.png b/system/wallpapers/os/nix-black-4k.png similarity index 100% rename from wallpapers/os/nix-black-4k.png rename to system/wallpapers/os/nix-black-4k.png diff --git a/wallpapers/os/nix-magenta-blue-1920x1080.png b/system/wallpapers/os/nix-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/nix-magenta-blue-1920x1080.png rename to system/wallpapers/os/nix-magenta-blue-1920x1080.png diff --git a/wallpapers/os/nix-magenta-pink-1920x1080.png b/system/wallpapers/os/nix-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/nix-magenta-pink-1920x1080.png rename to system/wallpapers/os/nix-magenta-pink-1920x1080.png diff --git a/wallpapers/os/opensuse-black-4k.png b/system/wallpapers/os/opensuse-black-4k.png similarity index 100% rename from wallpapers/os/opensuse-black-4k.png rename to system/wallpapers/os/opensuse-black-4k.png diff --git a/wallpapers/os/opensuse-magenta-blue-1920x1080.png b/system/wallpapers/os/opensuse-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/opensuse-magenta-blue-1920x1080.png rename to system/wallpapers/os/opensuse-magenta-blue-1920x1080.png diff --git a/wallpapers/os/opensuse-magenta-pink-1920x1080.png b/system/wallpapers/os/opensuse-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/opensuse-magenta-pink-1920x1080.png rename to system/wallpapers/os/opensuse-magenta-pink-1920x1080.png diff --git a/wallpapers/os/pop-black-4k.png b/system/wallpapers/os/pop-black-4k.png similarity index 100% rename from wallpapers/os/pop-black-4k.png rename to system/wallpapers/os/pop-black-4k.png diff --git a/wallpapers/os/pop-magenta-blue-1920x1080.png b/system/wallpapers/os/pop-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/pop-magenta-blue-1920x1080.png rename to system/wallpapers/os/pop-magenta-blue-1920x1080.png diff --git a/wallpapers/os/pop-magenta-pink-1920x1080.png b/system/wallpapers/os/pop-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/pop-magenta-pink-1920x1080.png rename to system/wallpapers/os/pop-magenta-pink-1920x1080.png diff --git a/wallpapers/os/raspberry-black-4k.png b/system/wallpapers/os/raspberry-black-4k.png similarity index 100% rename from wallpapers/os/raspberry-black-4k.png rename to system/wallpapers/os/raspberry-black-4k.png diff --git a/wallpapers/os/raspberry-magenta-blue-1920x1080.png b/system/wallpapers/os/raspberry-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/raspberry-magenta-blue-1920x1080.png rename to system/wallpapers/os/raspberry-magenta-blue-1920x1080.png diff --git a/wallpapers/os/raspberry-magenta-pink-1920x1080.png b/system/wallpapers/os/raspberry-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/raspberry-magenta-pink-1920x1080.png rename to system/wallpapers/os/raspberry-magenta-pink-1920x1080.png diff --git a/wallpapers/os/solus-black-4k.png b/system/wallpapers/os/solus-black-4k.png similarity index 100% rename from wallpapers/os/solus-black-4k.png rename to system/wallpapers/os/solus-black-4k.png diff --git a/wallpapers/os/solus-magenta-blue-1920x1080.png b/system/wallpapers/os/solus-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/solus-magenta-blue-1920x1080.png rename to system/wallpapers/os/solus-magenta-blue-1920x1080.png diff --git a/wallpapers/os/solus-magenta-pink-1920x1080.png b/system/wallpapers/os/solus-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/solus-magenta-pink-1920x1080.png rename to system/wallpapers/os/solus-magenta-pink-1920x1080.png diff --git a/wallpapers/os/tux-black-4k.png b/system/wallpapers/os/tux-black-4k.png similarity index 100% rename from wallpapers/os/tux-black-4k.png rename to system/wallpapers/os/tux-black-4k.png diff --git a/wallpapers/os/tux-magenta-blue-1920x1080.png b/system/wallpapers/os/tux-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/tux-magenta-blue-1920x1080.png rename to system/wallpapers/os/tux-magenta-blue-1920x1080.png diff --git a/wallpapers/os/tux-magenta-pink-1920x1080.png b/system/wallpapers/os/tux-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/tux-magenta-pink-1920x1080.png rename to system/wallpapers/os/tux-magenta-pink-1920x1080.png diff --git a/wallpapers/os/ubuntu-black-4k.png b/system/wallpapers/os/ubuntu-black-4k.png similarity index 100% rename from wallpapers/os/ubuntu-black-4k.png rename to system/wallpapers/os/ubuntu-black-4k.png diff --git a/wallpapers/os/ubuntu-magenta-blue-1920x1080.png b/system/wallpapers/os/ubuntu-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/ubuntu-magenta-blue-1920x1080.png rename to system/wallpapers/os/ubuntu-magenta-blue-1920x1080.png diff --git a/wallpapers/os/ubuntu-magenta-pink-1920x1080.png b/system/wallpapers/os/ubuntu-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/ubuntu-magenta-pink-1920x1080.png rename to system/wallpapers/os/ubuntu-magenta-pink-1920x1080.png diff --git a/wallpapers/os/various-arch-1-4k.png b/system/wallpapers/os/various-arch-1-4k.png similarity index 100% rename from wallpapers/os/various-arch-1-4k.png rename to system/wallpapers/os/various-arch-1-4k.png diff --git a/wallpapers/os/various-arch-2-4k.png b/system/wallpapers/os/various-arch-2-4k.png similarity index 100% rename from wallpapers/os/various-arch-2-4k.png rename to system/wallpapers/os/various-arch-2-4k.png diff --git a/wallpapers/os/various-os-1-4k.png b/system/wallpapers/os/various-os-1-4k.png similarity index 100% rename from wallpapers/os/various-os-1-4k.png rename to system/wallpapers/os/various-os-1-4k.png diff --git a/wallpapers/os/various-os-2-4k.png b/system/wallpapers/os/various-os-2-4k.png similarity index 100% rename from wallpapers/os/various-os-2-4k.png rename to system/wallpapers/os/various-os-2-4k.png diff --git a/wallpapers/os/various-os-3-4k.png b/system/wallpapers/os/various-os-3-4k.png similarity index 100% rename from wallpapers/os/various-os-3-4k.png rename to system/wallpapers/os/various-os-3-4k.png diff --git a/wallpapers/os/void-1920x1080.png b/system/wallpapers/os/void-1920x1080.png similarity index 100% rename from wallpapers/os/void-1920x1080.png rename to system/wallpapers/os/void-1920x1080.png diff --git a/wallpapers/os/void-black-4k.png b/system/wallpapers/os/void-black-4k.png similarity index 100% rename from wallpapers/os/void-black-4k.png rename to system/wallpapers/os/void-black-4k.png diff --git a/wallpapers/os/void-black3-1920x1080.png b/system/wallpapers/os/void-black3-1920x1080.png similarity index 100% rename from wallpapers/os/void-black3-1920x1080.png rename to system/wallpapers/os/void-black3-1920x1080.png diff --git a/wallpapers/os/void-magenta-blue-1920x1080.png b/system/wallpapers/os/void-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/void-magenta-blue-1920x1080.png rename to system/wallpapers/os/void-magenta-blue-1920x1080.png diff --git a/wallpapers/os/void-magenta-pink-1920x1080.png b/system/wallpapers/os/void-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/void-magenta-pink-1920x1080.png rename to system/wallpapers/os/void-magenta-pink-1920x1080.png diff --git a/wallpapers/os/windows-black.png b/system/wallpapers/os/windows-black.png similarity index 100% rename from wallpapers/os/windows-black.png rename to system/wallpapers/os/windows-black.png diff --git a/wallpapers/os/windows-magenta-blue-1920x1080.png b/system/wallpapers/os/windows-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/windows-magenta-blue-1920x1080.png rename to system/wallpapers/os/windows-magenta-blue-1920x1080.png diff --git a/wallpapers/os/windows-magenta-pink-1920x1080.png b/system/wallpapers/os/windows-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/windows-magenta-pink-1920x1080.png rename to system/wallpapers/os/windows-magenta-pink-1920x1080.png diff --git a/wallpapers/os/zorin-black-4k.png b/system/wallpapers/os/zorin-black-4k.png similarity index 100% rename from wallpapers/os/zorin-black-4k.png rename to system/wallpapers/os/zorin-black-4k.png diff --git a/wallpapers/os/zorin-magenta-blue-1920x1080.png b/system/wallpapers/os/zorin-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/zorin-magenta-blue-1920x1080.png rename to system/wallpapers/os/zorin-magenta-blue-1920x1080.png diff --git a/wallpapers/os/zorin-magenta-pink-1920x1080.png b/system/wallpapers/os/zorin-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/zorin-magenta-pink-1920x1080.png rename to system/wallpapers/os/zorin-magenta-pink-1920x1080.png diff --git a/wallpapers/patterns/emojis.png b/system/wallpapers/patterns/emojis.png similarity index 100% rename from wallpapers/patterns/emojis.png rename to system/wallpapers/patterns/emojis.png diff --git a/wallpapers/patterns/line_icons.png b/system/wallpapers/patterns/line_icons.png similarity index 100% rename from wallpapers/patterns/line_icons.png rename to system/wallpapers/patterns/line_icons.png diff --git a/wallpapers/solids/bkg1.png b/system/wallpapers/solids/bkg1.png similarity index 100% rename from wallpapers/solids/bkg1.png rename to system/wallpapers/solids/bkg1.png diff --git a/wallpapers/solids/bkg2.png b/system/wallpapers/solids/bkg2.png similarity index 100% rename from wallpapers/solids/bkg2.png rename to system/wallpapers/solids/bkg2.png diff --git a/wallpapers/solids/bkg3.png b/system/wallpapers/solids/bkg3.png similarity index 100% rename from wallpapers/solids/bkg3.png rename to system/wallpapers/solids/bkg3.png diff --git a/wallpapers/solids/bkg4.png b/system/wallpapers/solids/bkg4.png similarity index 100% rename from wallpapers/solids/bkg4.png rename to system/wallpapers/solids/bkg4.png diff --git a/wallpapers/solids/bkg5.png b/system/wallpapers/solids/bkg5.png similarity index 100% rename from wallpapers/solids/bkg5.png rename to system/wallpapers/solids/bkg5.png diff --git a/wallpapers/solids/blue.png b/system/wallpapers/solids/blue.png similarity index 100% rename from wallpapers/solids/blue.png rename to system/wallpapers/solids/blue.png diff --git a/wallpapers/solids/cyan.png b/system/wallpapers/solids/cyan.png similarity index 100% rename from wallpapers/solids/cyan.png rename to system/wallpapers/solids/cyan.png diff --git a/wallpapers/solids/flamingo.png b/system/wallpapers/solids/flamingo.png similarity index 100% rename from wallpapers/solids/flamingo.png rename to system/wallpapers/solids/flamingo.png diff --git a/wallpapers/solids/gray.png b/system/wallpapers/solids/gray.png similarity index 100% rename from wallpapers/solids/gray.png rename to system/wallpapers/solids/gray.png diff --git a/wallpapers/solids/green.png b/system/wallpapers/solids/green.png similarity index 100% rename from wallpapers/solids/green.png rename to system/wallpapers/solids/green.png diff --git a/wallpapers/solids/magenta.png b/system/wallpapers/solids/magenta.png similarity index 100% rename from wallpapers/solids/magenta.png rename to system/wallpapers/solids/magenta.png diff --git a/wallpapers/solids/peach.png b/system/wallpapers/solids/peach.png similarity index 100% rename from wallpapers/solids/peach.png rename to system/wallpapers/solids/peach.png diff --git a/wallpapers/solids/pink.png b/system/wallpapers/solids/pink.png similarity index 100% rename from wallpapers/solids/pink.png rename to system/wallpapers/solids/pink.png diff --git a/wallpapers/solids/red.png b/system/wallpapers/solids/red.png similarity index 100% rename from wallpapers/solids/red.png rename to system/wallpapers/solids/red.png diff --git a/wallpapers/solids/white.png b/system/wallpapers/solids/white.png similarity index 100% rename from wallpapers/solids/white.png rename to system/wallpapers/solids/white.png diff --git a/wallpapers/solids/yellow.png b/system/wallpapers/solids/yellow.png similarity index 100% rename from wallpapers/solids/yellow.png rename to system/wallpapers/solids/yellow.png diff --git a/wallpapers/wallpaper.jpg b/system/wallpapers/wallpaper.jpg similarity index 100% rename from wallpapers/wallpaper.jpg rename to system/wallpapers/wallpaper.jpg diff --git a/wallpapers/waves/Waves Dark 6016x6016.jpg b/system/wallpapers/waves/Waves Dark 6016x6016.jpg similarity index 100% rename from wallpapers/waves/Waves Dark 6016x6016.jpg rename to system/wallpapers/waves/Waves Dark 6016x6016.jpg diff --git a/wallpapers/waves/Waves Dark Alt 6016x6016.jpg b/system/wallpapers/waves/Waves Dark Alt 6016x6016.jpg similarity index 100% rename from wallpapers/waves/Waves Dark Alt 6016x6016.jpg rename to system/wallpapers/waves/Waves Dark Alt 6016x6016.jpg diff --git a/wallpapers/waves/Waves Light 6016x6016.jpg b/system/wallpapers/waves/Waves Light 6016x6016.jpg similarity index 100% rename from wallpapers/waves/Waves Light 6016x6016.jpg rename to system/wallpapers/waves/Waves Light 6016x6016.jpg diff --git a/wallpapers/waves/cat-blue-eye.png b/system/wallpapers/waves/cat-blue-eye.png similarity index 100% rename from wallpapers/waves/cat-blue-eye.png rename to system/wallpapers/waves/cat-blue-eye.png diff --git a/wallpapers/waves/cat-waves.png b/system/wallpapers/waves/cat-waves.png similarity index 100% rename from wallpapers/waves/cat-waves.png rename to system/wallpapers/waves/cat-waves.png diff --git a/wallpapers/waves/wavy_lines_v01_5120x2880.png b/system/wallpapers/waves/wavy_lines_v01_5120x2880.png similarity index 100% rename from wallpapers/waves/wavy_lines_v01_5120x2880.png rename to system/wallpapers/waves/wavy_lines_v01_5120x2880.png diff --git a/wallpapers/waves/wavy_lines_v02_5120x2880.png b/system/wallpapers/waves/wavy_lines_v02_5120x2880.png similarity index 100% rename from wallpapers/waves/wavy_lines_v02_5120x2880.png rename to system/wallpapers/waves/wavy_lines_v02_5120x2880.png diff --git a/wallpapers/waves/wavy_lines_v03_5120x2880.png b/system/wallpapers/waves/wavy_lines_v03_5120x2880.png similarity index 100% rename from wallpapers/waves/wavy_lines_v03_5120x2880.png rename to system/wallpapers/waves/wavy_lines_v03_5120x2880.png