diff --git a/system/Legion.nix b/system/Legion.nix index 0a3c2c44..7d2b7926 100644 --- a/system/Legion.nix +++ b/system/Legion.nix @@ -20,10 +20,7 @@ home-manager.users.${username} = { home.stateVersion = "23.05"; }; - system = { - stateVersion = "23.05"; - autoUpgrade.operation = "switch"; - }; + system.stateVersion = "23.05"; users.mutableUsers = false; hardware.bluetooth.enable = true; } diff --git a/system/Vanguard.nix b/system/Vanguard.nix index c9b0f4a8..78ac9a43 100644 --- a/system/Vanguard.nix +++ b/system/Vanguard.nix @@ -36,6 +36,10 @@ input-overlay ]; }; + wayland.windowManager.hyprland.settings.monitor = [ + "desc:Acer Technologies ED270R TJMEE0043W01,1920x1080@144,0x140,1.0,vrr,2" + "desc:Microstep MSI G27CQ4 E2,2560x1440@144,1920x0,1.25,vrr,2" + ]; xdg.configFile."MangoHud/MangoHud.conf".text = with config.lib.stylix.scheme; '' preset=2 time diff --git a/system/default.nix b/system/default.nix index 7ca3c829..b0e34598 100644 --- a/system/default.nix +++ b/system/default.nix @@ -82,7 +82,6 @@ }; system.autoUpgrade = { enable = true; - operation = lib.mkDefault "boot"; persistent = true; allowReboot = false; flake = "git+${config.nix.registry.my-nixos.to.url}"; @@ -209,7 +208,7 @@ console.useXkbConfig = true; stylix = { enable = true; - image = ./home/wallpapers/default.jpg; + image = ./home/desktop/wallpapers/default.jpg; base16Scheme = "${pkgs.base16-schemes}/share/themes/one-light.yaml"; opacity.popups = 0.8; cursor = { diff --git a/system/desktop.nix b/system/desktop.nix index 7171de99..a83f53d7 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -1,25 +1,23 @@ { pkgs, username, ... }: { - home-manager.users.${username}.imports = [ ./home/desktop.nix ]; + home-manager.users.${username}.imports = [ ./home/desktop/default.nix ]; nixpkgs.config.chromium.commandLineArgs = "--password-store='gnome-libsecret' --enable-features=UseOzonePlatform --ozone-platform=wayland"; hardware.bluetooth.enable = true; environment = { sessionVariables = { NIXOS_OZONE_WL = "1"; + MOZ_ENABLE_WAYLAND = "1"; + XDG_SESSION_TYPE = "wayland"; QT_QPA_PLATFORM = "wayland"; }; systemPackages = with pkgs; [ libsecret libnotify xdg-utils + xarchiver hunspell hunspellDicts.en_GB-large ]; - plasma6.excludePackages = with pkgs.kdePackages; [ - plasma-browser-integration - konsole - kate - ]; }; security = { polkit.enable = true; @@ -35,21 +33,34 @@ programs = { dconf.enable = true; noisetorch.enable = true; + seahorse.enable = true; kdeconnect.enable = true; + hyprland.enable = true; xwayland.enable = true; + thunar = { + enable = true; + plugins = with pkgs.xfce; [ + thunar-archive-plugin + thunar-volman + ]; + }; }; gtk.iconCache.enable = true; + qt = { + enable = true; + style = "adwaita"; + platformTheme = "gnome"; + }; services = { - displayManager.sddm = { - enable = true; - wayland.enable = true; - }; - desktopManager.plasma6 = { - enable = true; - enableQt5Integration = true; - }; + gnome.gnome-keyring.enable = true; flatpak.enable = true; printing.enable = true; + tumbler.enable = true; + udisks2.enable = true; + gvfs = { + enable = true; + package = pkgs.gnome3.gvfs; + }; pipewire = { enable = true; pulse.enable = true; @@ -58,6 +69,20 @@ support32Bit = true; }; }; + greetd = { + enable = true; + settings = + let + default_session.command = "Hyprland"; + in + { + inherit default_session; + initial_session = { + inherit (default_session) command; + user = username; + }; + }; + }; xserver = { enable = true; xkb = { @@ -67,4 +92,8 @@ }; }; }; + xdg.portal = { + enable = true; + config.common.default = "*"; # TODO change for xdg-desktop-portal > 1.17 changes + }; } diff --git a/system/home/browser/bookmarks.json b/system/home/desktop/browser/bookmarks.json similarity index 100% rename from system/home/browser/bookmarks.json rename to system/home/desktop/browser/bookmarks.json diff --git a/system/home/browser/config.lisp b/system/home/desktop/browser/config.lisp similarity index 100% rename from system/home/browser/config.lisp rename to system/home/desktop/browser/config.lisp diff --git a/system/home/browser/default.nix b/system/home/desktop/browser/default.nix similarity index 100% rename from system/home/browser/default.nix rename to system/home/desktop/browser/default.nix diff --git a/system/home/browser/firefox.nix b/system/home/desktop/browser/firefox.nix similarity index 98% rename from system/home/browser/firefox.nix rename to system/home/desktop/browser/firefox.nix index 855fa324..e2bb7ca6 100644 --- a/system/home/browser/firefox.nix +++ b/system/home/desktop/browser/firefox.nix @@ -147,6 +147,10 @@ title = "Arch Wiki"; url = "https://wiki.archlinux.org"; } + { + title = "Hyprland Wiki"; + url = "https://wiki.hyprland.org"; + } ]; }; search = rec { diff --git a/system/home/browser/librewolf.nix b/system/home/desktop/browser/librewolf.nix similarity index 100% rename from system/home/browser/librewolf.nix rename to system/home/desktop/browser/librewolf.nix diff --git a/system/home/browser/nyxt.nix b/system/home/desktop/browser/nyxt.nix similarity index 100% rename from system/home/browser/nyxt.nix rename to system/home/desktop/browser/nyxt.nix diff --git a/system/home/calendar/default.nix b/system/home/desktop/calendar/default.nix similarity index 100% rename from system/home/calendar/default.nix rename to system/home/desktop/calendar/default.nix diff --git a/system/home/desktop.nix b/system/home/desktop/default.nix similarity index 83% rename from system/home/desktop.nix rename to system/home/desktop/default.nix index 5ad7d5ff..3ebdde61 100644 --- a/system/home/desktop.nix +++ b/system/home/desktop/default.nix @@ -1,29 +1,28 @@ { config, pkgs, ... }: { imports = [ - ./plasma/default.nix + ./hyprland.nix ./email/default.nix ./calendar/default.nix ./terminal/default.nix ./emacs/default.nix ./browser/default.nix ]; - home = { - packages = with pkgs; [ - webcord - signal-desktop - whatsapp-for-linux - nomachine-client - ]; - file.${config.gtk.gtk2.configLocation}.force = true; # Stop clashing with KDE - }; + home.packages = with pkgs; [ + wl-clipboard + webcord + signal-desktop + whatsapp-for-linux + nomachine-client + ]; services.syncthing.enable = true; + programs.mpv.enable = true; gtk = { enable = true; gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; iconTheme = { package = (pkgs.papirus-icon-theme.override { color = "magenta"; }); - name = "Papirus"; + name = "Papirus-Light"; }; }; xdg = { diff --git a/system/home/emacs/default.nix b/system/home/desktop/emacs/default.nix similarity index 97% rename from system/home/emacs/default.nix rename to system/home/desktop/emacs/default.nix index f3262489..b6a62333 100644 --- a/system/home/emacs/default.nix +++ b/system/home/desktop/emacs/default.nix @@ -1,9 +1,9 @@ { config, pkgs, ... }: { imports = [ - ../shell/default.nix - ../shell/git.nix - ../gpg/default.nix + ../../shell/default.nix + ../../shell/git.nix + ../../gpg/default.nix ]; stylix.targets.emacs.enable = false; services.emacs = { diff --git a/system/home/emacs/emacs-packages.nix b/system/home/desktop/emacs/emacs-packages.nix similarity index 100% rename from system/home/emacs/emacs-packages.nix rename to system/home/desktop/emacs/emacs-packages.nix diff --git a/system/home/emacs/luarocks/graph-toolkit.nix b/system/home/desktop/emacs/luarocks/graph-toolkit.nix similarity index 100% rename from system/home/emacs/luarocks/graph-toolkit.nix rename to system/home/desktop/emacs/luarocks/graph-toolkit.nix diff --git a/system/home/emacs/luarocks/scilua.nix b/system/home/desktop/emacs/luarocks/scilua.nix similarity index 100% rename from system/home/emacs/luarocks/scilua.nix rename to system/home/desktop/emacs/luarocks/scilua.nix diff --git a/system/home/emacs/luarocks/xsys.nix b/system/home/desktop/emacs/luarocks/xsys.nix similarity index 100% rename from system/home/emacs/luarocks/xsys.nix rename to system/home/desktop/emacs/luarocks/xsys.nix diff --git a/system/home/emacs/pypoetry.toml b/system/home/desktop/emacs/pypoetry.toml similarity index 100% rename from system/home/emacs/pypoetry.toml rename to system/home/desktop/emacs/pypoetry.toml diff --git a/system/home/emacs/ruff.toml b/system/home/desktop/emacs/ruff.toml similarity index 100% rename from system/home/emacs/ruff.toml rename to system/home/desktop/emacs/ruff.toml diff --git a/system/home/email/davmail.properties b/system/home/desktop/email/davmail.properties similarity index 100% rename from system/home/email/davmail.properties rename to system/home/desktop/email/davmail.properties diff --git a/system/home/email/default.nix b/system/home/desktop/email/default.nix similarity index 100% rename from system/home/email/default.nix rename to system/home/desktop/email/default.nix diff --git a/system/home/email/signatures/personal b/system/home/desktop/email/signatures/personal similarity index 100% rename from system/home/email/signatures/personal rename to system/home/desktop/email/signatures/personal diff --git a/system/home/email/signatures/work b/system/home/desktop/email/signatures/work similarity index 100% rename from system/home/email/signatures/work rename to system/home/desktop/email/signatures/work diff --git a/system/home/desktop/fuzzel.nix b/system/home/desktop/fuzzel.nix new file mode 100644 index 00000000..db066d9d --- /dev/null +++ b/system/home/desktop/fuzzel.nix @@ -0,0 +1,24 @@ +{ config, ... }: +{ + programs.fuzzel = { + enable = true; + settings = { + main = { + icon-theme = config.gtk.iconTheme.name; + icons-enabled = true; + fields = "filename,name,generic,categories"; + fuzzy = true; + filter-desktop = true; + terminal = "${config.programs.alacritty.package}/bin/alacritty -e"; + lines = 24; + width = 80; + tabs = 4; + layer = "overlay"; + }; + border = { + width = 1; + radius = 5; + }; + }; + }; +} diff --git a/system/home/desktop/hyprland.nix b/system/home/desktop/hyprland.nix new file mode 100644 index 00000000..6c95a196 --- /dev/null +++ b/system/home/desktop/hyprland.nix @@ -0,0 +1,446 @@ +{ + config, + lib, + pkgs, + ... +}: +{ + imports = [ + ./waybar.nix + ./fuzzel.nix + ./mako.nix + ]; + stylix.targets.hyprland.enable = false; # Use my own theme config + home.packages = [ + pkgs.libreoffice-fresh + pkgs.ffmpeg + pkgs.swayimg + (pkgs.writeShellScriptBin "protonmail-setup-bridge" '' + pkill -9 -f protonmail-bridge + PASSWORD_STORE_DIR=/dev/null ${pkgs.protonmail-bridge}/bin/protonmail-bridge -c + ${config.wayland.windowManager.hyprland.finalPackage}/bin/hyprctl dispatch exec "PASSWORD_STORE_DIR=/dev/null ${pkgs.protonmail-bridge}/bin/protonmail-bridge -n" + '') + ]; + services = { + hyprpaper.enable = true; + kanshi.systemdTarget = "hyprland-session.target"; + gpg-agent.pinentryPackage = pkgs.pinentry-qt; + avizo = { + enable = true; + settings.default.image-opacity = lib.mkForce "1.0"; + }; + kdeconnect = { + enable = true; + indicator = true; + }; + hypridle = { + enable = true; + settings = + let + hyprctl = "${config.wayland.windowManager.hyprland.finalPackage}/bin/hyprctl"; + in + { + general = { + after_sleep_cmd = "${hyprctl} dispatch dpms on"; + ignore_dbus_inhibit = false; + lock_cmd = "hyprlock"; + }; + + listener = [ + { + timeout = 900; + on-timeout = "hyprlock"; + } + { + timeout = 1200; + on-timeout = "${hyprctl} dispatch dpms off"; + on-resume = "${hyprctl} dispatch dpms on"; + } + ]; + }; + }; + }; + programs = { + waybar.systemd.target = "hyprland-session.target"; + hyprlock = + let + font = config.stylix.fonts.sansSerif.name; + foreground = config.lib.stylix.scheme.base05; + background = config.lib.stylix.scheme.base00; + accent = config.lib.stylix.scheme.base0E; + in + { + enable = true; + settings = { + general = { + disable_loading_bar = true; + grace = 5; + hide_cursor = true; + no_fade_in = false; + }; + background = [ + { + monitor = ""; + path = "screenshot"; + blur_passes = 3; + blur_size = 8; + } + ]; + label = [ + { + monitor = ""; + text = "cmd[update:30000] echo \"$(date +\"%R\")\""; + color = "0xff${background}"; + font_size = 90; + font_family = font; + position = "-30, 0"; + halign = "right"; + valign = "top"; + } + { + monitor = ""; + text = "cmd[update:43200000] echo \"$(date +\"%A,%e %B %Y\")\""; + color = "0xff${background}"; + font_size = 25; + font_family = font; + position = "-30, -150"; + halign = "right"; + valign = "top"; + } + ]; + image = [ + { + monitor = ""; + path = "${./pfp/personal.png}"; + size = 100; + border_color = "0xff${accent}"; + position = "0, 75"; + halign = "center"; + valign = "center"; + } + ]; + input-field = [ + { + monitor = ""; + size = "300, 60"; + outline_thickness = 2; + dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = true; + outer_color = "0xff${accent}"; + inner_color = "0xff${background}"; + font_color = "0xff${foreground}"; + fade_on_empty = false; + placeholder_text = "󰌾 Logged in as $USER"; + hide_input = false; + position = "0, -50"; + halign = "center"; + valign = "center"; + } + ]; + }; + }; + }; + wayland.windowManager.hyprland = { + enable = true; + xwayland.enable = true; + systemd.enable = true; + settings = { + monitor = [ ",preferred,auto,auto" ]; + env = [ + "XDG_CURRENT_DESKTOP=Hyprland" + "XDG_SESSION_DESKTOP=Hyprland" + "GDK_BACKEND=wayland,x11" + "QT_AUTO_SCREEN_SCALE_FACTOR,1" + "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" + "GRIM_DEFAULT_DIR,${config.xdg.userDirs.pictures}/Screenshots" + ]; + exec-once = [ + "systemctl --user import-environment WAYLAND_DISPLAY QT_QPA_PLATFORMTHEME" + "${config.wayland.windowManager.hyprland.finalPackage}/bin/hyprctl setcursor ${config.gtk.cursorTheme.name} ${toString config.gtk.cursorTheme.size}" + "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1" + "PASSWORD_STORE_DIR=/dev/null ${pkgs.protonmail-bridge}/bin/protonmail-bridge -n" + "${pkgs.dex}/bin/dex -a" + # "systemctl --user start hyprland-session.target" + # "systemctl --user start hyprpaper.service" + ]; + gestures.workspace_swipe = true; + input = { + kb_layout = "gb"; + kb_options = "ctrl:nocaps"; + follow_mouse = 1; + touchpad.natural_scroll = "yes"; + }; + dwindle = { + force_split = 2; + preserve_split = false; + smart_split = false; + smart_resizing = false; + special_scale_factor = 0.95; + no_gaps_when_only = 0; + use_active_for_splits = true; + default_split_ratio = 1.0; + }; + master = { + allow_small_split = true; + special_scale_factor = 0.95; + mfact = 0.5; + # new_is_master = false; + new_on_top = false; + no_gaps_when_only = 0; + orientation = "left"; + inherit_fullscreen = false; + smart_resizing = false; + drop_at_cursor = true; + }; + general = with config.lib.stylix.scheme; { + "col.active_border" = "rgb(${base0E})"; + "col.inactive_border" = "rgb(${base04})"; + gaps_in = 2.5; + gaps_out = 5; + border_size = 1; + # cursor_inactive_timeout = 0; + layout = "master"; + }; + decoration = { + rounding = 5; + "col.shadow" = "rgba(${config.lib.stylix.scheme.base00}0d)"; + drop_shadow = "yes"; + shadow_ignore_window = true; + shadow_range = 4; + shadow_render_power = 3; + blur = { + enabled = true; + size = 5; + passes = 3; + new_optimizations = true; + brightness = 1.0; + noise = 2.0e-2; + }; + }; + animations = { + enabled = true; + bezier = "myBezier, 0.05, 0.9, 0.1, 1.05"; + animation = [ + "windows, 1, 7, myBezier" + "windowsOut, 1, 7, default, popin 80%" + "border, 1, 10, default" + "borderangle, 1, 8, default" + "fade, 1, 7, default" + "workspaces, 1, 6, default" + ]; + }; + misc = { + disable_splash_rendering = true; + disable_autoreload = true; + mouse_move_enables_dpms = true; + key_press_enables_dpms = true; + }; + xwayland.force_zero_scaling = true; + layerrule = + let + blur = x: "blur, ^(${x})$"; + ignorealpha = x: "ignorealpha 0.3, ^(${x})$"; + layers = [ + "system-menu" + "gtk-layer-shell" + "notifications" + "launcher" + "logout_dialog" + "waybar" + "avizo" + ]; + in + (lib.lists.forEach layers blur) ++ (lib.lists.forEach layers ignorealpha); + windowrule = [ + # Float + move system windows + "float, org.kde.polkit-kde-authentication-agent-1|Pinentry" + "center, org.kde.polkit-kde-authentication-agent-1|Pinentry" + "pin, org.kde.polkit-kde-authentication-agent-1|Pinentry" + "dimaround, org.kde.polkit-kde-authentication-agent-1|Pinentry" + "stayfocused, org.kde.polkit-kde-authentication-agent-1|Pinentry" + "float, pavucontrol|.blueman-manager-wrapped|nm-connection-editor" + "size 800 600, pavucontrol|.blueman-manager-wrapped|nm-connection-editor" + "move onscreen 100%-820 60,pavucontrol|.blueman-manager-wrapped|nm-connection-editor" + + # PrismLauncher / Minecraft + "float, org.prismlauncher.PrismLauncher" + "center, org.prismlauncher.PrismLauncher" + "size 800 600, org.prismlauncher.PrismLauncher" + ]; + windowrulev2 = [ + # Firefox PIP + "float, title:Picture-in-Picture|Library,class:firefox" + "size 750 400, title:Picture-in-Picture,class:firefox" + "size 800 800, title:Library,class:firefox" + "move onscreen 100%-775 100%-425, title:Picture-in-Picture,class:firefox" + "center, title:Library,class:firefox" + "pin, title:Picture-in-Picture,class:firefox" + + # Thunar extra windows + "float, title:File Operation Progress,class:thunar" + "size 800 600, title:File Operation Progress,class:thunar" + "center, title:File Operation Progress,class:thunar" + + # LibreOffice + # "nofullscreenrequest, class:(libreoffice|soffice)(.*)" + # "nomaximizerequest, class:(libreoffice|soffice)(.*)" + "float, title:Open,class:(libreoffice|soffice)(.*)" + + # Steam + "float, title:Friends List,class:steam" + "size 400 600, title:Friends List,class:steam" + "float, title:(.*)(Chat),class:steam" + "size 800 600, title:(.*)(Chat),class:steam" + "float, title:Steam Settings,class:steam" + "size 800 600, title:Steam Settings,class:steam" + + # X2Go / Remmina / NoMachine + # "nofullscreenrequest, class:x2goclient|org.remmina.Remmina|Nxplayer.bin" + # "nomaximizerequest, class:x2goclient|org.remmina.Remmina|Nxplayer.bin" + "float, title:(X2Go Client|Freia|Heimdall), class:x2goclient" + "float, title:Remmina Remote Desktop Client, class:org.remmina.Remmina" + "float, title:(NoMachine)(.*), class:Nxplayer.bin" + "center, title:(X2Go Client|Freia|Heimdall), class:x2goclient" + "center, title:Remmina Remote Desktop Client, class:org.remmina.Remmina" + "center, title:(NoMachine)(.*), class:Nxplayer.bin" + "size 800 600, title:X2Go Client, class:x2goclient" + "size 1920 1080, title:Freia|Heimdall, class:x2goclient" + "size 1920 1080, title:(NoMachine)(.*), class:Nxplayer.bin" + ]; + bind = + let + withTerm = + { + term ? "alacritty", + package ? config.programs.${term}.package, + progname, + args ? "", + }: + "${package}/bin/${term} -T ${progname} -e ${progname} ${args}"; + workspace = w: [ + "SUPER, ${toString w}, moveworkspacetomonitor, ${toString w} current" + "SUPER, ${toString w}, workspace, ${toString w}" + "SUPER SHIFT, ${toString w}, movetoworkspace, ${toString w}" + ]; + in + lib.lists.flatten (lib.lists.forEach (lib.lists.range 1 9) workspace) + ++ ( + let + btm_args = "--autohide_time --battery --celsius --enable_cache_memory --enable_gpu_memory --group --hide_avg_cpu --hide_table_gap --retention=3m --show_table_scroll_position"; + in + [ + # See https://wiki.hyprland.org/Configuring/Keywords/ for more + # Open Hyprland wiki at correct version number + "CTRL_SHIFT, H, exec, xdg-open \"https://wiki.hyprland.org/$(${config.wayland.windowManager.hyprland.finalPackage}/bin/hyprctl version -j | ${pkgs.jq}/bin/jq $args.tag | ${pkgs.gnused}/bin/sed s/v// | ${pkgs.gnused}/bin/sed s/\\\"//g)\"" + + "SUPER, F1, exec, ${config.programs.hyprlock.package}/bin/hyprlock" + # "SUPER, F1, exec, ${config.programs.swaylock.package}/bin/swaylock --screenshots --clock --indicator --grace-no-mouse" + "SUPER, Q, killactive," + # "SUPER SHIFT, Q, exec, pkill rofi || ${config.programs.rofi.finalPackage}/bin/rofi -show powermenu -modi powermenu:${pkgs.rofi-power-menu}/bin/rofi-power-menu" + "SUPER, V, togglefloating" + # "SUPER SHIFT, V, setfloating" ## TODO setfloating exists + # in newer version of Hyprland than mine + "SUPER SHIFT, V, moveactive, exact 1% 4%" + "SUPER SHIFT, V, resizeactive, exact 800 600" + "SUPER SHIFT, V, pin" + "SUPER, M, fullscreen, 1" # Maximise window + "SUPER SHIFT, M, fullscreen, 0" # Actual fullscreen + "SUPER, Z, exec, ${config.services.mako.package}/bin/makoctl restore" + "SUPER SHIFT, Z, exec, exec ${config.services.mako.package}/bin/makoctl dismiss -a" + + # Common program shortcuts + "SUPER, Return, exec, ${config.programs.alacritty.package}/bin/alacritty" + "SUPER SHIFT, Return, exec, ${config.programs.emacs.finalPackage}/bin/emacsclient -c" + "SUPER, W, exec, ${config.programs.firefox.package}/bin/firefox" + "SUPER, F, exec, ${pkgs.xfce.thunar}/bin/thunar" + + # fuzzel binds + "SUPER, Space, exec, ${config.programs.fuzzel.package}/bin/fuzzel" + # "SUPER, Space, exec, pkill rofi || ${config.programs.rofi.finalPackage}/bin/rofi -show drun" + # "SUPER, tab, exec, pkill rofi || ${config.programs.rofi.finalPackage}/bin/rofi -show window" + # "SUPER, A, exec, pkill rofi || ${config.programs.rofi.finalPackage}/bin/rofi -show emoji" + + # rofi-pass binds + "SUPER, P, exec, pkill rofi || ${config.programs.rofi.pass.package}/bin/rofi-pass" + "SUPER SHIFT, P, exec, pkill rofi || ${config.programs.rofi.pass.package}/bin/rofi-pass --last-used" + "SUPER ALT, P, exec, pkill rofi || ${config.programs.rofi.pass.package}/bin/rofi-pass --insert" + + # Terminal utilities + "SUPER, S, exec, ${ + withTerm { + progname = "btm"; + args = btm_args; + } + }" + "SUPER SHIFT, S, exec, ${ + withTerm { + progname = "btm"; + args = btm_args + " --basic"; + } + }" + "SUPER, C, exec, ${withTerm { progname = "cava"; }}" + + # Misc useful binds + ",Print,exec,${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.swappy}/bin/swappy -f -" + # ",XF86Calculator,exec,pkill rofi || ${config.programs.rofi.finalPackage}/bin/rofi -show calc" + + # Movement binds + "SUPER, H, movefocus, l" + "SUPER, L, movefocus, r" + "SUPER, K, movefocus, u" + "SUPER, J, movefocus, d" + "SUPER SHIFT, H, movewindow, l" + "SUPER SHIFT, L, movewindow, r" + "SUPER SHIFT, K, movewindow, u" + "SUPER SHIFT, J, movewindow, d" + + # Special workspaces + "SUPER, comma, workspace, m-1" + "SUPER SHIFT, comma, movetoworkspace, r-1" + "SUPER, period, workspace, m+1" + "SUPER SHIFT, period, movetoworkspace, r+1" + "SUPER, N, workspace, empty" + "SUPER SHIFT, N, movetoworkspace, empty" + "SUPER, minus, togglespecialworkspace" + "SUPER SHIFT, minus, movetoworkspace, special" + "SUPER, bracketright, focusmonitor, +1" + "SUPER SHIFT, bracketright, movecurrentworkspacetomonitor, +1" + "SUPER, bracketleft, focusmonitor, -1" + "SUPER SHIFT, bracketleft, movecurrentworkspacetomonitor, -1" + "SUPER, O, focusurgentorlast" + ] + ); + bindl = [ + # Sound + ",XF86AudioMute,exec,${config.services.avizo.package}/bin/volumectl %" + ",XF86AudioMicMute,exec,${config.services.avizo.package}/bin/volumectl -m %" + + # Playback + ",XF86AudioPlay,exec,${pkgs.playerctl}/bin/playerctl play-pause" + ",XF86AudioStop,exec,${pkgs.playerctl}/bin/playerctl play-pause" + ",XF86AudioPrev,exec,${pkgs.playerctl}/bin/playerctl previous" + ",XF86AudioNext,exec,${pkgs.playerctl}/bin/playerctl next" + ]; + bindle = [ + # Sound + ",XF86AudioRaiseVolume,exec,${config.services.avizo.package}/bin/volumectl -u + 5" + ",XF86AudioLowerVolume,exec,${config.services.avizo.package}/bin/volumectl -u - 5" + + # Brightness + ",XF86MonBrightnessUp,exec,${config.services.avizo.package}/bin/lightctl + 5" + ",XF86MonBrightnessDown,exec,${config.services.avizo.package}/bin/lightctl - 5" + ]; + bindm = [ + # Move/resize windows with mainMod + LMB/RMB and dragging + "SUPER, mouse:272, movewindow" + "SUPER, mouse:273, resizewindow" + ]; + }; + }; + xdg.configFile."hypr/hyprpaper.conf".text = '' + preload = ${config.stylix.image} + wallpaper = ,${config.stylix.image} + ''; + +} diff --git a/system/home/desktop/mako.nix b/system/home/desktop/mako.nix new file mode 100644 index 00000000..a7d839a7 --- /dev/null +++ b/system/home/desktop/mako.nix @@ -0,0 +1,17 @@ +{ config, ... }: +{ + services.mako = { + enable = true; + anchor = "top-right"; + width = 600; + height = 600; + layer = "top"; + markup = true; + maxVisible = 10; + icons = true; + iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}"; + borderRadius = 5; + borderSize = 1; + defaultTimeout = 0; + }; +} diff --git a/system/home/mimeapps/default.nix b/system/home/desktop/mimeapps/default.nix similarity index 95% rename from system/home/mimeapps/default.nix rename to system/home/desktop/mimeapps/default.nix index 391c130f..520fcc63 100644 --- a/system/home/mimeapps/default.nix +++ b/system/home/desktop/mimeapps/default.nix @@ -39,7 +39,9 @@ in "application/x-yaml" = emacs; "application/msword" = [ "writer.desktop" ]; + "application/zip" = [ "xarchiver.desktop" ]; + "application/x-archive" = [ "xarchiver.desktop" ]; "application/x-extension-htm" = browser; "application/x-extension-html" = browser; "application/x-extension-shtml" = browser; diff --git a/pfp/personal.png b/system/home/desktop/pfp/personal.png similarity index 100% rename from pfp/personal.png rename to system/home/desktop/pfp/personal.png diff --git a/pfp/personal_micro.jpg b/system/home/desktop/pfp/personal_micro.jpg similarity index 100% rename from pfp/personal_micro.jpg rename to system/home/desktop/pfp/personal_micro.jpg diff --git a/pfp/work.jpg b/system/home/desktop/pfp/work.jpg similarity index 100% rename from pfp/work.jpg rename to system/home/desktop/pfp/work.jpg diff --git a/pfp/work_micro.jpg b/system/home/desktop/pfp/work_micro.jpg similarity index 100% rename from pfp/work_micro.jpg rename to system/home/desktop/pfp/work_micro.jpg diff --git a/system/home/plasma/default.nix b/system/home/desktop/plasma.nix similarity index 97% rename from system/home/plasma/default.nix rename to system/home/desktop/plasma.nix index 13fe430f..38efdc69 100644 --- a/system/home/plasma/default.nix +++ b/system/home/desktop/plasma.nix @@ -7,12 +7,15 @@ { stylix.targets.kde.enable = false; imports = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; - home.packages = with pkgs; [ - protonmail-bridge-gui - libreoffice-qt-fresh - rc2nix - wl-clipboard - ]; + home = { + packages = with pkgs; [ + protonmail-bridge-gui + libreoffice-qt-fresh + rc2nix + wl-clipboard + ]; + file.${config.gtk.gtk2.configLocation}.force = true; # Stop clashing with KDE + }; services.gpg-agent.pinentryPackage = pkgs.pinentry-qt; programs.plasma = { enable = true; diff --git a/system/home/desktop/sway.nix b/system/home/desktop/sway.nix new file mode 100644 index 00000000..7be6ea57 --- /dev/null +++ b/system/home/desktop/sway.nix @@ -0,0 +1,202 @@ +{ + config, + lib, + pkgs, + ... +}: +{ + imports = [ + ./waybar.nix + ./fuzzel.nix + ./mako.nix + ]; + stylix.targets.swaylock.useImage = false; # Using swaylock-effects instead + home.packages = with pkgs; [ + libreoffice-fresh + ffmpeg + grim + slurp + swappy + wl-clipboard + swayimg + swaybg + (writeShellScriptBin "swaylockfx" '' + ${swaylock-effects}/bin/swaylock --screenshots --clock --indicator --effect-blur 7x5 --effect-vignette 0.5:0.5 + '') + (writeShellScriptBin "protonmail-setup-bridge" '' + pkill -9 -f protonmail-bridge + ${protonmail-bridge}/bin/protonmail-bridge -c + swaymsg exec "${protonmail-bridge}/bin/protonmail-bridge -n" + '') + ]; + programs = { + waybar.systemd.target = "sway-session.target"; + swaylock = { + enable = true; + package = pkgs.swaylock-effects; + }; + }; + services = { + kanshi.systemdTarget = "sway-session.target"; + gpg-agent.pinentryPackage = pkgs.pinentry-gnome3; + avizo = { + enable = true; + settings.default.image-opacity = lib.mkForce "1.0"; + }; + kdeconnect = { + enable = true; + indicator = true; + }; + swayidle = { + enable = true; + timeouts = [ + { + timeout = 60 * 15; # 15 minutes + command = "swaylockfx"; + } + ]; + }; + udiskie = { + enable = true; + notify = true; + automount = true; + tray = "never"; + }; + }; + wayland.windowManager.sway = { + enable = true; + package = pkgs.swayfx.overrideAttrs (old: { + passthru.providedSessions = [ "sway" ]; + }); + swaynag.enable = true; + systemd.enable = true; + xwayland = true; + checkConfig = false; + config = { + input = { + "*" = { + xkb_layout = "gb"; + xkb_options = "ctrl:nocaps"; + }; + "type:touchpad" = { + tap = "enabled"; + natural_scroll = "enabled"; + }; + }; + seat = { + "seat0" = { + xcursor_theme = "${config.gtk.cursorTheme.name} ${toString config.gtk.cursorTheme.size}"; + }; + }; + modifier = "Mod4"; + terminal = "${config.programs.alacritty.package}/bin/alacritty"; + menu = "${config.programs.fuzzel.package}/bin/fuzzel"; + workspaceAutoBackAndForth = true; + bars = [ ]; + gaps = { + inner = 5; + outer = 0; + }; + startup = [ + { command = "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"; } + { command = "${pkgs.protonmail-bridge}/bin/protonmail-bridge -n"; } + { command = "${pkgs.dex}/bin/dex -a"; } + { command = "${config.services.mako.package}/bin/mako"; } + ]; + window = { + border = 1; + titlebar = false; + commands = [ + { + criteria.window_role = "(?:pop-up|bubble|dialog)"; + command = "floating enable"; + } + { + criteria.app_id = "(?:org\.kde\.polkit-kde-authentication-agent-1|Pinentry|pavucontrol|\.blueman-manager-wrapped|nm-connection-editor)"; + command = "floating enable"; + } + { + criteria.class = "(?:[Mm]atplotlib|.*\.py|Idl)"; + command = "floating enable"; + } + { + # Catch-all for file dialog windows + criteria.title = "(?:Open|Save) (?:File|Folder|As)"; + command = "floating enable, resize set width 1030 height 710"; + } + { + # Inhibit idle when watching vidoes + criteria.app_id = "(?:firefox|mpv)"; + command = "inhibit_idle fullscreen"; + } + { + # Window rules for game sessions. + # Note: controllers don't reset idle timer + criteria.class = "(?:steam_app|Minecraft).*"; + command = "floating enable, fullscreen enable, inhibit_idle focus"; + } + ]; + }; + floating.border = 1; + keybindings = + let + modifier = config.wayland.windowManager.sway.config.modifier; + in + lib.mkOptionDefault { + # Movement + "${modifier}+comma" = "workspace prev"; + "${modifier}+period" = "workspace next"; + "${modifier}+shift+comma" = "move workspace prev"; + "${modifier}+shift+period" = "move workspace next"; + "${modifier}+bracketleft" = "move workspace to output left"; + "${modifier}+bracketright" = "move workspace to output right"; + + # Function keys + ## Screenshot + "Print" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.swappy}/bin/swappy -f -"; + + ## Sound + "XF86AudioMute" = "exec ${config.services.avizo.package}/bin/volumectl %"; + "XF86AudioMicMute" = "exec ${config.services.avizo.package}/bin/volumectl -m %"; + "XF86AudioRaiseVolume" = "exec ${config.services.avizo.package}/bin/volumectl -u + 5"; + "XF86AudioLowerVolume" = "exec ${config.services.avizo.package}/bin/volumectl -u - 5"; + + ## Playback + "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause"; + "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl play-pause"; + "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous"; + "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next"; + + ## Brightness + "XF86MonBrightnessUp" = "exec ${config.services.avizo.package}/bin/lightctl + 5"; + "XF86MonBrightnessDown" = "exec ${config.services.avizo.package}/bin/lightctl - 5"; + + # System utilities + "Mod4+Mod1+l" = "exec swaylockfx"; + "${modifier}+z" = "exec ${config.services.mako.package}/bin/makoctl restore"; + "${modifier}+Shift+z" = "exec ${config.services.mako.package}/bin/makoctl dismiss -a"; + "${modifier}+Shift+Return" = "exec ${config.programs.emacs.finalPackage}/bin/emacsclient -c"; + }; + }; + extraConfig = '' + bindgesture swipe:right workspace prev + bindgesture swipe:left workspace next + corner_radius 5 + blur enable + blur_xray disable + blur_passes 3 + blur_radius 5 + shadows enable + shadow_blur_radius 5 + layer_effects "system-menu" blur enable; blur_ignore_transparent enable; shadows enable + layer_effects "gtk-layer-shell" blur enable; blur_ignore_transparent enable; shadows enable + layer_effects "notifications" blur enable; blur_ignore_transparent enable; shadows enable + layer_effects "launcher" blur enable; blur_ignore_transparent enable; shadows enable + layer_effects "logout_dialog" blur enable; blur_ignore_transparent enable; shadows enable + layer_effects "waybar" blur enable; blur_ignore_transparent enable; shadows enable + layer_effects "avizo" blur enable; blur_ignore_transparent enable; shadows enable + titlebar_separator enable + ''; + }; + xdg.configFile."swappy/config".source = ./swappy.conf; +} diff --git a/system/home/terminal/alacritty.nix b/system/home/desktop/terminal/alacritty.nix similarity index 100% rename from system/home/terminal/alacritty.nix rename to system/home/desktop/terminal/alacritty.nix diff --git a/system/home/terminal/default.nix b/system/home/desktop/terminal/default.nix similarity index 100% rename from system/home/terminal/default.nix rename to system/home/desktop/terminal/default.nix diff --git a/system/home/wallpapers/LICENSE b/system/home/desktop/wallpapers/LICENSE similarity index 100% rename from system/home/wallpapers/LICENSE rename to system/home/desktop/wallpapers/LICENSE diff --git a/system/home/wallpapers/README.md b/system/home/desktop/wallpapers/README.md similarity index 100% rename from system/home/wallpapers/README.md rename to system/home/desktop/wallpapers/README.md diff --git a/system/home/wallpapers/blake.png b/system/home/desktop/wallpapers/blake.png similarity index 100% rename from system/home/wallpapers/blake.png rename to system/home/desktop/wallpapers/blake.png diff --git a/system/home/wallpapers/default.jpg b/system/home/desktop/wallpapers/default.jpg similarity index 100% rename from system/home/wallpapers/default.jpg rename to system/home/desktop/wallpapers/default.jpg diff --git a/system/home/wallpapers/dithered/barn.png b/system/home/desktop/wallpapers/dithered/barn.png similarity index 100% rename from system/home/wallpapers/dithered/barn.png rename to system/home/desktop/wallpapers/dithered/barn.png diff --git a/system/home/wallpapers/dithered/lighthouse.png b/system/home/desktop/wallpapers/dithered/lighthouse.png similarity index 100% rename from system/home/wallpapers/dithered/lighthouse.png rename to system/home/desktop/wallpapers/dithered/lighthouse.png diff --git a/system/home/wallpapers/dithered/marketplace.png b/system/home/desktop/wallpapers/dithered/marketplace.png similarity index 100% rename from system/home/wallpapers/dithered/marketplace.png rename to system/home/desktop/wallpapers/dithered/marketplace.png diff --git a/system/home/wallpapers/dithered/motorbikes.png b/system/home/desktop/wallpapers/dithered/motorbikes.png similarity index 100% rename from system/home/wallpapers/dithered/motorbikes.png rename to system/home/desktop/wallpapers/dithered/motorbikes.png diff --git a/system/home/wallpapers/flatppuccin/flatppuccin_4k_macchiato.png b/system/home/desktop/wallpapers/flatppuccin/flatppuccin_4k_macchiato.png similarity index 100% rename from system/home/wallpapers/flatppuccin/flatppuccin_4k_macchiato.png rename to system/home/desktop/wallpapers/flatppuccin/flatppuccin_4k_macchiato.png diff --git a/system/home/wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png b/system/home/desktop/wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png similarity index 100% rename from system/home/wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png rename to system/home/desktop/wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png diff --git a/system/home/wallpapers/gradients/bkg1_bkg5.png b/system/home/desktop/wallpapers/gradients/bkg1_bkg5.png similarity index 100% rename from system/home/wallpapers/gradients/bkg1_bkg5.png rename to system/home/desktop/wallpapers/gradients/bkg1_bkg5.png diff --git a/system/home/wallpapers/gradients/bkg3_bkg5.png b/system/home/desktop/wallpapers/gradients/bkg3_bkg5.png similarity index 100% rename from system/home/wallpapers/gradients/bkg3_bkg5.png rename to system/home/desktop/wallpapers/gradients/bkg3_bkg5.png diff --git a/system/home/wallpapers/gradients/blue_bkg5.png b/system/home/desktop/wallpapers/gradients/blue_bkg5.png similarity index 100% rename from system/home/wallpapers/gradients/blue_bkg5.png rename to system/home/desktop/wallpapers/gradients/blue_bkg5.png diff --git a/system/home/wallpapers/gradients/blue_green.png b/system/home/desktop/wallpapers/gradients/blue_green.png similarity index 100% rename from system/home/wallpapers/gradients/blue_green.png rename to system/home/desktop/wallpapers/gradients/blue_green.png diff --git a/system/home/wallpapers/gradients/cyan_bkg5.png b/system/home/desktop/wallpapers/gradients/cyan_bkg5.png similarity index 100% rename from system/home/wallpapers/gradients/cyan_bkg5.png rename to system/home/desktop/wallpapers/gradients/cyan_bkg5.png diff --git a/system/home/wallpapers/gradients/flamingo_bkg1.png b/system/home/desktop/wallpapers/gradients/flamingo_bkg1.png similarity index 100% rename from system/home/wallpapers/gradients/flamingo_bkg1.png rename to system/home/desktop/wallpapers/gradients/flamingo_bkg1.png diff --git a/system/home/wallpapers/gradients/flamingo_bkg5.png b/system/home/desktop/wallpapers/gradients/flamingo_bkg5.png similarity index 100% rename from system/home/wallpapers/gradients/flamingo_bkg5.png rename to system/home/desktop/wallpapers/gradients/flamingo_bkg5.png diff --git a/system/home/wallpapers/gradients/flamingo_peach.png b/system/home/desktop/wallpapers/gradients/flamingo_peach.png similarity index 100% rename from system/home/wallpapers/gradients/flamingo_peach.png rename to system/home/desktop/wallpapers/gradients/flamingo_peach.png diff --git a/system/home/wallpapers/gradients/flamingo_yellow.png b/system/home/desktop/wallpapers/gradients/flamingo_yellow.png similarity index 100% rename from system/home/wallpapers/gradients/flamingo_yellow.png rename to system/home/desktop/wallpapers/gradients/flamingo_yellow.png diff --git a/system/home/wallpapers/gradients/green_bkg5.png b/system/home/desktop/wallpapers/gradients/green_bkg5.png similarity index 100% rename from system/home/wallpapers/gradients/green_bkg5.png rename to system/home/desktop/wallpapers/gradients/green_bkg5.png diff --git a/system/home/wallpapers/gradients/magenta_blue.png b/system/home/desktop/wallpapers/gradients/magenta_blue.png similarity index 100% rename from system/home/wallpapers/gradients/magenta_blue.png rename to system/home/desktop/wallpapers/gradients/magenta_blue.png diff --git a/system/home/wallpapers/gradients/magenta_pink.png b/system/home/desktop/wallpapers/gradients/magenta_pink.png similarity index 100% rename from system/home/wallpapers/gradients/magenta_pink.png rename to system/home/desktop/wallpapers/gradients/magenta_pink.png diff --git a/system/home/wallpapers/gradients/peach_bkg5.png b/system/home/desktop/wallpapers/gradients/peach_bkg5.png similarity index 100% rename from system/home/wallpapers/gradients/peach_bkg5.png rename to system/home/desktop/wallpapers/gradients/peach_bkg5.png diff --git a/system/home/wallpapers/gradients/red_bkg5.png b/system/home/desktop/wallpapers/gradients/red_bkg5.png similarity index 100% rename from system/home/wallpapers/gradients/red_bkg5.png rename to system/home/desktop/wallpapers/gradients/red_bkg5.png diff --git a/system/home/wallpapers/gradients/red_peach.png b/system/home/desktop/wallpapers/gradients/red_peach.png similarity index 100% rename from system/home/wallpapers/gradients/red_peach.png rename to system/home/desktop/wallpapers/gradients/red_peach.png diff --git a/system/home/wallpapers/gradients/red_pink.png b/system/home/desktop/wallpapers/gradients/red_pink.png similarity index 100% rename from system/home/wallpapers/gradients/red_pink.png rename to system/home/desktop/wallpapers/gradients/red_pink.png diff --git a/system/home/wallpapers/hypr/HYPRCHAN.png b/system/home/desktop/wallpapers/hypr/HYPRCHAN.png similarity index 100% rename from system/home/wallpapers/hypr/HYPRCHAN.png rename to system/home/desktop/wallpapers/hypr/HYPRCHAN.png diff --git a/system/home/wallpapers/hypr/Hyprscreeen_of_death.png b/system/home/desktop/wallpapers/hypr/Hyprscreeen_of_death.png similarity index 100% rename from system/home/wallpapers/hypr/Hyprscreeen_of_death.png rename to system/home/desktop/wallpapers/hypr/Hyprscreeen_of_death.png diff --git a/system/home/wallpapers/hypr/Hyprscreeen_of_death_mascot.png b/system/home/desktop/wallpapers/hypr/Hyprscreeen_of_death_mascot.png similarity index 100% rename from system/home/wallpapers/hypr/Hyprscreeen_of_death_mascot.png rename to system/home/desktop/wallpapers/hypr/Hyprscreeen_of_death_mascot.png diff --git a/system/home/wallpapers/hypr/hyprfog-2.png b/system/home/desktop/wallpapers/hypr/hyprfog-2.png similarity index 100% rename from system/home/wallpapers/hypr/hyprfog-2.png rename to system/home/desktop/wallpapers/hypr/hyprfog-2.png diff --git a/system/home/wallpapers/hypr/tetrahedra5.png b/system/home/desktop/wallpapers/hypr/tetrahedra5.png similarity index 100% rename from system/home/wallpapers/hypr/tetrahedra5.png rename to system/home/desktop/wallpapers/hypr/tetrahedra5.png diff --git a/system/home/wallpapers/hypr/w4X1t93.png b/system/home/desktop/wallpapers/hypr/w4X1t93.png similarity index 100% rename from system/home/wallpapers/hypr/w4X1t93.png rename to system/home/desktop/wallpapers/hypr/w4X1t93.png diff --git a/system/home/wallpapers/landscapes/Clearday.jpg b/system/home/desktop/wallpapers/landscapes/Clearday.jpg similarity index 100% rename from system/home/wallpapers/landscapes/Clearday.jpg rename to system/home/desktop/wallpapers/landscapes/Clearday.jpg diff --git a/system/home/wallpapers/landscapes/Clearnight.jpg b/system/home/desktop/wallpapers/landscapes/Clearnight.jpg similarity index 100% rename from system/home/wallpapers/landscapes/Clearnight.jpg rename to system/home/desktop/wallpapers/landscapes/Clearnight.jpg diff --git a/system/home/wallpapers/landscapes/Cloudsday.jpg b/system/home/desktop/wallpapers/landscapes/Cloudsday.jpg similarity index 100% rename from system/home/wallpapers/landscapes/Cloudsday.jpg rename to system/home/desktop/wallpapers/landscapes/Cloudsday.jpg diff --git a/system/home/wallpapers/landscapes/Cloudsnight.jpg b/system/home/desktop/wallpapers/landscapes/Cloudsnight.jpg similarity index 100% rename from system/home/wallpapers/landscapes/Cloudsnight.jpg rename to system/home/desktop/wallpapers/landscapes/Cloudsnight.jpg diff --git a/system/home/wallpapers/landscapes/Rainnight.jpg b/system/home/desktop/wallpapers/landscapes/Rainnight.jpg similarity index 100% rename from system/home/wallpapers/landscapes/Rainnight.jpg rename to system/home/desktop/wallpapers/landscapes/Rainnight.jpg diff --git a/system/home/wallpapers/landscapes/evening-sky.png b/system/home/desktop/wallpapers/landscapes/evening-sky.png similarity index 100% rename from system/home/wallpapers/landscapes/evening-sky.png rename to system/home/desktop/wallpapers/landscapes/evening-sky.png diff --git a/system/home/wallpapers/landscapes/forrest.png b/system/home/desktop/wallpapers/landscapes/forrest.png similarity index 100% rename from system/home/wallpapers/landscapes/forrest.png rename to system/home/desktop/wallpapers/landscapes/forrest.png diff --git a/system/home/wallpapers/landscapes/salty_mountains.png b/system/home/desktop/wallpapers/landscapes/salty_mountains.png similarity index 100% rename from system/home/wallpapers/landscapes/salty_mountains.png rename to system/home/desktop/wallpapers/landscapes/salty_mountains.png diff --git a/system/home/wallpapers/landscapes/shaded_landscape.png b/system/home/desktop/wallpapers/landscapes/shaded_landscape.png similarity index 100% rename from system/home/wallpapers/landscapes/shaded_landscape.png rename to system/home/desktop/wallpapers/landscapes/shaded_landscape.png diff --git a/system/home/wallpapers/landscapes/tropic_island_day.jpg b/system/home/desktop/wallpapers/landscapes/tropic_island_day.jpg similarity index 100% rename from system/home/wallpapers/landscapes/tropic_island_day.jpg rename to system/home/desktop/wallpapers/landscapes/tropic_island_day.jpg diff --git a/system/home/wallpapers/landscapes/tropic_island_evening.jpg b/system/home/desktop/wallpapers/landscapes/tropic_island_evening.jpg similarity index 100% rename from system/home/wallpapers/landscapes/tropic_island_evening.jpg rename to system/home/desktop/wallpapers/landscapes/tropic_island_evening.jpg diff --git a/system/home/wallpapers/landscapes/tropic_island_morning.jpg b/system/home/desktop/wallpapers/landscapes/tropic_island_morning.jpg similarity index 100% rename from system/home/wallpapers/landscapes/tropic_island_morning.jpg rename to system/home/desktop/wallpapers/landscapes/tropic_island_morning.jpg diff --git a/system/home/wallpapers/landscapes/tropic_island_night.jpg b/system/home/desktop/wallpapers/landscapes/tropic_island_night.jpg similarity index 100% rename from system/home/wallpapers/landscapes/tropic_island_night.jpg rename to system/home/desktop/wallpapers/landscapes/tropic_island_night.jpg diff --git a/system/home/wallpapers/landscapes/yosemite.png b/system/home/desktop/wallpapers/landscapes/yosemite.png similarity index 100% rename from system/home/wallpapers/landscapes/yosemite.png rename to system/home/desktop/wallpapers/landscapes/yosemite.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_full_blue.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_blue.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_full_blue.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_blue.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_full_flamingo.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_flamingo.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_full_flamingo.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_flamingo.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_full_green.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_green.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_full_green.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_green.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_full_lavender.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_lavender.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_full_lavender.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_lavender.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_full_magenta.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_magenta.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_full_magenta.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_magenta.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_full_maroon.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_maroon.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_full_maroon.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_maroon.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_full_peach.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_peach.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_full_peach.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_peach.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_full_pink.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_pink.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_full_pink.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_pink.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_full_red.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_red.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_full_red.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_red.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_full_rosewater.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_rosewater.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_full_rosewater.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_rosewater.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_full_sky.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_sky.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_full_sky.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_sky.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_full_teal.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_teal.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_full_teal.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_teal.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_full_yellow.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_yellow.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_full_yellow.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_full_yellow.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_gap_blue.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_blue.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_gap_blue.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_blue.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_gap_flamingo.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_flamingo.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_gap_flamingo.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_flamingo.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_gap_green.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_green.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_gap_green.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_green.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_gap_lavender.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_lavender.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_gap_lavender.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_lavender.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_gap_magenta.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_magenta.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_gap_magenta.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_magenta.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_gap_maroon.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_maroon.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_gap_maroon.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_maroon.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_gap_peach.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_peach.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_gap_peach.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_peach.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_gap_pink.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_pink.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_gap_pink.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_pink.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_gap_red.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_red.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_gap_red.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_red.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_gap_rosewater.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_rosewater.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_gap_rosewater.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_rosewater.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_gap_sky.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_sky.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_gap_sky.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_sky.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_gap_teal.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_teal.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_gap_teal.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_teal.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_gap_yellow.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_yellow.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_gap_yellow.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_yellow.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_side_blue.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_blue.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_side_blue.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_blue.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_side_flamingo.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_flamingo.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_side_flamingo.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_flamingo.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_side_green.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_green.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_side_green.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_green.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_side_lavender.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_lavender.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_side_lavender.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_lavender.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_side_magenta.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_magenta.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_side_magenta.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_magenta.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_side_maroon.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_maroon.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_side_maroon.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_maroon.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_side_peach.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_peach.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_side_peach.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_peach.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_side_pink.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_pink.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_side_pink.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_pink.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_side_red.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_red.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_side_red.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_red.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_side_rosewater.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_rosewater.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_side_rosewater.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_rosewater.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_side_sky.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_sky.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_side_sky.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_sky.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_side_teal.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_teal.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_side_teal.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_teal.png diff --git a/system/home/wallpapers/mandelbrot/mandelbrot_side_yellow.png b/system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_yellow.png similarity index 100% rename from system/home/wallpapers/mandelbrot/mandelbrot_side_yellow.png rename to system/home/desktop/wallpapers/mandelbrot/mandelbrot_side_yellow.png diff --git a/system/home/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml b/system/home/desktop/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml similarity index 100% rename from system/home/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml rename to system/home/desktop/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml diff --git a/system/home/wallpapers/minimalistic/.comments/heart.jpg.xml b/system/home/desktop/wallpapers/minimalistic/.comments/heart.jpg.xml similarity index 100% rename from system/home/wallpapers/minimalistic/.comments/heart.jpg.xml rename to system/home/desktop/wallpapers/minimalistic/.comments/heart.jpg.xml diff --git a/system/home/wallpapers/minimalistic/black5_unicat.png b/system/home/desktop/wallpapers/minimalistic/black5_unicat.png similarity index 100% rename from system/home/wallpapers/minimalistic/black5_unicat.png rename to system/home/desktop/wallpapers/minimalistic/black5_unicat.png diff --git a/system/home/wallpapers/minimalistic/blue-cat.png b/system/home/desktop/wallpapers/minimalistic/blue-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/blue-cat.png rename to system/home/desktop/wallpapers/minimalistic/blue-cat.png diff --git a/system/home/wallpapers/minimalistic/blue_unicat.png b/system/home/desktop/wallpapers/minimalistic/blue_unicat.png similarity index 100% rename from system/home/wallpapers/minimalistic/blue_unicat.png rename to system/home/desktop/wallpapers/minimalistic/blue_unicat.png diff --git a/system/home/wallpapers/minimalistic/buttons.png b/system/home/desktop/wallpapers/minimalistic/buttons.png similarity index 100% rename from system/home/wallpapers/minimalistic/buttons.png rename to system/home/desktop/wallpapers/minimalistic/buttons.png diff --git a/system/home/wallpapers/minimalistic/catppuccin_triangle.png b/system/home/desktop/wallpapers/minimalistic/catppuccin_triangle.png similarity index 100% rename from system/home/wallpapers/minimalistic/catppuccin_triangle.png rename to system/home/desktop/wallpapers/minimalistic/catppuccin_triangle.png diff --git a/system/home/wallpapers/minimalistic/cats.png b/system/home/desktop/wallpapers/minimalistic/cats.png similarity index 100% rename from system/home/wallpapers/minimalistic/cats.png rename to system/home/desktop/wallpapers/minimalistic/cats.png diff --git a/system/home/wallpapers/minimalistic/dark-cat-rosewater.png b/system/home/desktop/wallpapers/minimalistic/dark-cat-rosewater.png similarity index 100% rename from system/home/wallpapers/minimalistic/dark-cat-rosewater.png rename to system/home/desktop/wallpapers/minimalistic/dark-cat-rosewater.png diff --git a/system/home/wallpapers/minimalistic/dark-cat.png b/system/home/desktop/wallpapers/minimalistic/dark-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/dark-cat.png rename to system/home/desktop/wallpapers/minimalistic/dark-cat.png diff --git a/system/home/wallpapers/minimalistic/darker_unicat.png b/system/home/desktop/wallpapers/minimalistic/darker_unicat.png similarity index 100% rename from system/home/wallpapers/minimalistic/darker_unicat.png rename to system/home/desktop/wallpapers/minimalistic/darker_unicat.png diff --git a/system/home/wallpapers/minimalistic/flamingo-cat.png b/system/home/desktop/wallpapers/minimalistic/flamingo-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/flamingo-cat.png rename to system/home/desktop/wallpapers/minimalistic/flamingo-cat.png diff --git a/system/home/wallpapers/minimalistic/flamingo_unicat.png b/system/home/desktop/wallpapers/minimalistic/flamingo_unicat.png similarity index 100% rename from system/home/wallpapers/minimalistic/flamingo_unicat.png rename to system/home/desktop/wallpapers/minimalistic/flamingo_unicat.png diff --git a/system/home/wallpapers/minimalistic/gradient-synth-cat.png b/system/home/desktop/wallpapers/minimalistic/gradient-synth-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/gradient-synth-cat.png rename to system/home/desktop/wallpapers/minimalistic/gradient-synth-cat.png diff --git a/system/home/wallpapers/minimalistic/green-cat.png b/system/home/desktop/wallpapers/minimalistic/green-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/green-cat.png rename to system/home/desktop/wallpapers/minimalistic/green-cat.png diff --git a/system/home/wallpapers/minimalistic/hashtags-black.png b/system/home/desktop/wallpapers/minimalistic/hashtags-black.png similarity index 100% rename from system/home/wallpapers/minimalistic/hashtags-black.png rename to system/home/desktop/wallpapers/minimalistic/hashtags-black.png diff --git a/system/home/wallpapers/minimalistic/hashtags-new.png b/system/home/desktop/wallpapers/minimalistic/hashtags-new.png similarity index 100% rename from system/home/wallpapers/minimalistic/hashtags-new.png rename to system/home/desktop/wallpapers/minimalistic/hashtags-new.png diff --git a/system/home/wallpapers/minimalistic/heart.jpg b/system/home/desktop/wallpapers/minimalistic/heart.jpg similarity index 100% rename from system/home/wallpapers/minimalistic/heart.jpg rename to system/home/desktop/wallpapers/minimalistic/heart.jpg diff --git a/system/home/wallpapers/minimalistic/hearts.png b/system/home/desktop/wallpapers/minimalistic/hearts.png similarity index 100% rename from system/home/wallpapers/minimalistic/hearts.png rename to system/home/desktop/wallpapers/minimalistic/hearts.png diff --git a/system/home/wallpapers/minimalistic/lavender-cat.png b/system/home/desktop/wallpapers/minimalistic/lavender-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/lavender-cat.png rename to system/home/desktop/wallpapers/minimalistic/lavender-cat.png diff --git a/system/home/wallpapers/minimalistic/list-aligned-left.png b/system/home/desktop/wallpapers/minimalistic/list-aligned-left.png similarity index 100% rename from system/home/wallpapers/minimalistic/list-aligned-left.png rename to system/home/desktop/wallpapers/minimalistic/list-aligned-left.png diff --git a/system/home/wallpapers/minimalistic/list-aligned-right.png b/system/home/desktop/wallpapers/minimalistic/list-aligned-right.png similarity index 100% rename from system/home/wallpapers/minimalistic/list-aligned-right.png rename to system/home/desktop/wallpapers/minimalistic/list-aligned-right.png diff --git a/system/home/wallpapers/minimalistic/list-horizontal.png b/system/home/desktop/wallpapers/minimalistic/list-horizontal.png similarity index 100% rename from system/home/wallpapers/minimalistic/list-horizontal.png rename to system/home/desktop/wallpapers/minimalistic/list-horizontal.png diff --git a/system/home/wallpapers/minimalistic/magenta-cat.png b/system/home/desktop/wallpapers/minimalistic/magenta-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/magenta-cat.png rename to system/home/desktop/wallpapers/minimalistic/magenta-cat.png diff --git a/system/home/wallpapers/minimalistic/maroon-cat.png b/system/home/desktop/wallpapers/minimalistic/maroon-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/maroon-cat.png rename to system/home/desktop/wallpapers/minimalistic/maroon-cat.png diff --git a/system/home/wallpapers/minimalistic/peach-cat.png b/system/home/desktop/wallpapers/minimalistic/peach-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/peach-cat.png rename to system/home/desktop/wallpapers/minimalistic/peach-cat.png diff --git a/system/home/wallpapers/minimalistic/peach_unicat.png b/system/home/desktop/wallpapers/minimalistic/peach_unicat.png similarity index 100% rename from system/home/wallpapers/minimalistic/peach_unicat.png rename to system/home/desktop/wallpapers/minimalistic/peach_unicat.png diff --git a/system/home/wallpapers/minimalistic/pink-cat.png b/system/home/desktop/wallpapers/minimalistic/pink-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/pink-cat.png rename to system/home/desktop/wallpapers/minimalistic/pink-cat.png diff --git a/system/home/wallpapers/minimalistic/pink_unicat.png b/system/home/desktop/wallpapers/minimalistic/pink_unicat.png similarity index 100% rename from system/home/wallpapers/minimalistic/pink_unicat.png rename to system/home/desktop/wallpapers/minimalistic/pink_unicat.png diff --git a/system/home/wallpapers/minimalistic/red-cat.png b/system/home/desktop/wallpapers/minimalistic/red-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/red-cat.png rename to system/home/desktop/wallpapers/minimalistic/red-cat.png diff --git a/system/home/wallpapers/minimalistic/red_unicat.png b/system/home/desktop/wallpapers/minimalistic/red_unicat.png similarity index 100% rename from system/home/wallpapers/minimalistic/red_unicat.png rename to system/home/desktop/wallpapers/minimalistic/red_unicat.png diff --git a/system/home/wallpapers/minimalistic/romb.png b/system/home/desktop/wallpapers/minimalistic/romb.png similarity index 100% rename from system/home/wallpapers/minimalistic/romb.png rename to system/home/desktop/wallpapers/minimalistic/romb.png diff --git a/system/home/wallpapers/minimalistic/rosewater-cat.png b/system/home/desktop/wallpapers/minimalistic/rosewater-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/rosewater-cat.png rename to system/home/desktop/wallpapers/minimalistic/rosewater-cat.png diff --git a/system/home/wallpapers/minimalistic/sky-cat.png b/system/home/desktop/wallpapers/minimalistic/sky-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/sky-cat.png rename to system/home/desktop/wallpapers/minimalistic/sky-cat.png diff --git a/system/home/wallpapers/minimalistic/sports.png b/system/home/desktop/wallpapers/minimalistic/sports.png similarity index 100% rename from system/home/wallpapers/minimalistic/sports.png rename to system/home/desktop/wallpapers/minimalistic/sports.png diff --git a/system/home/wallpapers/minimalistic/teal-cat.png b/system/home/desktop/wallpapers/minimalistic/teal-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/teal-cat.png rename to system/home/desktop/wallpapers/minimalistic/teal-cat.png diff --git a/system/home/wallpapers/minimalistic/teal_unicat.png b/system/home/desktop/wallpapers/minimalistic/teal_unicat.png similarity index 100% rename from system/home/wallpapers/minimalistic/teal_unicat.png rename to system/home/desktop/wallpapers/minimalistic/teal_unicat.png diff --git a/system/home/wallpapers/minimalistic/tetris.png b/system/home/desktop/wallpapers/minimalistic/tetris.png similarity index 100% rename from system/home/wallpapers/minimalistic/tetris.png rename to system/home/desktop/wallpapers/minimalistic/tetris.png diff --git a/system/home/wallpapers/minimalistic/unicat.png b/system/home/desktop/wallpapers/minimalistic/unicat.png similarity index 100% rename from system/home/wallpapers/minimalistic/unicat.png rename to system/home/desktop/wallpapers/minimalistic/unicat.png diff --git a/system/home/wallpapers/minimalistic/yellow-cat.png b/system/home/desktop/wallpapers/minimalistic/yellow-cat.png similarity index 100% rename from system/home/wallpapers/minimalistic/yellow-cat.png rename to system/home/desktop/wallpapers/minimalistic/yellow-cat.png diff --git a/system/home/wallpapers/misc/cat-sound.png b/system/home/desktop/wallpapers/misc/cat-sound.png similarity index 100% rename from system/home/wallpapers/misc/cat-sound.png rename to system/home/desktop/wallpapers/misc/cat-sound.png diff --git a/system/home/wallpapers/misc/cat_bunnies.png b/system/home/desktop/wallpapers/misc/cat_bunnies.png similarity index 100% rename from system/home/wallpapers/misc/cat_bunnies.png rename to system/home/desktop/wallpapers/misc/cat_bunnies.png diff --git a/system/home/wallpapers/misc/cat_colors.png b/system/home/desktop/wallpapers/misc/cat_colors.png similarity index 100% rename from system/home/wallpapers/misc/cat_colors.png rename to system/home/desktop/wallpapers/misc/cat_colors.png diff --git a/system/home/wallpapers/misc/cat_pacman.png b/system/home/desktop/wallpapers/misc/cat_pacman.png similarity index 100% rename from system/home/wallpapers/misc/cat_pacman.png rename to system/home/desktop/wallpapers/misc/cat_pacman.png diff --git a/system/home/wallpapers/misc/comfy-home.png b/system/home/desktop/wallpapers/misc/comfy-home.png similarity index 100% rename from system/home/wallpapers/misc/comfy-home.png rename to system/home/desktop/wallpapers/misc/comfy-home.png diff --git a/system/home/wallpapers/misc/doggocat.png b/system/home/desktop/wallpapers/misc/doggocat.png similarity index 100% rename from system/home/wallpapers/misc/doggocat.png rename to system/home/desktop/wallpapers/misc/doggocat.png diff --git a/system/home/wallpapers/misc/feet-on-the-dashboard.png b/system/home/desktop/wallpapers/misc/feet-on-the-dashboard.png similarity index 100% rename from system/home/wallpapers/misc/feet-on-the-dashboard.png rename to system/home/desktop/wallpapers/misc/feet-on-the-dashboard.png diff --git a/system/home/wallpapers/misc/lonely-fish.png b/system/home/desktop/wallpapers/misc/lonely-fish.png similarity index 100% rename from system/home/wallpapers/misc/lonely-fish.png rename to system/home/desktop/wallpapers/misc/lonely-fish.png diff --git a/system/home/wallpapers/misc/rainbow-cat.png b/system/home/desktop/wallpapers/misc/rainbow-cat.png similarity index 100% rename from system/home/wallpapers/misc/rainbow-cat.png rename to system/home/desktop/wallpapers/misc/rainbow-cat.png diff --git a/system/home/wallpapers/misc/rainbow.png b/system/home/desktop/wallpapers/misc/rainbow.png similarity index 100% rename from system/home/wallpapers/misc/rainbow.png rename to system/home/desktop/wallpapers/misc/rainbow.png diff --git a/system/home/wallpapers/misc/virus.png b/system/home/desktop/wallpapers/misc/virus.png similarity index 100% rename from system/home/wallpapers/misc/virus.png rename to system/home/desktop/wallpapers/misc/virus.png diff --git a/system/home/wallpapers/misc/windows-error.jpg b/system/home/desktop/wallpapers/misc/windows-error.jpg similarity index 100% rename from system/home/wallpapers/misc/windows-error.jpg rename to system/home/desktop/wallpapers/misc/windows-error.jpg diff --git a/system/home/wallpapers/nix/nix-dracula.png b/system/home/desktop/wallpapers/nix/nix-dracula.png similarity index 100% rename from system/home/wallpapers/nix/nix-dracula.png rename to system/home/desktop/wallpapers/nix/nix-dracula.png diff --git a/system/home/wallpapers/nix/nix-glow-black.png b/system/home/desktop/wallpapers/nix/nix-glow-black.png similarity index 100% rename from system/home/wallpapers/nix/nix-glow-black.png rename to system/home/desktop/wallpapers/nix/nix-glow-black.png diff --git a/system/home/wallpapers/nix/nix-glow-gruvbox.png b/system/home/desktop/wallpapers/nix/nix-glow-gruvbox.png similarity index 100% rename from system/home/wallpapers/nix/nix-glow-gruvbox.png rename to system/home/desktop/wallpapers/nix/nix-glow-gruvbox.png diff --git a/system/home/wallpapers/nix/nix-glow.png b/system/home/desktop/wallpapers/nix/nix-glow.png similarity index 100% rename from system/home/wallpapers/nix/nix-glow.png rename to system/home/desktop/wallpapers/nix/nix-glow.png diff --git a/system/home/wallpapers/nix/nix-owo.png b/system/home/desktop/wallpapers/nix/nix-owo.png similarity index 100% rename from system/home/wallpapers/nix/nix-owo.png rename to system/home/desktop/wallpapers/nix/nix-owo.png diff --git a/system/home/wallpapers/nix/nixos-declarative.jpg b/system/home/desktop/wallpapers/nix/nixos-declarative.jpg similarity index 100% rename from system/home/wallpapers/nix/nixos-declarative.jpg rename to system/home/desktop/wallpapers/nix/nixos-declarative.jpg diff --git a/system/home/wallpapers/os/.comments/void-1920x1080.png.xml b/system/home/desktop/wallpapers/os/.comments/void-1920x1080.png.xml similarity index 100% rename from system/home/wallpapers/os/.comments/void-1920x1080.png.xml rename to system/home/desktop/wallpapers/os/.comments/void-1920x1080.png.xml diff --git a/system/home/wallpapers/os/alpine-black-4k.png b/system/home/desktop/wallpapers/os/alpine-black-4k.png similarity index 100% rename from system/home/wallpapers/os/alpine-black-4k.png rename to system/home/desktop/wallpapers/os/alpine-black-4k.png diff --git a/system/home/wallpapers/os/alpine-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/alpine-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/alpine-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/alpine-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/alpine-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/alpine-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/alpine-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/alpine-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/android-black-4k.png b/system/home/desktop/wallpapers/os/android-black-4k.png similarity index 100% rename from system/home/wallpapers/os/android-black-4k.png rename to system/home/desktop/wallpapers/os/android-black-4k.png diff --git a/system/home/wallpapers/os/android-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/android-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/android-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/android-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/android-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/android-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/android-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/android-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/apple-black-4k.png b/system/home/desktop/wallpapers/os/apple-black-4k.png similarity index 100% rename from system/home/wallpapers/os/apple-black-4k.png rename to system/home/desktop/wallpapers/os/apple-black-4k.png diff --git a/system/home/wallpapers/os/apple-blue-black-1920x1080.png b/system/home/desktop/wallpapers/os/apple-blue-black-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/apple-blue-black-1920x1080.png rename to system/home/desktop/wallpapers/os/apple-blue-black-1920x1080.png diff --git a/system/home/wallpapers/os/apple-colors-big-4k.png b/system/home/desktop/wallpapers/os/apple-colors-big-4k.png similarity index 100% rename from system/home/wallpapers/os/apple-colors-big-4k.png rename to system/home/desktop/wallpapers/os/apple-colors-big-4k.png diff --git a/system/home/wallpapers/os/apple-colors-small-4k.png b/system/home/desktop/wallpapers/os/apple-colors-small-4k.png similarity index 100% rename from system/home/wallpapers/os/apple-colors-small-4k.png rename to system/home/desktop/wallpapers/os/apple-colors-small-4k.png diff --git a/system/home/wallpapers/os/apple-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/apple-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/apple-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/apple-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/apple-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/apple-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/apple-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/apple-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/arch-black-4k.png b/system/home/desktop/wallpapers/os/arch-black-4k.png similarity index 100% rename from system/home/wallpapers/os/arch-black-4k.png rename to system/home/desktop/wallpapers/os/arch-black-4k.png diff --git a/system/home/wallpapers/os/arch-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/arch-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/arch-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/arch-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/arch-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/arch-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/arch-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/arch-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/arch-rainbow-1920x1080.png b/system/home/desktop/wallpapers/os/arch-rainbow-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/arch-rainbow-1920x1080.png rename to system/home/desktop/wallpapers/os/arch-rainbow-1920x1080.png diff --git a/system/home/wallpapers/os/arco-black-4k.png b/system/home/desktop/wallpapers/os/arco-black-4k.png similarity index 100% rename from system/home/wallpapers/os/arco-black-4k.png rename to system/home/desktop/wallpapers/os/arco-black-4k.png diff --git a/system/home/wallpapers/os/arco-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/arco-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/arco-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/arco-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/arco-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/arco-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/arco-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/arco-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/artix-black-4k.png b/system/home/desktop/wallpapers/os/artix-black-4k.png similarity index 100% rename from system/home/wallpapers/os/artix-black-4k.png rename to system/home/desktop/wallpapers/os/artix-black-4k.png diff --git a/system/home/wallpapers/os/artix-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/artix-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/artix-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/artix-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/artix-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/artix-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/artix-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/artix-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/centos-black-4k.png b/system/home/desktop/wallpapers/os/centos-black-4k.png similarity index 100% rename from system/home/wallpapers/os/centos-black-4k.png rename to system/home/desktop/wallpapers/os/centos-black-4k.png diff --git a/system/home/wallpapers/os/crystal-linux-4k.png b/system/home/desktop/wallpapers/os/crystal-linux-4k.png similarity index 100% rename from system/home/wallpapers/os/crystal-linux-4k.png rename to system/home/desktop/wallpapers/os/crystal-linux-4k.png diff --git a/system/home/wallpapers/os/crystal-linux-magenta_blue1920x1080.png b/system/home/desktop/wallpapers/os/crystal-linux-magenta_blue1920x1080.png similarity index 100% rename from system/home/wallpapers/os/crystal-linux-magenta_blue1920x1080.png rename to system/home/desktop/wallpapers/os/crystal-linux-magenta_blue1920x1080.png diff --git a/system/home/wallpapers/os/crystal-linux-magenta_pink1920x1080.png b/system/home/desktop/wallpapers/os/crystal-linux-magenta_pink1920x1080.png similarity index 100% rename from system/home/wallpapers/os/crystal-linux-magenta_pink1920x1080.png rename to system/home/desktop/wallpapers/os/crystal-linux-magenta_pink1920x1080.png diff --git a/system/home/wallpapers/os/debian-black-4k.png b/system/home/desktop/wallpapers/os/debian-black-4k.png similarity index 100% rename from system/home/wallpapers/os/debian-black-4k.png rename to system/home/desktop/wallpapers/os/debian-black-4k.png diff --git a/system/home/wallpapers/os/debian-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/debian-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/debian-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/debian-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/debian-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/debian-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/debian-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/debian-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/deepin-black-4k.png b/system/home/desktop/wallpapers/os/deepin-black-4k.png similarity index 100% rename from system/home/wallpapers/os/deepin-black-4k.png rename to system/home/desktop/wallpapers/os/deepin-black-4k.png diff --git a/system/home/wallpapers/os/deepin-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/deepin-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/deepin-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/deepin-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/deepin-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/deepin-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/deepin-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/deepin-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/elementary-black-4k.png b/system/home/desktop/wallpapers/os/elementary-black-4k.png similarity index 100% rename from system/home/wallpapers/os/elementary-black-4k.png rename to system/home/desktop/wallpapers/os/elementary-black-4k.png diff --git a/system/home/wallpapers/os/elementary-sky-lavender-ascii.png b/system/home/desktop/wallpapers/os/elementary-sky-lavender-ascii.png similarity index 100% rename from system/home/wallpapers/os/elementary-sky-lavender-ascii.png rename to system/home/desktop/wallpapers/os/elementary-sky-lavender-ascii.png diff --git a/system/home/wallpapers/os/endeavour-black-4k.png b/system/home/desktop/wallpapers/os/endeavour-black-4k.png similarity index 100% rename from system/home/wallpapers/os/endeavour-black-4k.png rename to system/home/desktop/wallpapers/os/endeavour-black-4k.png diff --git a/system/home/wallpapers/os/endeavour-blue-black-1920x1080.png b/system/home/desktop/wallpapers/os/endeavour-blue-black-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/endeavour-blue-black-1920x1080.png rename to system/home/desktop/wallpapers/os/endeavour-blue-black-1920x1080.png diff --git a/system/home/wallpapers/os/endeavour-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/endeavour-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/endeavour-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/endeavour-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/fedora-black-4k.png b/system/home/desktop/wallpapers/os/fedora-black-4k.png similarity index 100% rename from system/home/wallpapers/os/fedora-black-4k.png rename to system/home/desktop/wallpapers/os/fedora-black-4k.png diff --git a/system/home/wallpapers/os/fedora-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/fedora-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/fedora-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/fedora-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/fedora-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/fedora-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/fedora-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/fedora-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/freebsd-black-4k.png b/system/home/desktop/wallpapers/os/freebsd-black-4k.png similarity index 100% rename from system/home/wallpapers/os/freebsd-black-4k.png rename to system/home/desktop/wallpapers/os/freebsd-black-4k.png diff --git a/system/home/wallpapers/os/freebsd-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/freebsd-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/freebsd-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/freebsd-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/freebsd-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/freebsd-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/freebsd-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/freebsd-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/garuda-black-4k.png b/system/home/desktop/wallpapers/os/garuda-black-4k.png similarity index 100% rename from system/home/wallpapers/os/garuda-black-4k.png rename to system/home/desktop/wallpapers/os/garuda-black-4k.png diff --git a/system/home/wallpapers/os/gentoo-black-4k.png b/system/home/desktop/wallpapers/os/gentoo-black-4k.png similarity index 100% rename from system/home/wallpapers/os/gentoo-black-4k.png rename to system/home/desktop/wallpapers/os/gentoo-black-4k.png diff --git a/system/home/wallpapers/os/manjaro-black-4k.png b/system/home/desktop/wallpapers/os/manjaro-black-4k.png similarity index 100% rename from system/home/wallpapers/os/manjaro-black-4k.png rename to system/home/desktop/wallpapers/os/manjaro-black-4k.png diff --git a/system/home/wallpapers/os/manjaro-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/manjaro-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/manjaro-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/manjaro-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/manjaro-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/manjaro-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/manjaro-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/manjaro-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/mint-black-4k.png b/system/home/desktop/wallpapers/os/mint-black-4k.png similarity index 100% rename from system/home/wallpapers/os/mint-black-4k.png rename to system/home/desktop/wallpapers/os/mint-black-4k.png diff --git a/system/home/wallpapers/os/mint-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/mint-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/mint-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/mint-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/mint-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/mint-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/mint-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/mint-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/mxlinux-black-4k.png b/system/home/desktop/wallpapers/os/mxlinux-black-4k.png similarity index 100% rename from system/home/wallpapers/os/mxlinux-black-4k.png rename to system/home/desktop/wallpapers/os/mxlinux-black-4k.png diff --git a/system/home/wallpapers/os/mxlinux-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/mxlinux-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/mxlinux-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/mxlinux-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/mxlinux-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/mxlinux-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/mxlinux-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/mxlinux-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/nix-black-4k.png b/system/home/desktop/wallpapers/os/nix-black-4k.png similarity index 100% rename from system/home/wallpapers/os/nix-black-4k.png rename to system/home/desktop/wallpapers/os/nix-black-4k.png diff --git a/system/home/wallpapers/os/nix-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/nix-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/nix-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/nix-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/nix-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/nix-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/nix-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/nix-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/opensuse-black-4k.png b/system/home/desktop/wallpapers/os/opensuse-black-4k.png similarity index 100% rename from system/home/wallpapers/os/opensuse-black-4k.png rename to system/home/desktop/wallpapers/os/opensuse-black-4k.png diff --git a/system/home/wallpapers/os/opensuse-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/opensuse-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/opensuse-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/opensuse-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/opensuse-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/opensuse-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/opensuse-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/opensuse-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/pop-black-4k.png b/system/home/desktop/wallpapers/os/pop-black-4k.png similarity index 100% rename from system/home/wallpapers/os/pop-black-4k.png rename to system/home/desktop/wallpapers/os/pop-black-4k.png diff --git a/system/home/wallpapers/os/pop-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/pop-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/pop-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/pop-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/pop-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/pop-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/pop-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/pop-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/raspberry-black-4k.png b/system/home/desktop/wallpapers/os/raspberry-black-4k.png similarity index 100% rename from system/home/wallpapers/os/raspberry-black-4k.png rename to system/home/desktop/wallpapers/os/raspberry-black-4k.png diff --git a/system/home/wallpapers/os/raspberry-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/raspberry-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/raspberry-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/raspberry-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/raspberry-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/raspberry-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/raspberry-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/raspberry-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/solus-black-4k.png b/system/home/desktop/wallpapers/os/solus-black-4k.png similarity index 100% rename from system/home/wallpapers/os/solus-black-4k.png rename to system/home/desktop/wallpapers/os/solus-black-4k.png diff --git a/system/home/wallpapers/os/solus-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/solus-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/solus-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/solus-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/solus-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/solus-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/solus-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/solus-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/tux-black-4k.png b/system/home/desktop/wallpapers/os/tux-black-4k.png similarity index 100% rename from system/home/wallpapers/os/tux-black-4k.png rename to system/home/desktop/wallpapers/os/tux-black-4k.png diff --git a/system/home/wallpapers/os/tux-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/tux-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/tux-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/tux-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/tux-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/tux-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/tux-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/tux-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/ubuntu-black-4k.png b/system/home/desktop/wallpapers/os/ubuntu-black-4k.png similarity index 100% rename from system/home/wallpapers/os/ubuntu-black-4k.png rename to system/home/desktop/wallpapers/os/ubuntu-black-4k.png diff --git a/system/home/wallpapers/os/ubuntu-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/ubuntu-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/ubuntu-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/ubuntu-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/ubuntu-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/ubuntu-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/ubuntu-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/ubuntu-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/various-arch-1-4k.png b/system/home/desktop/wallpapers/os/various-arch-1-4k.png similarity index 100% rename from system/home/wallpapers/os/various-arch-1-4k.png rename to system/home/desktop/wallpapers/os/various-arch-1-4k.png diff --git a/system/home/wallpapers/os/various-arch-2-4k.png b/system/home/desktop/wallpapers/os/various-arch-2-4k.png similarity index 100% rename from system/home/wallpapers/os/various-arch-2-4k.png rename to system/home/desktop/wallpapers/os/various-arch-2-4k.png diff --git a/system/home/wallpapers/os/various-os-1-4k.png b/system/home/desktop/wallpapers/os/various-os-1-4k.png similarity index 100% rename from system/home/wallpapers/os/various-os-1-4k.png rename to system/home/desktop/wallpapers/os/various-os-1-4k.png diff --git a/system/home/wallpapers/os/various-os-2-4k.png b/system/home/desktop/wallpapers/os/various-os-2-4k.png similarity index 100% rename from system/home/wallpapers/os/various-os-2-4k.png rename to system/home/desktop/wallpapers/os/various-os-2-4k.png diff --git a/system/home/wallpapers/os/various-os-3-4k.png b/system/home/desktop/wallpapers/os/various-os-3-4k.png similarity index 100% rename from system/home/wallpapers/os/various-os-3-4k.png rename to system/home/desktop/wallpapers/os/various-os-3-4k.png diff --git a/system/home/wallpapers/os/void-1920x1080.png b/system/home/desktop/wallpapers/os/void-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/void-1920x1080.png rename to system/home/desktop/wallpapers/os/void-1920x1080.png diff --git a/system/home/wallpapers/os/void-black-4k.png b/system/home/desktop/wallpapers/os/void-black-4k.png similarity index 100% rename from system/home/wallpapers/os/void-black-4k.png rename to system/home/desktop/wallpapers/os/void-black-4k.png diff --git a/system/home/wallpapers/os/void-black3-1920x1080.png b/system/home/desktop/wallpapers/os/void-black3-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/void-black3-1920x1080.png rename to system/home/desktop/wallpapers/os/void-black3-1920x1080.png diff --git a/system/home/wallpapers/os/void-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/void-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/void-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/void-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/void-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/void-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/void-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/void-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/windows-black.png b/system/home/desktop/wallpapers/os/windows-black.png similarity index 100% rename from system/home/wallpapers/os/windows-black.png rename to system/home/desktop/wallpapers/os/windows-black.png diff --git a/system/home/wallpapers/os/windows-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/windows-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/windows-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/windows-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/windows-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/windows-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/windows-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/windows-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/os/zorin-black-4k.png b/system/home/desktop/wallpapers/os/zorin-black-4k.png similarity index 100% rename from system/home/wallpapers/os/zorin-black-4k.png rename to system/home/desktop/wallpapers/os/zorin-black-4k.png diff --git a/system/home/wallpapers/os/zorin-magenta-blue-1920x1080.png b/system/home/desktop/wallpapers/os/zorin-magenta-blue-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/zorin-magenta-blue-1920x1080.png rename to system/home/desktop/wallpapers/os/zorin-magenta-blue-1920x1080.png diff --git a/system/home/wallpapers/os/zorin-magenta-pink-1920x1080.png b/system/home/desktop/wallpapers/os/zorin-magenta-pink-1920x1080.png similarity index 100% rename from system/home/wallpapers/os/zorin-magenta-pink-1920x1080.png rename to system/home/desktop/wallpapers/os/zorin-magenta-pink-1920x1080.png diff --git a/system/home/wallpapers/patterns/emojis.png b/system/home/desktop/wallpapers/patterns/emojis.png similarity index 100% rename from system/home/wallpapers/patterns/emojis.png rename to system/home/desktop/wallpapers/patterns/emojis.png diff --git a/system/home/wallpapers/patterns/line_icons.png b/system/home/desktop/wallpapers/patterns/line_icons.png similarity index 100% rename from system/home/wallpapers/patterns/line_icons.png rename to system/home/desktop/wallpapers/patterns/line_icons.png diff --git a/system/home/wallpapers/science/2422830.jpg b/system/home/desktop/wallpapers/science/2422830.jpg similarity index 100% rename from system/home/wallpapers/science/2422830.jpg rename to system/home/desktop/wallpapers/science/2422830.jpg diff --git a/system/home/wallpapers/science/5636374.png b/system/home/desktop/wallpapers/science/5636374.png similarity index 100% rename from system/home/wallpapers/science/5636374.png rename to system/home/desktop/wallpapers/science/5636374.png diff --git a/system/home/wallpapers/science/JET interior with superimposed plasma 2560px.jpg b/system/home/desktop/wallpapers/science/JET interior with superimposed plasma 2560px.jpg similarity index 100% rename from system/home/wallpapers/science/JET interior with superimposed plasma 2560px.jpg rename to system/home/desktop/wallpapers/science/JET interior with superimposed plasma 2560px.jpg diff --git a/system/home/wallpapers/science/JET plasmas.png b/system/home/desktop/wallpapers/science/JET plasmas.png similarity index 100% rename from system/home/wallpapers/science/JET plasmas.png rename to system/home/desktop/wallpapers/science/JET plasmas.png diff --git a/system/home/wallpapers/science/JET wallpaper.jpg b/system/home/desktop/wallpapers/science/JET wallpaper.jpg similarity index 100% rename from system/home/wallpapers/science/JET wallpaper.jpg rename to system/home/desktop/wallpapers/science/JET wallpaper.jpg diff --git a/system/home/wallpapers/science/LHC Science.jpg b/system/home/desktop/wallpapers/science/LHC Science.jpg similarity index 100% rename from system/home/wallpapers/science/LHC Science.jpg rename to system/home/desktop/wallpapers/science/LHC Science.jpg diff --git a/system/home/wallpapers/science/MAST wallpaper.png b/system/home/desktop/wallpapers/science/MAST wallpaper.png similarity index 100% rename from system/home/wallpapers/science/MAST wallpaper.png rename to system/home/desktop/wallpapers/science/MAST wallpaper.png diff --git a/system/home/wallpapers/science/MAST-U 16x9.jpg b/system/home/desktop/wallpapers/science/MAST-U 16x9.jpg similarity index 100% rename from system/home/wallpapers/science/MAST-U 16x9.jpg rename to system/home/desktop/wallpapers/science/MAST-U 16x9.jpg diff --git a/system/home/wallpapers/science/chang_hyun_vvts6_1a.jpg b/system/home/desktop/wallpapers/science/chang_hyun_vvts6_1a.jpg similarity index 100% rename from system/home/wallpapers/science/chang_hyun_vvts6_1a.jpg rename to system/home/desktop/wallpapers/science/chang_hyun_vvts6_1a.jpg diff --git a/system/home/wallpapers/science/jet_glass_side_auto_pass_latest.png b/system/home/desktop/wallpapers/science/jet_glass_side_auto_pass_latest.png similarity index 100% rename from system/home/wallpapers/science/jet_glass_side_auto_pass_latest.png rename to system/home/desktop/wallpapers/science/jet_glass_side_auto_pass_latest.png diff --git a/system/home/wallpapers/science/jet_glass_side_s100_pass_latest.png b/system/home/desktop/wallpapers/science/jet_glass_side_s100_pass_latest.png similarity index 100% rename from system/home/wallpapers/science/jet_glass_side_s100_pass_latest.png rename to system/home/desktop/wallpapers/science/jet_glass_side_s100_pass_latest.png diff --git a/system/home/wallpapers/science/jet_glass_side_s250_pass_latest.png b/system/home/desktop/wallpapers/science/jet_glass_side_s250_pass_latest.png similarity index 100% rename from system/home/wallpapers/science/jet_glass_side_s250_pass_latest.png rename to system/home/desktop/wallpapers/science/jet_glass_side_s250_pass_latest.png diff --git a/system/home/wallpapers/science/jet_glass_side_s50_pass_latest.png b/system/home/desktop/wallpapers/science/jet_glass_side_s50_pass_latest.png similarity index 100% rename from system/home/wallpapers/science/jet_glass_side_s50_pass_latest.png rename to system/home/desktop/wallpapers/science/jet_glass_side_s50_pass_latest.png diff --git a/system/home/wallpapers/science/jet_glass_top_auto_pass_latest.png b/system/home/desktop/wallpapers/science/jet_glass_top_auto_pass_latest.png similarity index 100% rename from system/home/wallpapers/science/jet_glass_top_auto_pass_latest.png rename to system/home/desktop/wallpapers/science/jet_glass_top_auto_pass_latest.png diff --git a/system/home/wallpapers/science/jet_glass_top_s100_pass_latest.png b/system/home/desktop/wallpapers/science/jet_glass_top_s100_pass_latest.png similarity index 100% rename from system/home/wallpapers/science/jet_glass_top_s100_pass_latest.png rename to system/home/desktop/wallpapers/science/jet_glass_top_s100_pass_latest.png diff --git a/system/home/wallpapers/science/jet_glass_top_s250_pass_latest.png b/system/home/desktop/wallpapers/science/jet_glass_top_s250_pass_latest.png similarity index 100% rename from system/home/wallpapers/science/jet_glass_top_s250_pass_latest.png rename to system/home/desktop/wallpapers/science/jet_glass_top_s250_pass_latest.png diff --git a/system/home/wallpapers/science/jet_glass_top_s50_pass_latest.png b/system/home/desktop/wallpapers/science/jet_glass_top_s50_pass_latest.png similarity index 100% rename from system/home/wallpapers/science/jet_glass_top_s50_pass_latest.png rename to system/home/desktop/wallpapers/science/jet_glass_top_s50_pass_latest.png diff --git a/system/home/wallpapers/science/luca_z_56_iter_i_small.jpg b/system/home/desktop/wallpapers/science/luca_z_56_iter_i_small.jpg similarity index 100% rename from system/home/wallpapers/science/luca_z_56_iter_i_small.jpg rename to system/home/desktop/wallpapers/science/luca_z_56_iter_i_small.jpg diff --git a/system/home/wallpapers/science/mastu_glass_side_s3.png b/system/home/desktop/wallpapers/science/mastu_glass_side_s3.png similarity index 100% rename from system/home/wallpapers/science/mastu_glass_side_s3.png rename to system/home/desktop/wallpapers/science/mastu_glass_side_s3.png diff --git a/system/home/wallpapers/science/oct5-selfie.jpg b/system/home/desktop/wallpapers/science/oct5-selfie.jpg similarity index 100% rename from system/home/wallpapers/science/oct5-selfie.jpg rename to system/home/desktop/wallpapers/science/oct5-selfie.jpg diff --git a/system/home/wallpapers/science/pit_02-07-2021_small.jpg b/system/home/desktop/wallpapers/science/pit_02-07-2021_small.jpg similarity index 100% rename from system/home/wallpapers/science/pit_02-07-2021_small.jpg rename to system/home/desktop/wallpapers/science/pit_02-07-2021_small.jpg diff --git a/system/home/wallpapers/science/vsm6_almost_there_1_small.jpg b/system/home/desktop/wallpapers/science/vsm6_almost_there_1_small.jpg similarity index 100% rename from system/home/wallpapers/science/vsm6_almost_there_1_small.jpg rename to system/home/desktop/wallpapers/science/vsm6_almost_there_1_small.jpg diff --git a/system/home/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg b/system/home/desktop/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg similarity index 100% rename from system/home/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg rename to system/home/desktop/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg diff --git a/system/home/wallpapers/solids/bkg1.png b/system/home/desktop/wallpapers/solids/bkg1.png similarity index 100% rename from system/home/wallpapers/solids/bkg1.png rename to system/home/desktop/wallpapers/solids/bkg1.png diff --git a/system/home/wallpapers/solids/bkg2.png b/system/home/desktop/wallpapers/solids/bkg2.png similarity index 100% rename from system/home/wallpapers/solids/bkg2.png rename to system/home/desktop/wallpapers/solids/bkg2.png diff --git a/system/home/wallpapers/solids/bkg3.png b/system/home/desktop/wallpapers/solids/bkg3.png similarity index 100% rename from system/home/wallpapers/solids/bkg3.png rename to system/home/desktop/wallpapers/solids/bkg3.png diff --git a/system/home/wallpapers/solids/bkg4.png b/system/home/desktop/wallpapers/solids/bkg4.png similarity index 100% rename from system/home/wallpapers/solids/bkg4.png rename to system/home/desktop/wallpapers/solids/bkg4.png diff --git a/system/home/wallpapers/solids/bkg5.png b/system/home/desktop/wallpapers/solids/bkg5.png similarity index 100% rename from system/home/wallpapers/solids/bkg5.png rename to system/home/desktop/wallpapers/solids/bkg5.png diff --git a/system/home/wallpapers/solids/blue.png b/system/home/desktop/wallpapers/solids/blue.png similarity index 100% rename from system/home/wallpapers/solids/blue.png rename to system/home/desktop/wallpapers/solids/blue.png diff --git a/system/home/wallpapers/solids/cyan.png b/system/home/desktop/wallpapers/solids/cyan.png similarity index 100% rename from system/home/wallpapers/solids/cyan.png rename to system/home/desktop/wallpapers/solids/cyan.png diff --git a/system/home/wallpapers/solids/flamingo.png b/system/home/desktop/wallpapers/solids/flamingo.png similarity index 100% rename from system/home/wallpapers/solids/flamingo.png rename to system/home/desktop/wallpapers/solids/flamingo.png diff --git a/system/home/wallpapers/solids/gray.png b/system/home/desktop/wallpapers/solids/gray.png similarity index 100% rename from system/home/wallpapers/solids/gray.png rename to system/home/desktop/wallpapers/solids/gray.png diff --git a/system/home/wallpapers/solids/green.png b/system/home/desktop/wallpapers/solids/green.png similarity index 100% rename from system/home/wallpapers/solids/green.png rename to system/home/desktop/wallpapers/solids/green.png diff --git a/system/home/wallpapers/solids/magenta.png b/system/home/desktop/wallpapers/solids/magenta.png similarity index 100% rename from system/home/wallpapers/solids/magenta.png rename to system/home/desktop/wallpapers/solids/magenta.png diff --git a/system/home/wallpapers/solids/peach.png b/system/home/desktop/wallpapers/solids/peach.png similarity index 100% rename from system/home/wallpapers/solids/peach.png rename to system/home/desktop/wallpapers/solids/peach.png diff --git a/system/home/wallpapers/solids/pink.png b/system/home/desktop/wallpapers/solids/pink.png similarity index 100% rename from system/home/wallpapers/solids/pink.png rename to system/home/desktop/wallpapers/solids/pink.png diff --git a/system/home/wallpapers/solids/red.png b/system/home/desktop/wallpapers/solids/red.png similarity index 100% rename from system/home/wallpapers/solids/red.png rename to system/home/desktop/wallpapers/solids/red.png diff --git a/system/home/wallpapers/solids/white.png b/system/home/desktop/wallpapers/solids/white.png similarity index 100% rename from system/home/wallpapers/solids/white.png rename to system/home/desktop/wallpapers/solids/white.png diff --git a/system/home/wallpapers/solids/yellow.png b/system/home/desktop/wallpapers/solids/yellow.png similarity index 100% rename from system/home/wallpapers/solids/yellow.png rename to system/home/desktop/wallpapers/solids/yellow.png diff --git a/system/home/wallpapers/space.png b/system/home/desktop/wallpapers/space.png similarity index 100% rename from system/home/wallpapers/space.png rename to system/home/desktop/wallpapers/space.png diff --git a/system/home/wallpapers/sweet/Sweet-S1.png b/system/home/desktop/wallpapers/sweet/Sweet-S1.png similarity index 100% rename from system/home/wallpapers/sweet/Sweet-S1.png rename to system/home/desktop/wallpapers/sweet/Sweet-S1.png diff --git a/system/home/wallpapers/sweet/Sweet-S2.png b/system/home/desktop/wallpapers/sweet/Sweet-S2.png similarity index 100% rename from system/home/wallpapers/sweet/Sweet-S2.png rename to system/home/desktop/wallpapers/sweet/Sweet-S2.png diff --git a/system/home/wallpapers/sweet/Sweet-S3.png b/system/home/desktop/wallpapers/sweet/Sweet-S3.png similarity index 100% rename from system/home/wallpapers/sweet/Sweet-S3.png rename to system/home/desktop/wallpapers/sweet/Sweet-S3.png diff --git a/system/home/wallpapers/sweet/Sweet-S4.png b/system/home/desktop/wallpapers/sweet/Sweet-S4.png similarity index 100% rename from system/home/wallpapers/sweet/Sweet-S4.png rename to system/home/desktop/wallpapers/sweet/Sweet-S4.png diff --git a/system/home/wallpapers/sweet/Sweet-S5.png b/system/home/desktop/wallpapers/sweet/Sweet-S5.png similarity index 100% rename from system/home/wallpapers/sweet/Sweet-S5.png rename to system/home/desktop/wallpapers/sweet/Sweet-S5.png diff --git a/system/home/wallpapers/sweet/Sweet-space.png b/system/home/desktop/wallpapers/sweet/Sweet-space.png similarity index 100% rename from system/home/wallpapers/sweet/Sweet-space.png rename to system/home/desktop/wallpapers/sweet/Sweet-space.png diff --git a/system/home/wallpapers/sweet/source.svg b/system/home/desktop/wallpapers/sweet/source.svg similarity index 100% rename from system/home/wallpapers/sweet/source.svg rename to system/home/desktop/wallpapers/sweet/source.svg diff --git a/system/home/wallpapers/waves/Waves Dark 6016x6016.jpg b/system/home/desktop/wallpapers/waves/Waves Dark 6016x6016.jpg similarity index 100% rename from system/home/wallpapers/waves/Waves Dark 6016x6016.jpg rename to system/home/desktop/wallpapers/waves/Waves Dark 6016x6016.jpg diff --git a/system/home/wallpapers/waves/Waves Dark Alt 6016x6016.jpg b/system/home/desktop/wallpapers/waves/Waves Dark Alt 6016x6016.jpg similarity index 100% rename from system/home/wallpapers/waves/Waves Dark Alt 6016x6016.jpg rename to system/home/desktop/wallpapers/waves/Waves Dark Alt 6016x6016.jpg diff --git a/system/home/wallpapers/waves/Waves Light 6016x6016.jpg b/system/home/desktop/wallpapers/waves/Waves Light 6016x6016.jpg similarity index 100% rename from system/home/wallpapers/waves/Waves Light 6016x6016.jpg rename to system/home/desktop/wallpapers/waves/Waves Light 6016x6016.jpg diff --git a/system/home/wallpapers/waves/cat-blue-eye.png b/system/home/desktop/wallpapers/waves/cat-blue-eye.png similarity index 100% rename from system/home/wallpapers/waves/cat-blue-eye.png rename to system/home/desktop/wallpapers/waves/cat-blue-eye.png diff --git a/system/home/wallpapers/waves/cat-waves.png b/system/home/desktop/wallpapers/waves/cat-waves.png similarity index 100% rename from system/home/wallpapers/waves/cat-waves.png rename to system/home/desktop/wallpapers/waves/cat-waves.png diff --git a/system/home/wallpapers/waves/wavy_lines_v01_5120x2880.png b/system/home/desktop/wallpapers/waves/wavy_lines_v01_5120x2880.png similarity index 100% rename from system/home/wallpapers/waves/wavy_lines_v01_5120x2880.png rename to system/home/desktop/wallpapers/waves/wavy_lines_v01_5120x2880.png diff --git a/system/home/wallpapers/waves/wavy_lines_v02_5120x2880.png b/system/home/desktop/wallpapers/waves/wavy_lines_v02_5120x2880.png similarity index 100% rename from system/home/wallpapers/waves/wavy_lines_v02_5120x2880.png rename to system/home/desktop/wallpapers/waves/wavy_lines_v02_5120x2880.png diff --git a/system/home/wallpapers/waves/wavy_lines_v03_5120x2880.png b/system/home/desktop/wallpapers/waves/wavy_lines_v03_5120x2880.png similarity index 100% rename from system/home/wallpapers/waves/wavy_lines_v03_5120x2880.png rename to system/home/desktop/wallpapers/waves/wavy_lines_v03_5120x2880.png diff --git a/system/home/desktop/waybar.nix b/system/home/desktop/waybar.nix new file mode 100644 index 00000000..833b24fb --- /dev/null +++ b/system/home/desktop/waybar.nix @@ -0,0 +1,405 @@ +{ config, pkgs, ... }: +{ + stylix.targets.waybar.enable = false; + systemd.user.targets.tray.Unit = { + Description = "Home Manager System Tray"; + Requires = [ "graphical-session.target" ]; + }; + programs.waybar = { + enable = true; + systemd.enable = true; + settings.main = { + name = "main"; + layer = "top"; + position = "top"; + # Layout + "modules-left" = [ + "hyprland/window" + "mpris" + ]; + "modules-center" = [ "hyprland/workspaces" ]; + "modules-right" = [ + "custom/notification" + "pulseaudio" + "network" + "bluetooth" + "clock#calendar" + "clock" + "backlight" + "battery" + "custom/weather" + "systemd-failed-units" + "tray" + ]; + # Module config + "hyprland/workspaces" = { + format = "{icon}"; + format-icons = { + "1" = "󰫃 "; + "2" = "󰫄 "; + "3" = "󰫅 "; + "4" = "󰫆 "; + "5" = "󰫇 "; + "6" = "󰫈 "; + default = "󰋙 "; + urgent = "󰁡 "; + }; + all-outputs = false; + persistent-workspaces = { + "1" = [ ]; + "2" = [ ]; + "3" = [ ]; + "4" = [ ]; + "5" = [ ]; + "6" = [ ]; + }; + }; + "hyprland/window" = { + "format" = "{title}"; + "max-length" = 50; + "rewrite" = { + "(.*) - GNU Emacs at (.*)" = " $1 [$2]"; + "(alacritty.*)" = " $1"; + "(.*) - mpv" = "󰦟 $1"; + "swayimg: (.*)" = "󰋩 $1"; + "swappy" = "󰹑 swappy"; + "(btm)" = " Resource Usage [$1]"; + "(cava)" = "󰝚 Music Visualiser [$1]"; + "(.*) - Thunar" = "󰝰 $1"; + "Mozilla Firefox" = "󰈹 $1"; + "(.*) — Mozilla Firefox" = "󰈹 $1"; + "Nyxt - (.*)" = "󰀹 $1"; + "(.*) - Chromium" = "󰊯 $1"; + "(Signal.*)" = "󰭹 $1"; + "((?:.*)WebCord.*)" = "󰙯 $1"; + "(Cartridges.*)" = "󰊗 $1"; + "([Ss]team.*)" = "󰓓 $1"; + "(Prism Launcher.*)" = "󰍳 Minecraft ($1)"; + "(.*)(?: *)PrusaSlicer-(.*)" = "󰐫 $1 PrusaSlicer ($2)"; + "(.*)(?: *)PrusaSlicer G-code Viewer-(.*)" = "󰹛 $1 G-code Viewer ($2)"; + "FreeCAD (.*)" = "󰻬 FreeCAD $1"; + "(.*) - Blender.* " = "󰂫 $1"; + "(X2Go Client)" = "󰢹 $1"; + "(NoMachine|Nxplayer.bin) (.*)" = "󰢹 $1 $2"; + }; + }; + mpris = { + "format" = "{player_icon} {artist} - {title} {status_icon}"; + "tooltip-format" = "{player_icon} ({player}) {dynamic}"; + "title-len" = 64; + "interval" = 1; + "dynamic-order" = [ + "album" + "artist" + "title" + "position" + "length" + ]; + "player-icons" = { + "default" = "󰲸 "; + "emms" = " "; + "firefox" = "󰈹 "; + "mpv" = "󰦟 "; + }; + "status-icons" = { + "playing" = "󰐊"; + "paused" = "󰏤"; + "stopped" = "󰓛"; + }; + "ignored-players" = [ ]; + }; + pulseaudio = { + scroll-step = 5; + format = "{format_source}{icon}{volume}%"; + format-muted = "{format_source} 󰝟 "; + format-source = "󰍬 "; + format-source-muted = "󰍭 "; + format-icons = { + car = "󰄍 "; + default = [ + "󰕿 " + "󰖀 " + "󰕾 " + ]; + hands-free = "󰥰 "; + headset = "󰋎 "; + phone = "󰏲 "; + portable = "󰏳 "; + headphone = "󰋋 "; + }; + on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; + on-click-right = "${pkgs.pamixer}/bin/pamixer -t"; + on-scroll-up = "${pkgs.pamixer}/bin/pamixer -i 5"; + on-scroll-down = "${pkgs.pamixer}/bin/pamixer -d 5"; + }; + disk = { + format = "󰋊 {percentage_used}%"; + path = config.home.homeDirectory; + }; + cpu = { + format = "󰻠 {usage}%"; + tooltip = false; + }; + memory = { + format = "󰍛 {}%"; + }; + temperature = { + critical-threshold = 80; + format = "{icon} {temperatureC}°C"; + format-icons = [ + "󱃃" + "󰔏" + "󱃂" + ]; + }; + network = { + format-icons = [ + "󰤟 " + "󰤢 " + "󰤥 " + "󰤨 " + ]; + format-wifi = "{icon}"; + format-ethernet = "󰈁 "; + format-linked = "󰈂 "; + format-disconnected = "󰈂 "; + tooltip-format = "{essid} ({signalStrength}%)"; + on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; + }; + bluetooth = { + format = "󰂯"; + format-disabled = "󰂲"; + format-off = "󰂲"; + format-on = "󰂯"; + format-connected = "󰂱"; + tooltip-format = "{status} | {device_alias}"; + on-click = "${pkgs.blueman}/bin/blueman-manager"; + }; + "clock#calendar" = { + format = "󰃭 {:%Y-%m-%d}"; + tooltip-format = "{calendar}"; + calendar = { + mode = "month"; + mode-mon-col = 3; + weeks-pos = "left"; + on-scroll = 1; + format = + let + scheme = config.lib.stylix.scheme.withHashtag; + in + { + months = "{}"; + weeks = "W{}"; + weekdays = "{}"; + days = "{}"; + today = "{}"; + }; + }; + actions = { + on-scroll-up = "shift_up"; + on-scroll-down = "shift_down"; + }; + }; + clock.format = "󰥔 {:%R}"; + backlight = { + format = "{icon}"; + tooltip-format = "{percent}%"; + format-icons = [ + " " + " " + " " + " " + " " + " " + " " + " " + " " + ]; + }; + battery = { + states = { + warning = 20; + critical = 10; + }; + format = "{icon}"; + format-time = "{H}:{m}"; + format-charging = "󰂄 ({time})"; + format-plugged = "󰚥 "; + format-warning = "{icon}{capacity}%"; + format-critical = "{icon}{capacity}% ({time})"; + tooltip-format = "{capacity}% | {power}W | {time}"; + format-icons = [ + "󱃍 " + "󰁺 " + "󰁻 " + "󰁼 " + "󰁽 " + "󰁾 " + "󰁿 " + "󰂀 " + "󰂁 " + "󰂂 " + "󰁹 " + ]; + }; + "systemd-failed-units" = { + hide-on-ok = false; + format = "󰀦 S:{nr_failed_system} U:{nr_failed_user}"; + format-ok = "󰄬 "; + system = true; + user = true; + }; + "custom/notification" = + let + makoctl = "${config.services.mako.package}/bin/makoctl"; + jq = "${pkgs.jq}/bin/jq"; + in + { + exec = "( ${makoctl} list | ${jq} -e '.data[] | length > 0' >/dev/null && echo '󱅫 ' ) || echo '󰂚 ' "; + format = "{}"; + on-click = "${makoctl} dismiss -a"; + interval = 3; + }; + "custom/weather" = + let + date-format = "%Y-%m-%d"; + custom-indicator = "{ICON}{temp_C}({FeelsLikeC})"; + in + { + format = "{}°"; + tooltip = true; + interval = 900; # Every 15 minutes + exec = ''${pkgs.wttrbar}/bin/wttrbar --location Didcot --date-format "${date-format}" --custom-indicator "${custom-indicator}"''; + return-type = "json"; + }; + tray = { + icon-size = 20; + show-passive-items = true; + spacing = 5; + }; + }; + style = + let + scheme = config.lib.stylix.scheme.withHashtag; + alpha = "0.8"; + in + '' + * { + all: unset; + font-family: ${config.stylix.fonts.monospace.name}; + font-size: ${toString config.stylix.fonts.sizes.popups}px; + } + + window { + background: transparent; + box-shadow: none; + border: none; + } + + window > box { + color: ${scheme.base05}; + background: ${scheme.base00}; + margin: 5px 5px 0px; + padding: 0px; + border-top: 1px solid ${scheme.base04}; + border-radius: 5px; + } + + tooltip { + background: alpha(${scheme.base00}, ${alpha}); + border: 1px solid ${scheme.base0D}; + border-radius: 5px; + box-shadow: none; + } + + tooltip label { + color: ${scheme.base05}; + border: none; + padding: 5px; + margin: 0px; + } + + #workspaces, + #window, + #mpris, + #pulseaudio, + #network, + #bluetooth, + #backlight, + #battery, + #clock, + #custom-notification, + #custom-weather, + #tray { + margin: 0px; + padding: 1px 5px; + } + + #workspaces, + #window, + #tray, + #backlight, + #battery, + #custom-weather { + color: ${scheme.base05}; + } + + #workspaces button { + background: transparent; + color: ${scheme.base05}; + margin: 0px; + padding: 0px 5px; + } + #workspaces button.empty { + color: ${scheme.base03}; + } + #workspaces button.active { + color: ${scheme.base0E}; + } + #workspaces button.urgent { + color: ${scheme.base09}; + } + + #mpris { + color: ${scheme.base04}; + } + + #custom-notification { + color: ${scheme.base08}; + } + #pulseaudio { + color: ${scheme.base09}; + } + #network { + color: ${scheme.base0A}; + } + #bluetooth { + color: ${scheme.base0B}; + } + #clock.calendar { + color: ${scheme.base0C}; + } + #clock { + color: ${scheme.base0D}; + } + + #battery.warning { + color: ${scheme.base09}; + } + #battery.critical { + color: ${scheme.base08}; + } + #battery.charging, + #battery.plugged { + color: ${scheme.base0B}; + } + + #systemd-failed-units.ok { + color: ${scheme.base0B} + } + #systemd-failed-units.degraded { + color: ${scheme.base08} + } + ''; + }; +}