diff --git a/home/default.nix b/home/default.nix index 9fb0c7d..e4f6098 100644 --- a/home/default.nix +++ b/home/default.nix @@ -6,7 +6,7 @@ }: { imports = [ # Programs - ../programs/sway/default.nix + ../programs/desktop/default.nix ../programs/shell/default.nix ../programs/emacs/default.nix ../programs/nyxt/default.nix diff --git a/programs/sway/alacritty/catppuccin-mocha.toml b/programs/desktop/alacritty/catppuccin-mocha.toml similarity index 100% rename from programs/sway/alacritty/catppuccin-mocha.toml rename to programs/desktop/alacritty/catppuccin-mocha.toml diff --git a/programs/sway/alacritty/default.nix b/programs/desktop/alacritty/default.nix similarity index 96% rename from programs/sway/alacritty/default.nix rename to programs/desktop/alacritty/default.nix index 30cb557..f387984 100644 --- a/programs/sway/alacritty/default.nix +++ b/programs/desktop/alacritty/default.nix @@ -13,7 +13,6 @@ }; }; window = { - opacity = 0.9; dynamic_title = true; padding = { x = 10; diff --git a/programs/sway/avizo/default.nix b/programs/desktop/avizo/default.nix similarity index 100% rename from programs/sway/avizo/default.nix rename to programs/desktop/avizo/default.nix diff --git a/programs/desktop/default.nix b/programs/desktop/default.nix new file mode 100644 index 0000000..c641696 --- /dev/null +++ b/programs/desktop/default.nix @@ -0,0 +1,35 @@ +{ + config, + lib, + pkgs, + ... +}: { + imports = [ + ./sway/default.nix + ./niri/default.nix + ./foot/default.nix + ./alacritty/default.nix + ./avizo/default.nix + ./fuzzel/default.nix + ./swaylock/default.nix + ./swayidle/default.nix + ./swaync/default.nix + ./waybar/default.nix + ./wlogout/default.nix + ]; + home.packages = with pkgs; [ + swaybg + (writeShellScriptBin "set-background" "${swaybg}/bin/swaybg -m fill -i ${./wallpapers/default.jpg}") + (writeShellScriptBin "protonmail-setup-bridge" '' + pkill -9 -f protonmail-bridge + ${protonmail-bridge}/bin/protonmail-bridge -c + swaymsg exec "${protonmail-bridge}/bin/protonmail-bridge -n" + '') + (writeShellScriptBin "davmail-setup" '' + systemctl --user restart davmail # Ensure config file is present + systemctl --user stop davmail + ${davmail}/bin/davmail -n ~/.davmail.properties + systemctl --user restart davmail + '') + ]; +} diff --git a/programs/sway/foot/default.nix b/programs/desktop/foot/default.nix similarity index 90% rename from programs/sway/foot/default.nix rename to programs/desktop/foot/default.nix index 029744d..99ed2b3 100644 --- a/programs/sway/foot/default.nix +++ b/programs/desktop/foot/default.nix @@ -8,12 +8,9 @@ server.enable = true; settings = { main = { - # term = "xterm-256color"; - # title = "foot"; locked-title = false; font = "${fonts.monospace.name}:size=${toString fonts.sizes.applications}"; dpi-aware = false; - pad = "10x10"; }; bell = { urgent = false; @@ -23,7 +20,6 @@ cursor = {blink = true;}; mouse = {hide-when-typing = true;}; colors = with config.scheme; rec { - alpha = 0.9; background = base00; foreground = base05; regular0 = base02; diff --git a/programs/sway/fuzzel/default.nix b/programs/desktop/fuzzel/default.nix similarity index 95% rename from programs/sway/fuzzel/default.nix rename to programs/desktop/fuzzel/default.nix index 6bcbcf0..2feef83 100644 --- a/programs/sway/fuzzel/default.nix +++ b/programs/desktop/fuzzel/default.nix @@ -27,7 +27,7 @@ layer = "overlay"; }; colors = with config.scheme; { - background = "${base00}5A"; # 90% opacity + background = "${base00}FF"; text = "${base05}FF"; match = "${red}FF"; selection = "${base01}FF"; diff --git a/programs/desktop/niri/config.kdl b/programs/desktop/niri/config.kdl new file mode 100644 index 0000000..43c8fca --- /dev/null +++ b/programs/desktop/niri/config.kdl @@ -0,0 +1,184 @@ +input { + keyboard { + xkb { + layout "gb" + options "grp:win_space_toggle,compose:ralt,ctrl:nocaps" + } + } + touchpad { + tap + natural-scroll + } + warp-mouse-to-focus +} + +layout { + gaps 16 + center-focused-column "never" + preset-column-widths { + proportion 0.5 + proportion 0.75 + } + default-column-width { proportion 0.75; } + focus-ring { + off + width 1 + active-color "#7fc8ff" + inactive-color "#505050" + } + border { + off + width 1 + active-color "#ffc87f" + inactive-color "#505050" + } + struts { + left 64 + right 64 + } +} + +screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" + +binds { + Mod+Shift+Slash { show-hotkey-overlay; } + Mod+Return { spawn "foot"; } + Mod+Shift+Return { spawn "fuzzel"; } + Mod+E { spawn "emacsclient" "-c"; } + Mod+P { spawn "wlogout"; } + + Mod+Z { spawn "swaync-client" "-t" "-sw"; } + Mod+Shift+Z { spawn "swaync-client" "-d" "-sw"; } + + Super+Alt+L { spawn "swaylockfx"; } + + XF86AudioRaiseVolume allow-when-locked=true { spawn "volumectl" "-u" "+" "5"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "volumectl" "-u" "-" "5"; } + XF86AudioMute allow-when-locked=true { spawn "volumectl" "%"; } + XF86AudioMicMute allow-when-locked=true { spawn "volumectl" "-m" "%"; } + + XF86MonBrightnessUp allow-when-locked=true { spawn "lightctl" "+" "5"; } + XF86MonBrightnessDown allow-when-locked=true { spawn "lightctl" "-" "5"; } + + XF86AudioPlay allow-when-locked=true { spawn "playerctl" "play-pause"; } + XF86AudioStop allow-when-locked=true { spawn "playerctl" "play-pause"; } + XF86AudioPrevious allow-when-locked=true { spawn "playerctl" "previous"; } + XF86AudioNext allow-when-locked=true { spawn "playerctl" "next"; } + + Mod+Q { close-window; } + + Mod+Left { focus-column-left; } + Mod+Down { focus-window-down; } + Mod+Up { focus-window-up; } + Mod+Right { focus-column-right; } + Mod+H { focus-column-left; } + Mod+J { focus-window-down; } + Mod+K { focus-window-up; } + Mod+L { focus-column-right; } + + Mod+Ctrl+Left { move-column-left; } + Mod+Ctrl+Down { move-window-down; } + Mod+Ctrl+Up { move-window-up; } + Mod+Ctrl+Right { move-column-right; } + Mod+Ctrl+H { move-column-left; } + Mod+Ctrl+J { move-window-down; } + Mod+Ctrl+K { move-window-up; } + Mod+Ctrl+L { move-column-right; } + + Mod+Home { focus-column-first; } + Mod+End { focus-column-last; } + Mod+Ctrl+Home { move-column-to-first; } + Mod+Ctrl+End { move-column-to-last; } + + Mod+Shift+Left { focus-monitor-left; } + Mod+Shift+Down { focus-monitor-down; } + Mod+Shift+Up { focus-monitor-up; } + Mod+Shift+Right { focus-monitor-right; } + Mod+Shift+H { focus-monitor-left; } + Mod+Shift+J { focus-monitor-down; } + Mod+Shift+K { focus-monitor-up; } + Mod+Shift+L { focus-monitor-right; } + + Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } + Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } + Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } + Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } + Mod+Shift+Ctrl+H { move-column-to-monitor-left; } + Mod+Shift+Ctrl+J { move-column-to-monitor-down; } + Mod+Shift+Ctrl+K { move-column-to-monitor-up; } + Mod+Shift+Ctrl+L { move-column-to-monitor-right; } + + Mod+Page_Down { focus-workspace-down; } + Mod+Page_Up { focus-workspace-up; } + Mod+U { focus-workspace-down; } + Mod+I { focus-workspace-up; } + Mod+Ctrl+Page_Down { move-column-to-workspace-down; } + Mod+Ctrl+Page_Up { move-column-to-workspace-up; } + Mod+Ctrl+U { move-column-to-workspace-down; } + Mod+Ctrl+I { move-column-to-workspace-up; } + + Mod+Shift+Page_Down { move-workspace-down; } + Mod+Shift+Page_Up { move-workspace-up; } + Mod+Shift+U { move-workspace-down; } + Mod+Shift+I { move-workspace-up; } + + Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } + Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } + Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } + Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } + + Mod+WheelScrollRight { focus-column-right; } + Mod+WheelScrollLeft { focus-column-left; } + Mod+Ctrl+WheelScrollRight { move-column-right; } + Mod+Ctrl+WheelScrollLeft { move-column-left; } + + Mod+Shift+WheelScrollDown { focus-column-right; } + Mod+Shift+WheelScrollUp { focus-column-left; } + Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } + Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } + + Mod+1 { focus-workspace 1; } + Mod+2 { focus-workspace 2; } + Mod+3 { focus-workspace 3; } + Mod+4 { focus-workspace 4; } + Mod+5 { focus-workspace 5; } + Mod+6 { focus-workspace 6; } + Mod+7 { focus-workspace 7; } + Mod+8 { focus-workspace 8; } + Mod+9 { focus-workspace 9; } + Mod+Ctrl+1 { move-column-to-workspace 1; } + Mod+Ctrl+2 { move-column-to-workspace 2; } + Mod+Ctrl+3 { move-column-to-workspace 3; } + Mod+Ctrl+4 { move-column-to-workspace 4; } + Mod+Ctrl+5 { move-column-to-workspace 5; } + Mod+Ctrl+6 { move-column-to-workspace 6; } + Mod+Ctrl+7 { move-column-to-workspace 7; } + Mod+Ctrl+8 { move-column-to-workspace 8; } + Mod+Ctrl+9 { move-column-to-workspace 9; } + + Mod+Comma { consume-window-into-column; } + Mod+Period { expel-window-from-column; } + + Mod+BracketLeft { consume-or-expel-window-left; } + Mod+BracketRight { consume-or-expel-window-right; } + + Mod+R { switch-preset-column-width; } + Mod+Shift+R { reset-window-height; } + Mod+F { maximize-column; } + Mod+Shift+F { fullscreen-window; } + Mod+C { center-column; } + + Mod+Minus { set-column-width "-10%"; } + Mod+Equal { set-column-width "+10%"; } + + Mod+Shift+Minus { set-window-height "-10%"; } + Mod+Shift+Equal { set-window-height "+10%"; } + + Print { screenshot; } + Ctrl+Print { screenshot-screen; } + Alt+Print { screenshot-window; } + + Mod+Shift+E { quit; } + + Mod+Shift+P { power-off-monitors; } +} diff --git a/programs/desktop/niri/default.nix b/programs/desktop/niri/default.nix new file mode 100644 index 0000000..6312049 --- /dev/null +++ b/programs/desktop/niri/default.nix @@ -0,0 +1,4 @@ +{pkgs, ...}: { + xdg.configFile."niri/config.kdl".source = ./config.kdl; + home.packages = with pkgs; [playerctl]; +} diff --git a/programs/sway/rofi/default.nix b/programs/desktop/rofi/default.nix similarity index 100% rename from programs/sway/rofi/default.nix rename to programs/desktop/rofi/default.nix diff --git a/programs/sway/default.nix b/programs/desktop/sway/default.nix similarity index 87% rename from programs/sway/default.nix rename to programs/desktop/sway/default.nix index 384a1ae..7ed1f20 100644 --- a/programs/sway/default.nix +++ b/programs/desktop/sway/default.nix @@ -6,31 +6,6 @@ accentColour ? "base07", ... }: { - imports = [ - ./foot/default.nix - ./alacritty/default.nix - ./avizo/default.nix - ./fuzzel/default.nix - ./swaylock/default.nix - ./swayidle/default.nix - ./swaync/default.nix - ./waybar/default.nix - ./wlogout/default.nix - ]; - home.packages = with pkgs; [ - swaybg - (writeShellScriptBin "protonmail-setup-bridge" '' - pkill -9 -f protonmail-bridge - ${protonmail-bridge}/bin/protonmail-bridge -c - swaymsg exec "${protonmail-bridge}/bin/protonmail-bridge -n" - '') - (writeShellScriptBin "davmail-setup" '' - systemctl --user restart davmail # Ensure config file is present - systemctl --user stop davmail - ${davmail}/bin/davmail -n ~/.davmail.properties - systemctl --user restart davmail - '') - ]; wayland.windowManager.sway = { enable = true; package = @@ -98,7 +73,7 @@ startup = [ {command = "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1";} {command = "${pkgs.protonmail-bridge}/bin/protonmail-bridge -n";} - {command = "${pkgs.swaybg}/bin/swaybg -m fill -i ${../../wallpapers/default.jpg}";} + {command = "${pkgs.swaybg}/bin/swaybg -m fill -i ${.wallpapers/default.jpg}";} ]; window = { border = 1; diff --git a/programs/sway/swayidle/default.nix b/programs/desktop/swayidle/default.nix similarity index 100% rename from programs/sway/swayidle/default.nix rename to programs/desktop/swayidle/default.nix diff --git a/programs/sway/swaylock/default.nix b/programs/desktop/swaylock/default.nix similarity index 100% rename from programs/sway/swaylock/default.nix rename to programs/desktop/swaylock/default.nix diff --git a/programs/sway/swaylock/swaylockfx.nix b/programs/desktop/swaylock/swaylockfx.nix similarity index 100% rename from programs/sway/swaylock/swaylockfx.nix rename to programs/desktop/swaylock/swaylockfx.nix diff --git a/programs/sway/swaync/default.nix b/programs/desktop/swaync/default.nix similarity index 99% rename from programs/sway/swaync/default.nix rename to programs/desktop/swaync/default.nix index d4b278a..3e0b077 100644 --- a/programs/sway/swaync/default.nix +++ b/programs/desktop/swaync/default.nix @@ -19,7 +19,7 @@ border-radius: 10px; border: 1px solid ${withHashtag.${accentColour}}; margin: 18px; - background-color: rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, 0.9); + background-color: rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, 1.0); color: ${withHashtag.base05}; padding: 0; } diff --git a/wallpapers/LICENSE b/programs/desktop/wallpapers/LICENSE similarity index 100% rename from wallpapers/LICENSE rename to programs/desktop/wallpapers/LICENSE diff --git a/wallpapers/README.md b/programs/desktop/wallpapers/README.md similarity index 100% rename from wallpapers/README.md rename to programs/desktop/wallpapers/README.md diff --git a/wallpapers/blake.png b/programs/desktop/wallpapers/blake.png similarity index 100% rename from wallpapers/blake.png rename to programs/desktop/wallpapers/blake.png diff --git a/wallpapers/default.jpg b/programs/desktop/wallpapers/default.jpg similarity index 100% rename from wallpapers/default.jpg rename to programs/desktop/wallpapers/default.jpg diff --git a/wallpapers/dithered/barn.png b/programs/desktop/wallpapers/dithered/barn.png similarity index 100% rename from wallpapers/dithered/barn.png rename to programs/desktop/wallpapers/dithered/barn.png diff --git a/wallpapers/dithered/lighthouse.png b/programs/desktop/wallpapers/dithered/lighthouse.png similarity index 100% rename from wallpapers/dithered/lighthouse.png rename to programs/desktop/wallpapers/dithered/lighthouse.png diff --git a/wallpapers/dithered/marketplace.png b/programs/desktop/wallpapers/dithered/marketplace.png similarity index 100% rename from wallpapers/dithered/marketplace.png rename to programs/desktop/wallpapers/dithered/marketplace.png diff --git a/wallpapers/dithered/motorbikes.png b/programs/desktop/wallpapers/dithered/motorbikes.png similarity index 100% rename from wallpapers/dithered/motorbikes.png rename to programs/desktop/wallpapers/dithered/motorbikes.png diff --git a/wallpapers/flatppuccin/flatppuccin_4k_macchiato.png b/programs/desktop/wallpapers/flatppuccin/flatppuccin_4k_macchiato.png similarity index 100% rename from wallpapers/flatppuccin/flatppuccin_4k_macchiato.png rename to programs/desktop/wallpapers/flatppuccin/flatppuccin_4k_macchiato.png diff --git a/wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png b/programs/desktop/wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png similarity index 100% rename from wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png rename to programs/desktop/wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png diff --git a/wallpapers/gradients/bkg1_bkg5.png b/programs/desktop/wallpapers/gradients/bkg1_bkg5.png similarity index 100% rename from wallpapers/gradients/bkg1_bkg5.png rename to programs/desktop/wallpapers/gradients/bkg1_bkg5.png diff --git a/wallpapers/gradients/bkg3_bkg5.png b/programs/desktop/wallpapers/gradients/bkg3_bkg5.png similarity index 100% rename from wallpapers/gradients/bkg3_bkg5.png rename to programs/desktop/wallpapers/gradients/bkg3_bkg5.png diff --git a/wallpapers/gradients/blue_bkg5.png b/programs/desktop/wallpapers/gradients/blue_bkg5.png similarity index 100% rename from wallpapers/gradients/blue_bkg5.png rename to programs/desktop/wallpapers/gradients/blue_bkg5.png diff --git a/wallpapers/gradients/blue_green.png b/programs/desktop/wallpapers/gradients/blue_green.png similarity index 100% rename from wallpapers/gradients/blue_green.png rename to programs/desktop/wallpapers/gradients/blue_green.png diff --git a/wallpapers/gradients/cyan_bkg5.png b/programs/desktop/wallpapers/gradients/cyan_bkg5.png similarity index 100% rename from wallpapers/gradients/cyan_bkg5.png rename to programs/desktop/wallpapers/gradients/cyan_bkg5.png diff --git a/wallpapers/gradients/flamingo_bkg1.png b/programs/desktop/wallpapers/gradients/flamingo_bkg1.png similarity index 100% rename from wallpapers/gradients/flamingo_bkg1.png rename to programs/desktop/wallpapers/gradients/flamingo_bkg1.png diff --git a/wallpapers/gradients/flamingo_bkg5.png b/programs/desktop/wallpapers/gradients/flamingo_bkg5.png similarity index 100% rename from wallpapers/gradients/flamingo_bkg5.png rename to programs/desktop/wallpapers/gradients/flamingo_bkg5.png diff --git a/wallpapers/gradients/flamingo_peach.png b/programs/desktop/wallpapers/gradients/flamingo_peach.png similarity index 100% rename from wallpapers/gradients/flamingo_peach.png rename to programs/desktop/wallpapers/gradients/flamingo_peach.png diff --git a/wallpapers/gradients/flamingo_yellow.png b/programs/desktop/wallpapers/gradients/flamingo_yellow.png similarity index 100% rename from wallpapers/gradients/flamingo_yellow.png rename to programs/desktop/wallpapers/gradients/flamingo_yellow.png diff --git a/wallpapers/gradients/green_bkg5.png b/programs/desktop/wallpapers/gradients/green_bkg5.png similarity index 100% rename from wallpapers/gradients/green_bkg5.png rename to programs/desktop/wallpapers/gradients/green_bkg5.png diff --git a/wallpapers/gradients/magenta_blue.png b/programs/desktop/wallpapers/gradients/magenta_blue.png similarity index 100% rename from wallpapers/gradients/magenta_blue.png rename to programs/desktop/wallpapers/gradients/magenta_blue.png diff --git a/wallpapers/gradients/magenta_pink.png b/programs/desktop/wallpapers/gradients/magenta_pink.png similarity index 100% rename from wallpapers/gradients/magenta_pink.png rename to programs/desktop/wallpapers/gradients/magenta_pink.png diff --git a/wallpapers/gradients/peach_bkg5.png b/programs/desktop/wallpapers/gradients/peach_bkg5.png similarity index 100% rename from wallpapers/gradients/peach_bkg5.png rename to programs/desktop/wallpapers/gradients/peach_bkg5.png diff --git a/wallpapers/gradients/red_bkg5.png b/programs/desktop/wallpapers/gradients/red_bkg5.png similarity index 100% rename from wallpapers/gradients/red_bkg5.png rename to programs/desktop/wallpapers/gradients/red_bkg5.png diff --git a/wallpapers/gradients/red_peach.png b/programs/desktop/wallpapers/gradients/red_peach.png similarity index 100% rename from wallpapers/gradients/red_peach.png rename to programs/desktop/wallpapers/gradients/red_peach.png diff --git a/wallpapers/gradients/red_pink.png b/programs/desktop/wallpapers/gradients/red_pink.png similarity index 100% rename from wallpapers/gradients/red_pink.png rename to programs/desktop/wallpapers/gradients/red_pink.png diff --git a/wallpapers/hypr/HYPRCHAN.png b/programs/desktop/wallpapers/hypr/HYPRCHAN.png similarity index 100% rename from wallpapers/hypr/HYPRCHAN.png rename to programs/desktop/wallpapers/hypr/HYPRCHAN.png diff --git a/wallpapers/hypr/Hyprscreeen_of_death.png b/programs/desktop/wallpapers/hypr/Hyprscreeen_of_death.png similarity index 100% rename from wallpapers/hypr/Hyprscreeen_of_death.png rename to programs/desktop/wallpapers/hypr/Hyprscreeen_of_death.png diff --git a/wallpapers/hypr/Hyprscreeen_of_death_mascot.png b/programs/desktop/wallpapers/hypr/Hyprscreeen_of_death_mascot.png similarity index 100% rename from wallpapers/hypr/Hyprscreeen_of_death_mascot.png rename to programs/desktop/wallpapers/hypr/Hyprscreeen_of_death_mascot.png diff --git a/wallpapers/hypr/hyprfog-2.png b/programs/desktop/wallpapers/hypr/hyprfog-2.png similarity index 100% rename from wallpapers/hypr/hyprfog-2.png rename to programs/desktop/wallpapers/hypr/hyprfog-2.png diff --git a/wallpapers/hypr/tetrahedra5.png b/programs/desktop/wallpapers/hypr/tetrahedra5.png similarity index 100% rename from wallpapers/hypr/tetrahedra5.png rename to programs/desktop/wallpapers/hypr/tetrahedra5.png diff --git a/wallpapers/hypr/w4X1t93.png b/programs/desktop/wallpapers/hypr/w4X1t93.png similarity index 100% rename from wallpapers/hypr/w4X1t93.png rename to programs/desktop/wallpapers/hypr/w4X1t93.png diff --git a/wallpapers/landscapes/Clearday.jpg b/programs/desktop/wallpapers/landscapes/Clearday.jpg similarity index 100% rename from wallpapers/landscapes/Clearday.jpg rename to programs/desktop/wallpapers/landscapes/Clearday.jpg diff --git a/wallpapers/landscapes/Clearnight.jpg b/programs/desktop/wallpapers/landscapes/Clearnight.jpg similarity index 100% rename from wallpapers/landscapes/Clearnight.jpg rename to programs/desktop/wallpapers/landscapes/Clearnight.jpg diff --git a/wallpapers/landscapes/Cloudsday.jpg b/programs/desktop/wallpapers/landscapes/Cloudsday.jpg similarity index 100% rename from wallpapers/landscapes/Cloudsday.jpg rename to programs/desktop/wallpapers/landscapes/Cloudsday.jpg diff --git a/wallpapers/landscapes/Cloudsnight.jpg b/programs/desktop/wallpapers/landscapes/Cloudsnight.jpg similarity index 100% rename from wallpapers/landscapes/Cloudsnight.jpg rename to programs/desktop/wallpapers/landscapes/Cloudsnight.jpg diff --git a/wallpapers/landscapes/Rainnight.jpg b/programs/desktop/wallpapers/landscapes/Rainnight.jpg similarity index 100% rename from wallpapers/landscapes/Rainnight.jpg rename to programs/desktop/wallpapers/landscapes/Rainnight.jpg diff --git a/wallpapers/landscapes/evening-sky.png b/programs/desktop/wallpapers/landscapes/evening-sky.png similarity index 100% rename from wallpapers/landscapes/evening-sky.png rename to programs/desktop/wallpapers/landscapes/evening-sky.png diff --git a/wallpapers/landscapes/forrest.png b/programs/desktop/wallpapers/landscapes/forrest.png similarity index 100% rename from wallpapers/landscapes/forrest.png rename to programs/desktop/wallpapers/landscapes/forrest.png diff --git a/wallpapers/landscapes/salty_mountains.png b/programs/desktop/wallpapers/landscapes/salty_mountains.png similarity index 100% rename from wallpapers/landscapes/salty_mountains.png rename to programs/desktop/wallpapers/landscapes/salty_mountains.png diff --git a/wallpapers/landscapes/shaded_landscape.png b/programs/desktop/wallpapers/landscapes/shaded_landscape.png similarity index 100% rename from wallpapers/landscapes/shaded_landscape.png rename to programs/desktop/wallpapers/landscapes/shaded_landscape.png diff --git a/wallpapers/landscapes/tropic_island_day.jpg b/programs/desktop/wallpapers/landscapes/tropic_island_day.jpg similarity index 100% rename from wallpapers/landscapes/tropic_island_day.jpg rename to programs/desktop/wallpapers/landscapes/tropic_island_day.jpg diff --git a/wallpapers/landscapes/tropic_island_evening.jpg b/programs/desktop/wallpapers/landscapes/tropic_island_evening.jpg similarity index 100% rename from wallpapers/landscapes/tropic_island_evening.jpg rename to programs/desktop/wallpapers/landscapes/tropic_island_evening.jpg diff --git a/wallpapers/landscapes/tropic_island_morning.jpg b/programs/desktop/wallpapers/landscapes/tropic_island_morning.jpg similarity index 100% rename from wallpapers/landscapes/tropic_island_morning.jpg rename to programs/desktop/wallpapers/landscapes/tropic_island_morning.jpg diff --git a/wallpapers/landscapes/tropic_island_night.jpg b/programs/desktop/wallpapers/landscapes/tropic_island_night.jpg similarity index 100% rename from wallpapers/landscapes/tropic_island_night.jpg rename to programs/desktop/wallpapers/landscapes/tropic_island_night.jpg diff --git a/wallpapers/landscapes/yosemite.png b/programs/desktop/wallpapers/landscapes/yosemite.png similarity index 100% rename from wallpapers/landscapes/yosemite.png rename to programs/desktop/wallpapers/landscapes/yosemite.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_blue.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_full_blue.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_blue.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_full_blue.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_flamingo.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_full_flamingo.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_flamingo.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_full_flamingo.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_green.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_full_green.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_green.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_full_green.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_lavender.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_full_lavender.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_lavender.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_full_lavender.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_magenta.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_full_magenta.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_magenta.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_full_magenta.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_maroon.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_full_maroon.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_maroon.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_full_maroon.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_peach.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_full_peach.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_peach.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_full_peach.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_pink.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_full_pink.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_pink.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_full_pink.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_red.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_full_red.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_red.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_full_red.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_rosewater.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_full_rosewater.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_rosewater.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_full_rosewater.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_sky.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_full_sky.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_sky.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_full_sky.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_teal.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_full_teal.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_teal.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_full_teal.png diff --git a/wallpapers/mandelbrot/mandelbrot_full_yellow.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_full_yellow.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_full_yellow.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_full_yellow.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_blue.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_blue.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_blue.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_blue.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_flamingo.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_flamingo.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_flamingo.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_flamingo.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_green.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_green.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_green.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_green.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_lavender.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_lavender.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_lavender.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_lavender.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_magenta.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_magenta.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_magenta.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_magenta.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_maroon.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_maroon.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_maroon.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_maroon.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_peach.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_peach.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_peach.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_peach.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_pink.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_pink.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_pink.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_pink.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_red.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_red.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_red.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_red.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_rosewater.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_rosewater.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_rosewater.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_rosewater.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_sky.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_sky.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_sky.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_sky.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_teal.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_teal.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_teal.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_teal.png diff --git a/wallpapers/mandelbrot/mandelbrot_gap_yellow.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_yellow.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_gap_yellow.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_gap_yellow.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_blue.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_side_blue.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_blue.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_side_blue.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_flamingo.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_side_flamingo.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_flamingo.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_side_flamingo.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_green.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_side_green.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_green.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_side_green.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_lavender.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_side_lavender.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_lavender.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_side_lavender.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_magenta.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_side_magenta.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_magenta.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_side_magenta.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_maroon.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_side_maroon.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_maroon.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_side_maroon.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_peach.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_side_peach.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_peach.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_side_peach.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_pink.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_side_pink.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_pink.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_side_pink.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_red.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_side_red.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_red.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_side_red.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_rosewater.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_side_rosewater.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_rosewater.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_side_rosewater.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_sky.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_side_sky.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_sky.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_side_sky.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_teal.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_side_teal.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_teal.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_side_teal.png diff --git a/wallpapers/mandelbrot/mandelbrot_side_yellow.png b/programs/desktop/wallpapers/mandelbrot/mandelbrot_side_yellow.png similarity index 100% rename from wallpapers/mandelbrot/mandelbrot_side_yellow.png rename to programs/desktop/wallpapers/mandelbrot/mandelbrot_side_yellow.png diff --git a/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml b/programs/desktop/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml similarity index 100% rename from wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml rename to programs/desktop/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml diff --git a/wallpapers/minimalistic/.comments/heart.jpg.xml b/programs/desktop/wallpapers/minimalistic/.comments/heart.jpg.xml similarity index 100% rename from wallpapers/minimalistic/.comments/heart.jpg.xml rename to programs/desktop/wallpapers/minimalistic/.comments/heart.jpg.xml diff --git a/wallpapers/minimalistic/black5_unicat.png b/programs/desktop/wallpapers/minimalistic/black5_unicat.png similarity index 100% rename from wallpapers/minimalistic/black5_unicat.png rename to programs/desktop/wallpapers/minimalistic/black5_unicat.png diff --git a/wallpapers/minimalistic/blue-cat.png b/programs/desktop/wallpapers/minimalistic/blue-cat.png similarity index 100% rename from wallpapers/minimalistic/blue-cat.png rename to programs/desktop/wallpapers/minimalistic/blue-cat.png diff --git a/wallpapers/minimalistic/blue_unicat.png b/programs/desktop/wallpapers/minimalistic/blue_unicat.png similarity index 100% rename from wallpapers/minimalistic/blue_unicat.png rename to programs/desktop/wallpapers/minimalistic/blue_unicat.png diff --git a/wallpapers/minimalistic/buttons.png b/programs/desktop/wallpapers/minimalistic/buttons.png similarity index 100% rename from wallpapers/minimalistic/buttons.png rename to programs/desktop/wallpapers/minimalistic/buttons.png diff --git a/wallpapers/minimalistic/catppuccin_triangle.png b/programs/desktop/wallpapers/minimalistic/catppuccin_triangle.png similarity index 100% rename from wallpapers/minimalistic/catppuccin_triangle.png rename to programs/desktop/wallpapers/minimalistic/catppuccin_triangle.png diff --git a/wallpapers/minimalistic/cats.png b/programs/desktop/wallpapers/minimalistic/cats.png similarity index 100% rename from wallpapers/minimalistic/cats.png rename to programs/desktop/wallpapers/minimalistic/cats.png diff --git a/wallpapers/minimalistic/dark-cat-rosewater.png b/programs/desktop/wallpapers/minimalistic/dark-cat-rosewater.png similarity index 100% rename from wallpapers/minimalistic/dark-cat-rosewater.png rename to programs/desktop/wallpapers/minimalistic/dark-cat-rosewater.png diff --git a/wallpapers/minimalistic/dark-cat.png b/programs/desktop/wallpapers/minimalistic/dark-cat.png similarity index 100% rename from wallpapers/minimalistic/dark-cat.png rename to programs/desktop/wallpapers/minimalistic/dark-cat.png diff --git a/wallpapers/minimalistic/darker_unicat.png b/programs/desktop/wallpapers/minimalistic/darker_unicat.png similarity index 100% rename from wallpapers/minimalistic/darker_unicat.png rename to programs/desktop/wallpapers/minimalistic/darker_unicat.png diff --git a/wallpapers/minimalistic/flamingo-cat.png b/programs/desktop/wallpapers/minimalistic/flamingo-cat.png similarity index 100% rename from wallpapers/minimalistic/flamingo-cat.png rename to programs/desktop/wallpapers/minimalistic/flamingo-cat.png diff --git a/wallpapers/minimalistic/flamingo_unicat.png b/programs/desktop/wallpapers/minimalistic/flamingo_unicat.png similarity index 100% rename from wallpapers/minimalistic/flamingo_unicat.png rename to programs/desktop/wallpapers/minimalistic/flamingo_unicat.png diff --git a/wallpapers/minimalistic/gradient-synth-cat.png b/programs/desktop/wallpapers/minimalistic/gradient-synth-cat.png similarity index 100% rename from wallpapers/minimalistic/gradient-synth-cat.png rename to programs/desktop/wallpapers/minimalistic/gradient-synth-cat.png diff --git a/wallpapers/minimalistic/green-cat.png b/programs/desktop/wallpapers/minimalistic/green-cat.png similarity index 100% rename from wallpapers/minimalistic/green-cat.png rename to programs/desktop/wallpapers/minimalistic/green-cat.png diff --git a/wallpapers/minimalistic/hashtags-black.png b/programs/desktop/wallpapers/minimalistic/hashtags-black.png similarity index 100% rename from wallpapers/minimalistic/hashtags-black.png rename to programs/desktop/wallpapers/minimalistic/hashtags-black.png diff --git a/wallpapers/minimalistic/hashtags-new.png b/programs/desktop/wallpapers/minimalistic/hashtags-new.png similarity index 100% rename from wallpapers/minimalistic/hashtags-new.png rename to programs/desktop/wallpapers/minimalistic/hashtags-new.png diff --git a/wallpapers/minimalistic/heart.jpg b/programs/desktop/wallpapers/minimalistic/heart.jpg similarity index 100% rename from wallpapers/minimalistic/heart.jpg rename to programs/desktop/wallpapers/minimalistic/heart.jpg diff --git a/wallpapers/minimalistic/hearts.png b/programs/desktop/wallpapers/minimalistic/hearts.png similarity index 100% rename from wallpapers/minimalistic/hearts.png rename to programs/desktop/wallpapers/minimalistic/hearts.png diff --git a/wallpapers/minimalistic/lavender-cat.png b/programs/desktop/wallpapers/minimalistic/lavender-cat.png similarity index 100% rename from wallpapers/minimalistic/lavender-cat.png rename to programs/desktop/wallpapers/minimalistic/lavender-cat.png diff --git a/wallpapers/minimalistic/list-aligned-left.png b/programs/desktop/wallpapers/minimalistic/list-aligned-left.png similarity index 100% rename from wallpapers/minimalistic/list-aligned-left.png rename to programs/desktop/wallpapers/minimalistic/list-aligned-left.png diff --git a/wallpapers/minimalistic/list-aligned-right.png b/programs/desktop/wallpapers/minimalistic/list-aligned-right.png similarity index 100% rename from wallpapers/minimalistic/list-aligned-right.png rename to programs/desktop/wallpapers/minimalistic/list-aligned-right.png diff --git a/wallpapers/minimalistic/list-horizontal.png b/programs/desktop/wallpapers/minimalistic/list-horizontal.png similarity index 100% rename from wallpapers/minimalistic/list-horizontal.png rename to programs/desktop/wallpapers/minimalistic/list-horizontal.png diff --git a/wallpapers/minimalistic/magenta-cat.png b/programs/desktop/wallpapers/minimalistic/magenta-cat.png similarity index 100% rename from wallpapers/minimalistic/magenta-cat.png rename to programs/desktop/wallpapers/minimalistic/magenta-cat.png diff --git a/wallpapers/minimalistic/maroon-cat.png b/programs/desktop/wallpapers/minimalistic/maroon-cat.png similarity index 100% rename from wallpapers/minimalistic/maroon-cat.png rename to programs/desktop/wallpapers/minimalistic/maroon-cat.png diff --git a/wallpapers/minimalistic/peach-cat.png b/programs/desktop/wallpapers/minimalistic/peach-cat.png similarity index 100% rename from wallpapers/minimalistic/peach-cat.png rename to programs/desktop/wallpapers/minimalistic/peach-cat.png diff --git a/wallpapers/minimalistic/peach_unicat.png b/programs/desktop/wallpapers/minimalistic/peach_unicat.png similarity index 100% rename from wallpapers/minimalistic/peach_unicat.png rename to programs/desktop/wallpapers/minimalistic/peach_unicat.png diff --git a/wallpapers/minimalistic/pink-cat.png b/programs/desktop/wallpapers/minimalistic/pink-cat.png similarity index 100% rename from wallpapers/minimalistic/pink-cat.png rename to programs/desktop/wallpapers/minimalistic/pink-cat.png diff --git a/wallpapers/minimalistic/pink_unicat.png b/programs/desktop/wallpapers/minimalistic/pink_unicat.png similarity index 100% rename from wallpapers/minimalistic/pink_unicat.png rename to programs/desktop/wallpapers/minimalistic/pink_unicat.png diff --git a/wallpapers/minimalistic/red-cat.png b/programs/desktop/wallpapers/minimalistic/red-cat.png similarity index 100% rename from wallpapers/minimalistic/red-cat.png rename to programs/desktop/wallpapers/minimalistic/red-cat.png diff --git a/wallpapers/minimalistic/red_unicat.png b/programs/desktop/wallpapers/minimalistic/red_unicat.png similarity index 100% rename from wallpapers/minimalistic/red_unicat.png rename to programs/desktop/wallpapers/minimalistic/red_unicat.png diff --git a/wallpapers/minimalistic/romb.png b/programs/desktop/wallpapers/minimalistic/romb.png similarity index 100% rename from wallpapers/minimalistic/romb.png rename to programs/desktop/wallpapers/minimalistic/romb.png diff --git a/wallpapers/minimalistic/rosewater-cat.png b/programs/desktop/wallpapers/minimalistic/rosewater-cat.png similarity index 100% rename from wallpapers/minimalistic/rosewater-cat.png rename to programs/desktop/wallpapers/minimalistic/rosewater-cat.png diff --git a/wallpapers/minimalistic/sky-cat.png b/programs/desktop/wallpapers/minimalistic/sky-cat.png similarity index 100% rename from wallpapers/minimalistic/sky-cat.png rename to programs/desktop/wallpapers/minimalistic/sky-cat.png diff --git a/wallpapers/minimalistic/sports.png b/programs/desktop/wallpapers/minimalistic/sports.png similarity index 100% rename from wallpapers/minimalistic/sports.png rename to programs/desktop/wallpapers/minimalistic/sports.png diff --git a/wallpapers/minimalistic/teal-cat.png b/programs/desktop/wallpapers/minimalistic/teal-cat.png similarity index 100% rename from wallpapers/minimalistic/teal-cat.png rename to programs/desktop/wallpapers/minimalistic/teal-cat.png diff --git a/wallpapers/minimalistic/teal_unicat.png b/programs/desktop/wallpapers/minimalistic/teal_unicat.png similarity index 100% rename from wallpapers/minimalistic/teal_unicat.png rename to programs/desktop/wallpapers/minimalistic/teal_unicat.png diff --git a/wallpapers/minimalistic/tetris.png b/programs/desktop/wallpapers/minimalistic/tetris.png similarity index 100% rename from wallpapers/minimalistic/tetris.png rename to programs/desktop/wallpapers/minimalistic/tetris.png diff --git a/wallpapers/minimalistic/unicat.png b/programs/desktop/wallpapers/minimalistic/unicat.png similarity index 100% rename from wallpapers/minimalistic/unicat.png rename to programs/desktop/wallpapers/minimalistic/unicat.png diff --git a/wallpapers/minimalistic/yellow-cat.png b/programs/desktop/wallpapers/minimalistic/yellow-cat.png similarity index 100% rename from wallpapers/minimalistic/yellow-cat.png rename to programs/desktop/wallpapers/minimalistic/yellow-cat.png diff --git a/wallpapers/misc/cat-sound.png b/programs/desktop/wallpapers/misc/cat-sound.png similarity index 100% rename from wallpapers/misc/cat-sound.png rename to programs/desktop/wallpapers/misc/cat-sound.png diff --git a/wallpapers/misc/cat_bunnies.png b/programs/desktop/wallpapers/misc/cat_bunnies.png similarity index 100% rename from wallpapers/misc/cat_bunnies.png rename to programs/desktop/wallpapers/misc/cat_bunnies.png diff --git a/wallpapers/misc/cat_colors.png b/programs/desktop/wallpapers/misc/cat_colors.png similarity index 100% rename from wallpapers/misc/cat_colors.png rename to programs/desktop/wallpapers/misc/cat_colors.png diff --git a/wallpapers/misc/cat_pacman.png b/programs/desktop/wallpapers/misc/cat_pacman.png similarity index 100% rename from wallpapers/misc/cat_pacman.png rename to programs/desktop/wallpapers/misc/cat_pacman.png diff --git a/wallpapers/misc/comfy-home.png b/programs/desktop/wallpapers/misc/comfy-home.png similarity index 100% rename from wallpapers/misc/comfy-home.png rename to programs/desktop/wallpapers/misc/comfy-home.png diff --git a/wallpapers/misc/doggocat.png b/programs/desktop/wallpapers/misc/doggocat.png similarity index 100% rename from wallpapers/misc/doggocat.png rename to programs/desktop/wallpapers/misc/doggocat.png diff --git a/wallpapers/misc/feet-on-the-dashboard.png b/programs/desktop/wallpapers/misc/feet-on-the-dashboard.png similarity index 100% rename from wallpapers/misc/feet-on-the-dashboard.png rename to programs/desktop/wallpapers/misc/feet-on-the-dashboard.png diff --git a/wallpapers/misc/lonely-fish.png b/programs/desktop/wallpapers/misc/lonely-fish.png similarity index 100% rename from wallpapers/misc/lonely-fish.png rename to programs/desktop/wallpapers/misc/lonely-fish.png diff --git a/wallpapers/misc/rainbow-cat.png b/programs/desktop/wallpapers/misc/rainbow-cat.png similarity index 100% rename from wallpapers/misc/rainbow-cat.png rename to programs/desktop/wallpapers/misc/rainbow-cat.png diff --git a/wallpapers/misc/rainbow.png b/programs/desktop/wallpapers/misc/rainbow.png similarity index 100% rename from wallpapers/misc/rainbow.png rename to programs/desktop/wallpapers/misc/rainbow.png diff --git a/wallpapers/misc/virus.png b/programs/desktop/wallpapers/misc/virus.png similarity index 100% rename from wallpapers/misc/virus.png rename to programs/desktop/wallpapers/misc/virus.png diff --git a/wallpapers/misc/windows-error.jpg b/programs/desktop/wallpapers/misc/windows-error.jpg similarity index 100% rename from wallpapers/misc/windows-error.jpg rename to programs/desktop/wallpapers/misc/windows-error.jpg diff --git a/wallpapers/os/.comments/void-1920x1080.png.xml b/programs/desktop/wallpapers/os/.comments/void-1920x1080.png.xml similarity index 100% rename from wallpapers/os/.comments/void-1920x1080.png.xml rename to programs/desktop/wallpapers/os/.comments/void-1920x1080.png.xml diff --git a/wallpapers/os/alpine-black-4k.png b/programs/desktop/wallpapers/os/alpine-black-4k.png similarity index 100% rename from wallpapers/os/alpine-black-4k.png rename to programs/desktop/wallpapers/os/alpine-black-4k.png diff --git a/wallpapers/os/alpine-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/alpine-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/alpine-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/alpine-magenta-blue-1920x1080.png diff --git a/wallpapers/os/alpine-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/alpine-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/alpine-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/alpine-magenta-pink-1920x1080.png diff --git a/wallpapers/os/android-black-4k.png b/programs/desktop/wallpapers/os/android-black-4k.png similarity index 100% rename from wallpapers/os/android-black-4k.png rename to programs/desktop/wallpapers/os/android-black-4k.png diff --git a/wallpapers/os/android-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/android-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/android-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/android-magenta-blue-1920x1080.png diff --git a/wallpapers/os/android-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/android-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/android-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/android-magenta-pink-1920x1080.png diff --git a/wallpapers/os/apple-black-4k.png b/programs/desktop/wallpapers/os/apple-black-4k.png similarity index 100% rename from wallpapers/os/apple-black-4k.png rename to programs/desktop/wallpapers/os/apple-black-4k.png diff --git a/wallpapers/os/apple-blue-black-1920x1080.png b/programs/desktop/wallpapers/os/apple-blue-black-1920x1080.png similarity index 100% rename from wallpapers/os/apple-blue-black-1920x1080.png rename to programs/desktop/wallpapers/os/apple-blue-black-1920x1080.png diff --git a/wallpapers/os/apple-colors-big-4k.png b/programs/desktop/wallpapers/os/apple-colors-big-4k.png similarity index 100% rename from wallpapers/os/apple-colors-big-4k.png rename to programs/desktop/wallpapers/os/apple-colors-big-4k.png diff --git a/wallpapers/os/apple-colors-small-4k.png b/programs/desktop/wallpapers/os/apple-colors-small-4k.png similarity index 100% rename from wallpapers/os/apple-colors-small-4k.png rename to programs/desktop/wallpapers/os/apple-colors-small-4k.png diff --git a/wallpapers/os/apple-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/apple-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/apple-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/apple-magenta-blue-1920x1080.png diff --git a/wallpapers/os/apple-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/apple-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/apple-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/apple-magenta-pink-1920x1080.png diff --git a/wallpapers/os/arch-black-4k.png b/programs/desktop/wallpapers/os/arch-black-4k.png similarity index 100% rename from wallpapers/os/arch-black-4k.png rename to programs/desktop/wallpapers/os/arch-black-4k.png diff --git a/wallpapers/os/arch-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/arch-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/arch-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/arch-magenta-blue-1920x1080.png diff --git a/wallpapers/os/arch-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/arch-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/arch-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/arch-magenta-pink-1920x1080.png diff --git a/wallpapers/os/arch-rainbow-1920x1080.png b/programs/desktop/wallpapers/os/arch-rainbow-1920x1080.png similarity index 100% rename from wallpapers/os/arch-rainbow-1920x1080.png rename to programs/desktop/wallpapers/os/arch-rainbow-1920x1080.png diff --git a/wallpapers/os/arco-black-4k.png b/programs/desktop/wallpapers/os/arco-black-4k.png similarity index 100% rename from wallpapers/os/arco-black-4k.png rename to programs/desktop/wallpapers/os/arco-black-4k.png diff --git a/wallpapers/os/arco-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/arco-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/arco-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/arco-magenta-blue-1920x1080.png diff --git a/wallpapers/os/arco-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/arco-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/arco-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/arco-magenta-pink-1920x1080.png diff --git a/wallpapers/os/artix-black-4k.png b/programs/desktop/wallpapers/os/artix-black-4k.png similarity index 100% rename from wallpapers/os/artix-black-4k.png rename to programs/desktop/wallpapers/os/artix-black-4k.png diff --git a/wallpapers/os/artix-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/artix-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/artix-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/artix-magenta-blue-1920x1080.png diff --git a/wallpapers/os/artix-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/artix-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/artix-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/artix-magenta-pink-1920x1080.png diff --git a/wallpapers/os/centos-black-4k.png b/programs/desktop/wallpapers/os/centos-black-4k.png similarity index 100% rename from wallpapers/os/centos-black-4k.png rename to programs/desktop/wallpapers/os/centos-black-4k.png diff --git a/wallpapers/os/crystal-linux-4k.png b/programs/desktop/wallpapers/os/crystal-linux-4k.png similarity index 100% rename from wallpapers/os/crystal-linux-4k.png rename to programs/desktop/wallpapers/os/crystal-linux-4k.png diff --git a/wallpapers/os/crystal-linux-magenta_blue1920x1080.png b/programs/desktop/wallpapers/os/crystal-linux-magenta_blue1920x1080.png similarity index 100% rename from wallpapers/os/crystal-linux-magenta_blue1920x1080.png rename to programs/desktop/wallpapers/os/crystal-linux-magenta_blue1920x1080.png diff --git a/wallpapers/os/crystal-linux-magenta_pink1920x1080.png b/programs/desktop/wallpapers/os/crystal-linux-magenta_pink1920x1080.png similarity index 100% rename from wallpapers/os/crystal-linux-magenta_pink1920x1080.png rename to programs/desktop/wallpapers/os/crystal-linux-magenta_pink1920x1080.png diff --git a/wallpapers/os/debian-black-4k.png b/programs/desktop/wallpapers/os/debian-black-4k.png similarity index 100% rename from wallpapers/os/debian-black-4k.png rename to programs/desktop/wallpapers/os/debian-black-4k.png diff --git a/wallpapers/os/debian-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/debian-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/debian-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/debian-magenta-blue-1920x1080.png diff --git a/wallpapers/os/debian-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/debian-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/debian-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/debian-magenta-pink-1920x1080.png diff --git a/wallpapers/os/deepin-black-4k.png b/programs/desktop/wallpapers/os/deepin-black-4k.png similarity index 100% rename from wallpapers/os/deepin-black-4k.png rename to programs/desktop/wallpapers/os/deepin-black-4k.png diff --git a/wallpapers/os/deepin-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/deepin-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/deepin-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/deepin-magenta-blue-1920x1080.png diff --git a/wallpapers/os/deepin-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/deepin-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/deepin-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/deepin-magenta-pink-1920x1080.png diff --git a/wallpapers/os/elementary-black-4k.png b/programs/desktop/wallpapers/os/elementary-black-4k.png similarity index 100% rename from wallpapers/os/elementary-black-4k.png rename to programs/desktop/wallpapers/os/elementary-black-4k.png diff --git a/wallpapers/os/elementary-sky-lavender-ascii.png b/programs/desktop/wallpapers/os/elementary-sky-lavender-ascii.png similarity index 100% rename from wallpapers/os/elementary-sky-lavender-ascii.png rename to programs/desktop/wallpapers/os/elementary-sky-lavender-ascii.png diff --git a/wallpapers/os/endeavour-black-4k.png b/programs/desktop/wallpapers/os/endeavour-black-4k.png similarity index 100% rename from wallpapers/os/endeavour-black-4k.png rename to programs/desktop/wallpapers/os/endeavour-black-4k.png diff --git a/wallpapers/os/endeavour-blue-black-1920x1080.png b/programs/desktop/wallpapers/os/endeavour-blue-black-1920x1080.png similarity index 100% rename from wallpapers/os/endeavour-blue-black-1920x1080.png rename to programs/desktop/wallpapers/os/endeavour-blue-black-1920x1080.png diff --git a/wallpapers/os/endeavour-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/endeavour-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/endeavour-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/endeavour-magenta-pink-1920x1080.png diff --git a/wallpapers/os/fedora-black-4k.png b/programs/desktop/wallpapers/os/fedora-black-4k.png similarity index 100% rename from wallpapers/os/fedora-black-4k.png rename to programs/desktop/wallpapers/os/fedora-black-4k.png diff --git a/wallpapers/os/fedora-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/fedora-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/fedora-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/fedora-magenta-blue-1920x1080.png diff --git a/wallpapers/os/fedora-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/fedora-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/fedora-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/fedora-magenta-pink-1920x1080.png diff --git a/wallpapers/os/freebsd-black-4k.png b/programs/desktop/wallpapers/os/freebsd-black-4k.png similarity index 100% rename from wallpapers/os/freebsd-black-4k.png rename to programs/desktop/wallpapers/os/freebsd-black-4k.png diff --git a/wallpapers/os/freebsd-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/freebsd-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/freebsd-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/freebsd-magenta-blue-1920x1080.png diff --git a/wallpapers/os/freebsd-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/freebsd-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/freebsd-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/freebsd-magenta-pink-1920x1080.png diff --git a/wallpapers/os/garuda-black-4k.png b/programs/desktop/wallpapers/os/garuda-black-4k.png similarity index 100% rename from wallpapers/os/garuda-black-4k.png rename to programs/desktop/wallpapers/os/garuda-black-4k.png diff --git a/wallpapers/os/gentoo-black-4k.png b/programs/desktop/wallpapers/os/gentoo-black-4k.png similarity index 100% rename from wallpapers/os/gentoo-black-4k.png rename to programs/desktop/wallpapers/os/gentoo-black-4k.png diff --git a/wallpapers/os/manjaro-black-4k.png b/programs/desktop/wallpapers/os/manjaro-black-4k.png similarity index 100% rename from wallpapers/os/manjaro-black-4k.png rename to programs/desktop/wallpapers/os/manjaro-black-4k.png diff --git a/wallpapers/os/manjaro-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/manjaro-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/manjaro-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/manjaro-magenta-blue-1920x1080.png diff --git a/wallpapers/os/manjaro-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/manjaro-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/manjaro-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/manjaro-magenta-pink-1920x1080.png diff --git a/wallpapers/os/mint-black-4k.png b/programs/desktop/wallpapers/os/mint-black-4k.png similarity index 100% rename from wallpapers/os/mint-black-4k.png rename to programs/desktop/wallpapers/os/mint-black-4k.png diff --git a/wallpapers/os/mint-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/mint-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/mint-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/mint-magenta-blue-1920x1080.png diff --git a/wallpapers/os/mint-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/mint-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/mint-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/mint-magenta-pink-1920x1080.png diff --git a/wallpapers/os/mxlinux-black-4k.png b/programs/desktop/wallpapers/os/mxlinux-black-4k.png similarity index 100% rename from wallpapers/os/mxlinux-black-4k.png rename to programs/desktop/wallpapers/os/mxlinux-black-4k.png diff --git a/wallpapers/os/mxlinux-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/mxlinux-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/mxlinux-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/mxlinux-magenta-blue-1920x1080.png diff --git a/wallpapers/os/mxlinux-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/mxlinux-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/mxlinux-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/mxlinux-magenta-pink-1920x1080.png diff --git a/wallpapers/os/nix-black-4k.png b/programs/desktop/wallpapers/os/nix-black-4k.png similarity index 100% rename from wallpapers/os/nix-black-4k.png rename to programs/desktop/wallpapers/os/nix-black-4k.png diff --git a/wallpapers/os/nix-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/nix-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/nix-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/nix-magenta-blue-1920x1080.png diff --git a/wallpapers/os/nix-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/nix-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/nix-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/nix-magenta-pink-1920x1080.png diff --git a/wallpapers/os/opensuse-black-4k.png b/programs/desktop/wallpapers/os/opensuse-black-4k.png similarity index 100% rename from wallpapers/os/opensuse-black-4k.png rename to programs/desktop/wallpapers/os/opensuse-black-4k.png diff --git a/wallpapers/os/opensuse-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/opensuse-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/opensuse-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/opensuse-magenta-blue-1920x1080.png diff --git a/wallpapers/os/opensuse-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/opensuse-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/opensuse-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/opensuse-magenta-pink-1920x1080.png diff --git a/wallpapers/os/pop-black-4k.png b/programs/desktop/wallpapers/os/pop-black-4k.png similarity index 100% rename from wallpapers/os/pop-black-4k.png rename to programs/desktop/wallpapers/os/pop-black-4k.png diff --git a/wallpapers/os/pop-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/pop-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/pop-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/pop-magenta-blue-1920x1080.png diff --git a/wallpapers/os/pop-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/pop-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/pop-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/pop-magenta-pink-1920x1080.png diff --git a/wallpapers/os/raspberry-black-4k.png b/programs/desktop/wallpapers/os/raspberry-black-4k.png similarity index 100% rename from wallpapers/os/raspberry-black-4k.png rename to programs/desktop/wallpapers/os/raspberry-black-4k.png diff --git a/wallpapers/os/raspberry-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/raspberry-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/raspberry-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/raspberry-magenta-blue-1920x1080.png diff --git a/wallpapers/os/raspberry-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/raspberry-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/raspberry-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/raspberry-magenta-pink-1920x1080.png diff --git a/wallpapers/os/solus-black-4k.png b/programs/desktop/wallpapers/os/solus-black-4k.png similarity index 100% rename from wallpapers/os/solus-black-4k.png rename to programs/desktop/wallpapers/os/solus-black-4k.png diff --git a/wallpapers/os/solus-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/solus-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/solus-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/solus-magenta-blue-1920x1080.png diff --git a/wallpapers/os/solus-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/solus-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/solus-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/solus-magenta-pink-1920x1080.png diff --git a/wallpapers/os/tux-black-4k.png b/programs/desktop/wallpapers/os/tux-black-4k.png similarity index 100% rename from wallpapers/os/tux-black-4k.png rename to programs/desktop/wallpapers/os/tux-black-4k.png diff --git a/wallpapers/os/tux-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/tux-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/tux-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/tux-magenta-blue-1920x1080.png diff --git a/wallpapers/os/tux-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/tux-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/tux-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/tux-magenta-pink-1920x1080.png diff --git a/wallpapers/os/ubuntu-black-4k.png b/programs/desktop/wallpapers/os/ubuntu-black-4k.png similarity index 100% rename from wallpapers/os/ubuntu-black-4k.png rename to programs/desktop/wallpapers/os/ubuntu-black-4k.png diff --git a/wallpapers/os/ubuntu-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/ubuntu-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/ubuntu-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/ubuntu-magenta-blue-1920x1080.png diff --git a/wallpapers/os/ubuntu-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/ubuntu-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/ubuntu-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/ubuntu-magenta-pink-1920x1080.png diff --git a/wallpapers/os/various-arch-1-4k.png b/programs/desktop/wallpapers/os/various-arch-1-4k.png similarity index 100% rename from wallpapers/os/various-arch-1-4k.png rename to programs/desktop/wallpapers/os/various-arch-1-4k.png diff --git a/wallpapers/os/various-arch-2-4k.png b/programs/desktop/wallpapers/os/various-arch-2-4k.png similarity index 100% rename from wallpapers/os/various-arch-2-4k.png rename to programs/desktop/wallpapers/os/various-arch-2-4k.png diff --git a/wallpapers/os/various-os-1-4k.png b/programs/desktop/wallpapers/os/various-os-1-4k.png similarity index 100% rename from wallpapers/os/various-os-1-4k.png rename to programs/desktop/wallpapers/os/various-os-1-4k.png diff --git a/wallpapers/os/various-os-2-4k.png b/programs/desktop/wallpapers/os/various-os-2-4k.png similarity index 100% rename from wallpapers/os/various-os-2-4k.png rename to programs/desktop/wallpapers/os/various-os-2-4k.png diff --git a/wallpapers/os/various-os-3-4k.png b/programs/desktop/wallpapers/os/various-os-3-4k.png similarity index 100% rename from wallpapers/os/various-os-3-4k.png rename to programs/desktop/wallpapers/os/various-os-3-4k.png diff --git a/wallpapers/os/void-1920x1080.png b/programs/desktop/wallpapers/os/void-1920x1080.png similarity index 100% rename from wallpapers/os/void-1920x1080.png rename to programs/desktop/wallpapers/os/void-1920x1080.png diff --git a/wallpapers/os/void-black-4k.png b/programs/desktop/wallpapers/os/void-black-4k.png similarity index 100% rename from wallpapers/os/void-black-4k.png rename to programs/desktop/wallpapers/os/void-black-4k.png diff --git a/wallpapers/os/void-black3-1920x1080.png b/programs/desktop/wallpapers/os/void-black3-1920x1080.png similarity index 100% rename from wallpapers/os/void-black3-1920x1080.png rename to programs/desktop/wallpapers/os/void-black3-1920x1080.png diff --git a/wallpapers/os/void-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/void-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/void-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/void-magenta-blue-1920x1080.png diff --git a/wallpapers/os/void-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/void-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/void-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/void-magenta-pink-1920x1080.png diff --git a/wallpapers/os/windows-black.png b/programs/desktop/wallpapers/os/windows-black.png similarity index 100% rename from wallpapers/os/windows-black.png rename to programs/desktop/wallpapers/os/windows-black.png diff --git a/wallpapers/os/windows-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/windows-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/windows-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/windows-magenta-blue-1920x1080.png diff --git a/wallpapers/os/windows-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/windows-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/windows-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/windows-magenta-pink-1920x1080.png diff --git a/wallpapers/os/zorin-black-4k.png b/programs/desktop/wallpapers/os/zorin-black-4k.png similarity index 100% rename from wallpapers/os/zorin-black-4k.png rename to programs/desktop/wallpapers/os/zorin-black-4k.png diff --git a/wallpapers/os/zorin-magenta-blue-1920x1080.png b/programs/desktop/wallpapers/os/zorin-magenta-blue-1920x1080.png similarity index 100% rename from wallpapers/os/zorin-magenta-blue-1920x1080.png rename to programs/desktop/wallpapers/os/zorin-magenta-blue-1920x1080.png diff --git a/wallpapers/os/zorin-magenta-pink-1920x1080.png b/programs/desktop/wallpapers/os/zorin-magenta-pink-1920x1080.png similarity index 100% rename from wallpapers/os/zorin-magenta-pink-1920x1080.png rename to programs/desktop/wallpapers/os/zorin-magenta-pink-1920x1080.png diff --git a/wallpapers/patterns/emojis.png b/programs/desktop/wallpapers/patterns/emojis.png similarity index 100% rename from wallpapers/patterns/emojis.png rename to programs/desktop/wallpapers/patterns/emojis.png diff --git a/wallpapers/patterns/line_icons.png b/programs/desktop/wallpapers/patterns/line_icons.png similarity index 100% rename from wallpapers/patterns/line_icons.png rename to programs/desktop/wallpapers/patterns/line_icons.png diff --git a/wallpapers/science/2422830.jpg b/programs/desktop/wallpapers/science/2422830.jpg similarity index 100% rename from wallpapers/science/2422830.jpg rename to programs/desktop/wallpapers/science/2422830.jpg diff --git a/wallpapers/science/5636374.png b/programs/desktop/wallpapers/science/5636374.png similarity index 100% rename from wallpapers/science/5636374.png rename to programs/desktop/wallpapers/science/5636374.png diff --git a/wallpapers/science/JET interior with superimposed plasma 2560px.jpg b/programs/desktop/wallpapers/science/JET interior with superimposed plasma 2560px.jpg similarity index 100% rename from wallpapers/science/JET interior with superimposed plasma 2560px.jpg rename to programs/desktop/wallpapers/science/JET interior with superimposed plasma 2560px.jpg diff --git a/wallpapers/science/JET plasmas.png b/programs/desktop/wallpapers/science/JET plasmas.png similarity index 100% rename from wallpapers/science/JET plasmas.png rename to programs/desktop/wallpapers/science/JET plasmas.png diff --git a/wallpapers/science/JET wallpaper.jpg b/programs/desktop/wallpapers/science/JET wallpaper.jpg similarity index 100% rename from wallpapers/science/JET wallpaper.jpg rename to programs/desktop/wallpapers/science/JET wallpaper.jpg diff --git a/wallpapers/science/LHC Science.jpg b/programs/desktop/wallpapers/science/LHC Science.jpg similarity index 100% rename from wallpapers/science/LHC Science.jpg rename to programs/desktop/wallpapers/science/LHC Science.jpg diff --git a/wallpapers/science/MAST wallpaper.png b/programs/desktop/wallpapers/science/MAST wallpaper.png similarity index 100% rename from wallpapers/science/MAST wallpaper.png rename to programs/desktop/wallpapers/science/MAST wallpaper.png diff --git a/wallpapers/science/MAST-U 16x9.jpg b/programs/desktop/wallpapers/science/MAST-U 16x9.jpg similarity index 100% rename from wallpapers/science/MAST-U 16x9.jpg rename to programs/desktop/wallpapers/science/MAST-U 16x9.jpg diff --git a/wallpapers/science/chang_hyun_vvts6_1a.jpg b/programs/desktop/wallpapers/science/chang_hyun_vvts6_1a.jpg similarity index 100% rename from wallpapers/science/chang_hyun_vvts6_1a.jpg rename to programs/desktop/wallpapers/science/chang_hyun_vvts6_1a.jpg diff --git a/wallpapers/science/jet_glass_side_auto_pass_latest.png b/programs/desktop/wallpapers/science/jet_glass_side_auto_pass_latest.png similarity index 100% rename from wallpapers/science/jet_glass_side_auto_pass_latest.png rename to programs/desktop/wallpapers/science/jet_glass_side_auto_pass_latest.png diff --git a/wallpapers/science/jet_glass_side_s100_pass_latest.png b/programs/desktop/wallpapers/science/jet_glass_side_s100_pass_latest.png similarity index 100% rename from wallpapers/science/jet_glass_side_s100_pass_latest.png rename to programs/desktop/wallpapers/science/jet_glass_side_s100_pass_latest.png diff --git a/wallpapers/science/jet_glass_side_s250_pass_latest.png b/programs/desktop/wallpapers/science/jet_glass_side_s250_pass_latest.png similarity index 100% rename from wallpapers/science/jet_glass_side_s250_pass_latest.png rename to programs/desktop/wallpapers/science/jet_glass_side_s250_pass_latest.png diff --git a/wallpapers/science/jet_glass_side_s50_pass_latest.png b/programs/desktop/wallpapers/science/jet_glass_side_s50_pass_latest.png similarity index 100% rename from wallpapers/science/jet_glass_side_s50_pass_latest.png rename to programs/desktop/wallpapers/science/jet_glass_side_s50_pass_latest.png diff --git a/wallpapers/science/jet_glass_top_auto_pass_latest.png b/programs/desktop/wallpapers/science/jet_glass_top_auto_pass_latest.png similarity index 100% rename from wallpapers/science/jet_glass_top_auto_pass_latest.png rename to programs/desktop/wallpapers/science/jet_glass_top_auto_pass_latest.png diff --git a/wallpapers/science/jet_glass_top_s100_pass_latest.png b/programs/desktop/wallpapers/science/jet_glass_top_s100_pass_latest.png similarity index 100% rename from wallpapers/science/jet_glass_top_s100_pass_latest.png rename to programs/desktop/wallpapers/science/jet_glass_top_s100_pass_latest.png diff --git a/wallpapers/science/jet_glass_top_s250_pass_latest.png b/programs/desktop/wallpapers/science/jet_glass_top_s250_pass_latest.png similarity index 100% rename from wallpapers/science/jet_glass_top_s250_pass_latest.png rename to programs/desktop/wallpapers/science/jet_glass_top_s250_pass_latest.png diff --git a/wallpapers/science/jet_glass_top_s50_pass_latest.png b/programs/desktop/wallpapers/science/jet_glass_top_s50_pass_latest.png similarity index 100% rename from wallpapers/science/jet_glass_top_s50_pass_latest.png rename to programs/desktop/wallpapers/science/jet_glass_top_s50_pass_latest.png diff --git a/wallpapers/science/luca_z_56_iter_i_small.jpg b/programs/desktop/wallpapers/science/luca_z_56_iter_i_small.jpg similarity index 100% rename from wallpapers/science/luca_z_56_iter_i_small.jpg rename to programs/desktop/wallpapers/science/luca_z_56_iter_i_small.jpg diff --git a/wallpapers/science/mastu_glass_side_s3.png b/programs/desktop/wallpapers/science/mastu_glass_side_s3.png similarity index 100% rename from wallpapers/science/mastu_glass_side_s3.png rename to programs/desktop/wallpapers/science/mastu_glass_side_s3.png diff --git a/wallpapers/science/oct5-selfie.jpg b/programs/desktop/wallpapers/science/oct5-selfie.jpg similarity index 100% rename from wallpapers/science/oct5-selfie.jpg rename to programs/desktop/wallpapers/science/oct5-selfie.jpg diff --git a/wallpapers/science/pit_02-07-2021_small.jpg b/programs/desktop/wallpapers/science/pit_02-07-2021_small.jpg similarity index 100% rename from wallpapers/science/pit_02-07-2021_small.jpg rename to programs/desktop/wallpapers/science/pit_02-07-2021_small.jpg diff --git a/wallpapers/science/vsm6_almost_there_1_small.jpg b/programs/desktop/wallpapers/science/vsm6_almost_there_1_small.jpg similarity index 100% rename from wallpapers/science/vsm6_almost_there_1_small.jpg rename to programs/desktop/wallpapers/science/vsm6_almost_there_1_small.jpg diff --git a/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg b/programs/desktop/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg similarity index 100% rename from wallpapers/science/vvs6_from_chang-hyun_1_small.jpg rename to programs/desktop/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg diff --git a/wallpapers/solids/bkg1.png b/programs/desktop/wallpapers/solids/bkg1.png similarity index 100% rename from wallpapers/solids/bkg1.png rename to programs/desktop/wallpapers/solids/bkg1.png diff --git a/wallpapers/solids/bkg2.png b/programs/desktop/wallpapers/solids/bkg2.png similarity index 100% rename from wallpapers/solids/bkg2.png rename to programs/desktop/wallpapers/solids/bkg2.png diff --git a/wallpapers/solids/bkg3.png b/programs/desktop/wallpapers/solids/bkg3.png similarity index 100% rename from wallpapers/solids/bkg3.png rename to programs/desktop/wallpapers/solids/bkg3.png diff --git a/wallpapers/solids/bkg4.png b/programs/desktop/wallpapers/solids/bkg4.png similarity index 100% rename from wallpapers/solids/bkg4.png rename to programs/desktop/wallpapers/solids/bkg4.png diff --git a/wallpapers/solids/bkg5.png b/programs/desktop/wallpapers/solids/bkg5.png similarity index 100% rename from wallpapers/solids/bkg5.png rename to programs/desktop/wallpapers/solids/bkg5.png diff --git a/wallpapers/solids/blue.png b/programs/desktop/wallpapers/solids/blue.png similarity index 100% rename from wallpapers/solids/blue.png rename to programs/desktop/wallpapers/solids/blue.png diff --git a/wallpapers/solids/cyan.png b/programs/desktop/wallpapers/solids/cyan.png similarity index 100% rename from wallpapers/solids/cyan.png rename to programs/desktop/wallpapers/solids/cyan.png diff --git a/wallpapers/solids/flamingo.png b/programs/desktop/wallpapers/solids/flamingo.png similarity index 100% rename from wallpapers/solids/flamingo.png rename to programs/desktop/wallpapers/solids/flamingo.png diff --git a/wallpapers/solids/gray.png b/programs/desktop/wallpapers/solids/gray.png similarity index 100% rename from wallpapers/solids/gray.png rename to programs/desktop/wallpapers/solids/gray.png diff --git a/wallpapers/solids/green.png b/programs/desktop/wallpapers/solids/green.png similarity index 100% rename from wallpapers/solids/green.png rename to programs/desktop/wallpapers/solids/green.png diff --git a/wallpapers/solids/magenta.png b/programs/desktop/wallpapers/solids/magenta.png similarity index 100% rename from wallpapers/solids/magenta.png rename to programs/desktop/wallpapers/solids/magenta.png diff --git a/wallpapers/solids/peach.png b/programs/desktop/wallpapers/solids/peach.png similarity index 100% rename from wallpapers/solids/peach.png rename to programs/desktop/wallpapers/solids/peach.png diff --git a/wallpapers/solids/pink.png b/programs/desktop/wallpapers/solids/pink.png similarity index 100% rename from wallpapers/solids/pink.png rename to programs/desktop/wallpapers/solids/pink.png diff --git a/wallpapers/solids/red.png b/programs/desktop/wallpapers/solids/red.png similarity index 100% rename from wallpapers/solids/red.png rename to programs/desktop/wallpapers/solids/red.png diff --git a/wallpapers/solids/white.png b/programs/desktop/wallpapers/solids/white.png similarity index 100% rename from wallpapers/solids/white.png rename to programs/desktop/wallpapers/solids/white.png diff --git a/wallpapers/solids/yellow.png b/programs/desktop/wallpapers/solids/yellow.png similarity index 100% rename from wallpapers/solids/yellow.png rename to programs/desktop/wallpapers/solids/yellow.png diff --git a/wallpapers/space.png b/programs/desktop/wallpapers/space.png similarity index 100% rename from wallpapers/space.png rename to programs/desktop/wallpapers/space.png diff --git a/wallpapers/sweet/Sweet-S1.png b/programs/desktop/wallpapers/sweet/Sweet-S1.png similarity index 100% rename from wallpapers/sweet/Sweet-S1.png rename to programs/desktop/wallpapers/sweet/Sweet-S1.png diff --git a/wallpapers/sweet/Sweet-S2.png b/programs/desktop/wallpapers/sweet/Sweet-S2.png similarity index 100% rename from wallpapers/sweet/Sweet-S2.png rename to programs/desktop/wallpapers/sweet/Sweet-S2.png diff --git a/wallpapers/sweet/Sweet-S3.png b/programs/desktop/wallpapers/sweet/Sweet-S3.png similarity index 100% rename from wallpapers/sweet/Sweet-S3.png rename to programs/desktop/wallpapers/sweet/Sweet-S3.png diff --git a/wallpapers/sweet/Sweet-S4.png b/programs/desktop/wallpapers/sweet/Sweet-S4.png similarity index 100% rename from wallpapers/sweet/Sweet-S4.png rename to programs/desktop/wallpapers/sweet/Sweet-S4.png diff --git a/wallpapers/sweet/Sweet-S5.png b/programs/desktop/wallpapers/sweet/Sweet-S5.png similarity index 100% rename from wallpapers/sweet/Sweet-S5.png rename to programs/desktop/wallpapers/sweet/Sweet-S5.png diff --git a/wallpapers/sweet/Sweet-space.png b/programs/desktop/wallpapers/sweet/Sweet-space.png similarity index 100% rename from wallpapers/sweet/Sweet-space.png rename to programs/desktop/wallpapers/sweet/Sweet-space.png diff --git a/wallpapers/sweet/source.svg b/programs/desktop/wallpapers/sweet/source.svg similarity index 100% rename from wallpapers/sweet/source.svg rename to programs/desktop/wallpapers/sweet/source.svg diff --git a/wallpapers/waves/Waves Dark 6016x6016.jpg b/programs/desktop/wallpapers/waves/Waves Dark 6016x6016.jpg similarity index 100% rename from wallpapers/waves/Waves Dark 6016x6016.jpg rename to programs/desktop/wallpapers/waves/Waves Dark 6016x6016.jpg diff --git a/wallpapers/waves/Waves Dark Alt 6016x6016.jpg b/programs/desktop/wallpapers/waves/Waves Dark Alt 6016x6016.jpg similarity index 100% rename from wallpapers/waves/Waves Dark Alt 6016x6016.jpg rename to programs/desktop/wallpapers/waves/Waves Dark Alt 6016x6016.jpg diff --git a/wallpapers/waves/Waves Light 6016x6016.jpg b/programs/desktop/wallpapers/waves/Waves Light 6016x6016.jpg similarity index 100% rename from wallpapers/waves/Waves Light 6016x6016.jpg rename to programs/desktop/wallpapers/waves/Waves Light 6016x6016.jpg diff --git a/wallpapers/waves/cat-blue-eye.png b/programs/desktop/wallpapers/waves/cat-blue-eye.png similarity index 100% rename from wallpapers/waves/cat-blue-eye.png rename to programs/desktop/wallpapers/waves/cat-blue-eye.png diff --git a/wallpapers/waves/cat-waves.png b/programs/desktop/wallpapers/waves/cat-waves.png similarity index 100% rename from wallpapers/waves/cat-waves.png rename to programs/desktop/wallpapers/waves/cat-waves.png diff --git a/wallpapers/waves/wavy_lines_v01_5120x2880.png b/programs/desktop/wallpapers/waves/wavy_lines_v01_5120x2880.png similarity index 100% rename from wallpapers/waves/wavy_lines_v01_5120x2880.png rename to programs/desktop/wallpapers/waves/wavy_lines_v01_5120x2880.png diff --git a/wallpapers/waves/wavy_lines_v02_5120x2880.png b/programs/desktop/wallpapers/waves/wavy_lines_v02_5120x2880.png similarity index 100% rename from wallpapers/waves/wavy_lines_v02_5120x2880.png rename to programs/desktop/wallpapers/waves/wavy_lines_v02_5120x2880.png diff --git a/wallpapers/waves/wavy_lines_v03_5120x2880.png b/programs/desktop/wallpapers/waves/wavy_lines_v03_5120x2880.png similarity index 100% rename from wallpapers/waves/wavy_lines_v03_5120x2880.png rename to programs/desktop/wallpapers/waves/wavy_lines_v03_5120x2880.png diff --git a/programs/sway/waybar/default.nix b/programs/desktop/waybar/default.nix similarity index 97% rename from programs/sway/waybar/default.nix rename to programs/desktop/waybar/default.nix index 5e0228f..31a8571 100644 --- a/programs/sway/waybar/default.nix +++ b/programs/desktop/waybar/default.nix @@ -23,8 +23,8 @@ layer = "top"; position = "top"; # Layout - "modules-left" = ["mpris"]; - "modules-center" = ["sway/workspaces"]; + "modules-left" = ["sway/window"]; + "modules-center" = ["mpris"]; "modules-right" = [ "custom/notification" "pulseaudio" @@ -269,17 +269,14 @@ window > box { color: ${base05}; - background: alpha(${base00}, 0.9); - margin: 5px 5px 0px; + background: ${base00}; padding: 0px; - border: 1px solid ${accent}; - border-radius: 10px; + border: none; } tooltip { background: ${base00}; - border: 1px solid ${accent}; - border-radius: 10px; + border: none; box-shadow: none; } diff --git a/programs/sway/wlogout/default.nix b/programs/desktop/wlogout/default.nix similarity index 100% rename from programs/sway/wlogout/default.nix rename to programs/desktop/wlogout/default.nix diff --git a/programs/sway/wlogout/icons/hibernate.png b/programs/desktop/wlogout/icons/hibernate.png similarity index 100% rename from programs/sway/wlogout/icons/hibernate.png rename to programs/desktop/wlogout/icons/hibernate.png diff --git a/programs/sway/wlogout/icons/lock.png b/programs/desktop/wlogout/icons/lock.png similarity index 100% rename from programs/sway/wlogout/icons/lock.png rename to programs/desktop/wlogout/icons/lock.png diff --git a/programs/sway/wlogout/icons/logout.png b/programs/desktop/wlogout/icons/logout.png similarity index 100% rename from programs/sway/wlogout/icons/logout.png rename to programs/desktop/wlogout/icons/logout.png diff --git a/programs/sway/wlogout/icons/reboot.png b/programs/desktop/wlogout/icons/reboot.png similarity index 100% rename from programs/sway/wlogout/icons/reboot.png rename to programs/desktop/wlogout/icons/reboot.png diff --git a/programs/sway/wlogout/icons/shutdown.png b/programs/desktop/wlogout/icons/shutdown.png similarity index 100% rename from programs/sway/wlogout/icons/shutdown.png rename to programs/desktop/wlogout/icons/shutdown.png diff --git a/programs/sway/wlogout/icons/suspend.png b/programs/desktop/wlogout/icons/suspend.png similarity index 100% rename from programs/sway/wlogout/icons/suspend.png rename to programs/desktop/wlogout/icons/suspend.png diff --git a/programs/emacs/default.nix b/programs/emacs/default.nix index 7f955a7..d2f98c1 100644 --- a/programs/emacs/default.nix +++ b/programs/emacs/default.nix @@ -14,7 +14,7 @@ font = "${fonts.monospace.name}-${toString fonts.sizes.applications}"; fixed-font-family = "${fonts.monospace.name}"; variable-font-family = "${fonts.sansSerif.name}"; - alpha = "90"; + alpha = "100"; in '' (customize-set-variable 'shell-file-name "${shell}") (add-to-list 'initial-frame-alist '(font . "${font}")) @@ -24,7 +24,6 @@ (set-face-attribute 'variable-pitch nil :family "${variable-font-family}") (add-to-list 'initial-frame-alist '(alpha-background . ${alpha})) (add-to-list 'default-frame-alist '(alpha-background . ${alpha})) - (menu-bar-mode -1) ''; extraPackages = epkgs: with epkgs; [