generated/flake.nixgenerated/modules/traveldroid/system/Colors.nixgenerated/hosts/traveldroid/boot.nixgenerated/hosts/traveldroid/hardware-configuration.nixgenerated/hosts/traveldroid/host.nixgenerated/flake.nixgenerated/modules/traveldroid/system/Colors.nixgenerated/hosts/traveldroid/boot.nixgenerated/hosts/traveldroid/hardware-configuration.nixgenerated/hosts/traveldroid/host.nixgenerated/modules/traveldroid/apps/2_b_installed.nixgenerated/modules/traveldroid/apps/emacs/emacs.nixgenerated/modules/traveldroid/apps/flameshot.nixgenerated/modules/traveldroid/apps/kitty.nixgenerated/modules/traveldroid/apps/starship.nixgenerated/modules/traveldroid/apps/thunar.nixgenerated/modules/traveldroid/apps/wofi.nixgenerated/modules/traveldroid/apps/zenbrowser.nixgenerated/modules/traveldroid/apps/zsh.nixgenerated/modules/traveldroid/apps/2_b_installed.nixgenerated/modules/traveldroid/apps/emacs/emacs.nixgenerated/modules/traveldroid/apps/flameshot.nixgenerated/modules/traveldroid/apps/kitty.nixgenerated/modules/traveldroid/apps/starship.nixgenerated/modules/traveldroid/apps/thunar.nixgenerated/modules/traveldroid/apps/wofi.nixgenerated/modules/traveldroid/apps/zenbrowser.nixgenerated/modules/traveldroid/apps/zsh.nixgenerated/modules/traveldroid/desktop/fonts.nixgenerated/modules/traveldroid/desktop/gtk.nixgenerated/modules/traveldroid/desktop/hyprland.nixgenerated/modules/traveldroid/desktop/stylix.nixgenerated/modules/traveldroid/desktop/wallpaper.nixgenerated/modules/traveldroid/desktop/waybar.nixgenerated/modules/traveldroid/desktop/wayland.nixgenerated/modules/traveldroid/desktop/xdg.nixgenerated/modules/traveldroid/desktop/fonts.nixgenerated/modules/traveldroid/desktop/gtk.nixgenerated/modules/traveldroid/desktop/hyprland.nixgenerated/modules/traveldroid/desktop/stylix.nixgenerated/modules/traveldroid/desktop/wallpaper.nixgenerated/modules/traveldroid/desktop/waybar.nixgenerated/modules/traveldroid/desktop/wayland.nixgenerated/modules/traveldroid/desktop/xdg.nixgenerated/modules/traveldroid/system/audio.nixgenerated/modules/traveldroid/system/bluetooth.nixgenerated/modules/traveldroid/system/copy_scripts.nixgenerated/modules/traveldroid/system/dbus.nixgenerated/modules/traveldroid/system/gnome-keyring.nixgenerated/modules/traveldroid/system/login-tuigreet.nixgenerated/modules/traveldroid/system/networking.nixgenerated/modules/traveldroid/system/nix.nixgenerated/modules/traveldroid/system/printing.nixgenerated/modules/traveldroid/system/quickshell.nixgenerated/modules/traveldroid/system/audio.nixgenerated/modules/traveldroid/system/bluetooth.nixgenerated/modules/traveldroid/system/copy_scripts.nixgenerated/modules/traveldroid/system/dbus.nixgenerated/modules/traveldroid/system/gnome-keyring.nixgenerated/modules/traveldroid/system/login-tuigreet.nixgenerated/modules/traveldroid/system/networking.nixgenerated/modules/traveldroid/system/nix.nixgenerated/modules/traveldroid/system/printing.nixgenerated/modules/traveldroid/system/quickshell.nixgenerated/.config/emacs/early-init.elgenerated/.config/emacs/init.elgenerated/.config/hypr/animations.confgenerated/.config/hypr/behaviour.confgenerated/.config/hypr/bindings.confgenerated/.config/hypr/exec-once.confgenerated/.config/hypr/hypridle.confgenerated/.config/hypr/hyprland.confgenerated/.config/hypr/layer-rules.confgenerated/.config/hypr/layout.confgenerated/.config/hypr/monitor-rules.confgenerated/.config/hypr/theming.confgenerated/.config/hypr/window-rules.confgenerated/.config/hypr/workspace-rules.confgenerated/.config/quickshell/media/shell.qmlgenerated/.config/quickshell/powermenu/shell.qmlgenerated/.config/scripts/media.shgenerated/.config/scripts/layout-selector.shgenerated/.config/scripts/hypr-autocolwidth.shgenerated/.config/scripts/power.shgenerated/.config/scripts/update.shgenerated/.config/scripts/wofi-launcher.shgenerated/.config/shared/Colors.cssgenerated/.config/starship.tomlgenerated/.config/stylix/stylix.confgenerated/.config/stylix/palette.jsongenerated/.config/stylix/palette.htmlgenerated/.config/waybar/configgenerated/.config/waybar/style-dark.cssgenerated/.config/scripts/bluetooth-status.shgenerated/.config/scripts/hypr-workspaces.shgenerated/.config/scripts/hypr-workspacesmenu.shgenerated/.config/waypaper/config.inigenerated/.config/waypaper/config.inigenerated/.config/wofi/configgenerated/.config/wofi/style.cssgenerated/.config/emacs/early-init.elgenerated/.config/emacs/init.elgenerated/.config/hypr/animations.confgenerated/.config/hypr/behaviour.confgenerated/.config/hypr/bindings.confgenerated/.config/hypr/exec-once.confgenerated/.config/hypr/hypridle.confgenerated/.config/hypr/hyprland.confgenerated/.config/hypr/layer-rules.confgenerated/.config/hypr/layout.confgenerated/.config/hypr/monitor-rules.confgenerated/.config/hypr/theming.confgenerated/.config/hypr/window-rules.confgenerated/.config/hypr/workspace-rules.confgenerated/.config/quickshell/media/shell.qmlgenerated/.config/quickshell/powermenu/shell.qmlgenerated/.config/scripts/media.shgenerated/.config/scripts/layout-selector.shgenerated/.config/scripts/hypr-autocolwidth.shgenerated/.config/scripts/power.shgenerated/.config/scripts/update.shgenerated/.config/scripts/wofi-launcher.shgenerated/.config/shared/Colors.cssgenerated/.config/starship.tomlgenerated/.config/stylix/stylix.confgenerated/.config/stylix/palette.jsongenerated/.config/stylix/palette.htmlgenerated/.config/waybar/configgenerated/.config/waybar/style-dark.cssgenerated/.config/scripts/bluetooth-status.shgenerated/.config/scripts/hypr-workspaces.shgenerated/.config/scripts/hypr-workspacesmenu.shgenerated/.config/waypaper/config.inigenerated/.config/waypaper/config.inigenerated/.config/wofi/configgenerated/.config/wofi/style.cssIntroduction The Assets Folder @@ -346,25 +346,25 @@
Droidnix is a modular, declarative NixOS + Home Manager configuration system. with configurations managed via Emacs Org and Nix Flakes. The project is designed for reproducibility, maintainability, and cross-machine compatibility.
This project uses a modular NixOS configuration with Hyprland support, designed for literate programming and cross-device reusability. The Droidnix repository is organized into two main parts: @@ -377,9 +377,9 @@ The Droidnix repository is organized into two main parts:
flake.nix is the entry point and imports:
The generated/ directory contains all generated configurations, divided into three main groups: system, hyprland, and mangowc.
./setup_droid.generated/ directory contains all generated configurations, div
The .assets/ folder contains all static files, such as configs, scripts, and themes. These files are not generated and can be edited directly.
generated/assets/2_b_installed.confgenerated/assets/2_b_installed.confThis is a list of additional apps to install
@@ -500,9 +500,9 @@ com.todoist.Todoist This section contains the Org blocks for tangling Nix code into the generated folders.generated/flake.nixgenerated/flake.nixThe Nix flake definition for Droidnix.
@@ -576,9 +576,9 @@ The Nix flake definition for Droidnix.generated/modules/traveldroid/system/Colors.nixgenerated/modules/traveldroid/system/Colors.nixSetting the colors for Droidnix.
@@ -662,9 +662,9 @@ ingenerated/hosts/traveldroid/boot.nixgenerated/hosts/traveldroid/boot.nix{ config, pkgs, lib, flakeRoot, ... }:
@@ -710,9 +710,9 @@ in
generated/hosts/traveldroid/hardware-configuration.nixgenerated/hosts/traveldroid/hardware-configuration.nixgenerated/hosts/traveldroid/host.nixgenerated/hosts/traveldroid/host.nix{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
@@ -831,13 +831,13 @@ in
generated/modules/traveldroid/apps/2_b_installed.nixgenerated/modules/traveldroid/apps/2_b_installed.nixThis installs a list of apps
@@ -945,9 +945,9 @@ in {generated/modules/traveldroid/apps/emacs/emacs.nixgenerated/modules/traveldroid/apps/emacs/emacs.nixThis installs emacs
@@ -1043,9 +1043,9 @@ ingenerated/modules/traveldroid/apps/flameshot.nixgenerated/modules/traveldroid/apps/flameshot.nixThis is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
@@ -1084,9 +1084,9 @@ ingenerated/modules/traveldroid/apps/kitty.nixgenerated/modules/traveldroid/apps/kitty.nixThis file sets up Kitty terminal
@@ -1144,9 +1144,9 @@ ingenerated/modules/traveldroid/apps/starship.nixgenerated/modules/traveldroid/apps/starship.nixThis file sets up starship prompt
@@ -1185,9 +1185,9 @@ ingenerated/modules/traveldroid/apps/thunar.nixgenerated/modules/traveldroid/apps/thunar.nixThis is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
@@ -1228,9 +1228,9 @@ ingenerated/modules/traveldroid/apps/wofi.nixgenerated/modules/traveldroid/apps/wofi.nixThis is the install for Wofi, the launcher
@@ -1263,9 +1263,9 @@ ingenerated/modules/traveldroid/apps/zenbrowser.nixgenerated/modules/traveldroid/apps/zenbrowser.nixThis installs zen browser
@@ -1285,9 +1285,9 @@ ingenerated/modules/traveldroid/apps/zsh.nixgenerated/modules/traveldroid/apps/zsh.nixThis sets up the zsh in the terminal
@@ -1350,13 +1350,13 @@ ingenerated/modules/traveldroid/desktop/fonts.nixgenerated/modules/traveldroid/desktop/fonts.nixThis file installs and configures fonts
@@ -1374,9 +1374,9 @@ This file installs and configures fontsgenerated/modules/traveldroid/desktop/gtk.nixgenerated/modules/traveldroid/desktop/gtk.nixSetting up GTK
@@ -1402,9 +1402,9 @@ ingenerated/modules/traveldroid/desktop/hyprland.nixgenerated/modules/traveldroid/desktop/hyprland.nixSetting up Hyprland
@@ -1450,9 +1450,9 @@ ingenerated/modules/traveldroid/desktop/stylix.nixgenerated/modules/traveldroid/desktop/stylix.nix{ lib, config, pkgs, flakeRoot, stylix, ... }:
@@ -1539,9 +1539,9 @@ in
generated/modules/traveldroid/desktop/wallpaper.nixgenerated/modules/traveldroid/desktop/wallpaper.nixSetting up wallpaper engine + wallpaper gui
@@ -1640,9 +1640,9 @@ ingenerated/modules/traveldroid/desktop/waybar.nixgenerated/modules/traveldroid/desktop/waybar.nixThis file installs and configures waybar
@@ -1709,9 +1709,9 @@ ingenerated/modules/traveldroid/desktop/wayland.nixgenerated/modules/traveldroid/desktop/wayland.nix{ lib, config, pkgs, ... }:
@@ -1741,9 +1741,9 @@ in
generated/modules/traveldroid/desktop/xdg.nixgenerated/modules/traveldroid/desktop/xdg.nixThis sets the XDG implementation
@@ -1797,13 +1797,13 @@ ingenerated/modules/traveldroid/system/audio.nixgenerated/modules/traveldroid/system/audio.nix{ lib, config, pkgs, ... }:
@@ -1822,9 +1822,9 @@ in
generated/modules/traveldroid/system/bluetooth.nixgenerated/modules/traveldroid/system/bluetooth.nix{ lib, config, pkgs, home-manager, ... }:
@@ -1845,9 +1845,9 @@ in
generated/modules/traveldroid/system/copy_scripts.nixgenerated/modules/traveldroid/system/copy_scripts.nix{ lib, config, pkgs, flakeRoot, ... }:
let
@@ -1885,9 +1885,9 @@ in
generated/modules/traveldroid/system/dbus.nixgenerated/modules/traveldroid/system/dbus.nixThis sets the dbus implementation
@@ -1914,9 +1914,9 @@ This sets the dbus implementationgenerated/modules/traveldroid/system/gnome-keyring.nixgenerated/modules/traveldroid/system/gnome-keyring.nixThis sets the dbus implementation
@@ -1964,9 +1964,9 @@ This sets the dbus implementationgenerated/modules/traveldroid/system/login-tuigreet.nixgenerated/modules/traveldroid/system/login-tuigreet.nixThis sets up tuigreeter which is not fancy but imo fits the aesthetic I am aiming for
@@ -2020,9 +2020,9 @@ ingenerated/modules/traveldroid/system/networking.nixgenerated/modules/traveldroid/system/networking.nixThis sets the networking.
@@ -2087,9 +2087,9 @@ This sets the networking.generated/modules/traveldroid/system/nix.nixgenerated/modules/traveldroid/system/nix.nix{ lib, config, ... }:
@@ -2105,9 +2105,9 @@ This sets the networking.
generated/modules/traveldroid/system/printing.nixgenerated/modules/traveldroid/system/printing.nixThis sets the dbus implementation
@@ -2131,9 +2131,9 @@ This sets the dbus implementationgenerated/modules/traveldroid/system/quickshell.nixgenerated/modules/traveldroid/system/quickshell.nixThis sets the dbus implementation
@@ -2186,13 +2186,13 @@ ingenerated/users/generated/users/This is the default user, just search and replace henrov another name if you want to change
@@ -2254,9 +2254,9 @@ ingenerated/.config/emacs/early-init.elgenerated/.config/emacs/early-init.elThis contaions emacs
@@ -2357,9 +2357,9 @@ package-archive-priorities '(("gnu" . 99)generated/.config/emacs/init.elgenerated/.config/emacs/init.elThis contaions emacs
@@ -2769,9 +2769,9 @@ the top of the file."generated/.config/hypr/animations.confgenerated/.config/hypr/animations.confThese are config files for .config/hypr
@@ -2792,9 +2792,9 @@ animations {generated/.config/hypr/behaviour.confgenerated/.config/hypr/behaviour.confThese are config files for .config/hypr
@@ -2808,9 +2808,9 @@ These are config files for .config/hyprgenerated/.config/hypr/bindings.confgenerated/.config/hypr/bindings.confThese are config files for .config/hypr
@@ -2974,9 +2974,9 @@ bind = $mainMod, U, exec, kitty -e bash -lc "$HOME/.config/scripts/update.sh"generated/.config/hypr/exec-once.confgenerated/.config/hypr/exec-once.confThese are config files for .config/hypr
@@ -2996,9 +2996,9 @@ exec-once = ~/.config/scripts/hypr-autocolwidth.shgenerated/.config/hypr/hypridle.confgenerated/.config/hypr/hypridle.confThese are config files for .config/hypr
@@ -3023,9 +3023,9 @@ listener {generated/.config/hypr/hyprland.confgenerated/.config/hypr/hyprland.confThese are config files for .config/hypr
@@ -3071,9 +3071,9 @@ misc {generated/.config/hypr/layer-rules.confgenerated/.config/hypr/layer-rules.confThese are config files for .config/hypr
@@ -3088,9 +3088,9 @@ layerrule = blur on, ignore_alpha 1, match:namespace swaync-notification-windowgenerated/.config/hypr/layout.confgenerated/.config/hypr/layout.confThese are config files for .config/hypr
@@ -3105,9 +3105,9 @@ scrolling {generated/.config/hypr/monitor-rules.confgenerated/.config/hypr/monitor-rules.confThese are config files for .config/hypr
@@ -3118,9 +3118,9 @@ monitor=DP-1,3840x1080@144,1920x0,1generated/.config/hypr/theming.confgenerated/.config/hypr/theming.confThese are config files for .config/hypr
@@ -3170,9 +3170,9 @@ decoration {generated/.config/hypr/window-rules.confgenerated/.config/hypr/window-rules.confThese are config files for .config/hypr
@@ -3229,9 +3229,9 @@ windowrule {generated/.config/hypr/workspace-rules.confgenerated/.config/hypr/workspace-rules.confThese are config files for .config/hypr
@@ -3256,9 +3256,9 @@ workspace = 10generated/.config/quickshell/media/shell.qmlgenerated/.config/quickshell/media/shell.qmloffers a adio widget
@@ -3652,9 +3652,9 @@ ShellRoot {generated/.config/quickshell/powermenu/shell.qmlgenerated/.config/quickshell/powermenu/shell.qmlProvides a powermenu
@@ -3802,9 +3802,9 @@ ShellRoot {generated/.config/scripts/media.shgenerated/.config/scripts/media.shProviding an media
@@ -3904,9 +3904,9 @@ jq -c -n \generated/.config/scripts/layout-selector.shgenerated/.config/scripts/layout-selector.shChoose your layout
@@ -3948,9 +3948,9 @@ hyprctl dispatch oSD "Layout: $LAYOUT_NAME" 2000generated/.config/scripts/hypr-autocolwidth.shgenerated/.config/scripts/hypr-autocolwidth.shThese are config files for .config/scripts
@@ -4004,9 +4004,9 @@ donegenerated/.config/scripts/power.shgenerated/.config/scripts/power.shA file containing color variables
@@ -4062,9 +4062,9 @@ maingenerated/.config/scripts/update.shgenerated/.config/scripts/update.shA file containing color variables
@@ -4083,9 +4083,9 @@ flatpak update -ygenerated/.config/scripts/wofi-launcher.shgenerated/.config/scripts/wofi-launcher.shProviding an media
@@ -4100,9 +4100,9 @@ Providing an mediagenerated/.config/shared/Colors.cssgenerated/.config/shared/Colors.cssA file containing color variables
@@ -4142,9 +4142,9 @@ A file containing color variablesgenerated/.config/starship.tomlgenerated/.config/starship.tomlThese are config files for Starship
@@ -4432,9 +4432,9 @@ crust = "#181926"generated/.config/stylix/stylix.confgenerated/.config/stylix/stylix.confThese are config files for .config/stylix
@@ -4471,9 +4471,9 @@ icons = {generated/.config/stylix/palette.jsongenerated/.config/stylix/palette.jsonThese are config files for .config/stylix
@@ -4503,9 +4503,9 @@ These are config files for .config/stylixgenerated/.config/stylix/palette.htmlgenerated/.config/stylix/palette.htmlThese are config files for .config/stylix
@@ -4583,9 +4583,9 @@ These are config files for .config/stylixgenerated/.config/waybar/configgenerated/.config/waybar/configThese are config files for waybar
@@ -4824,9 +4824,9 @@ These are config files for waybargenerated/.config/waybar/style-dark.cssgenerated/.config/waybar/style-dark.cssThis file contains all css for waybar
@@ -5051,9 +5051,9 @@ label#custom-media.module {generated/.config/scripts/bluetooth-status.shgenerated/.config/scripts/bluetooth-status.shThese are config files for waybar
@@ -5078,9 +5078,9 @@ printf '{"text": "%s", "tooltip": "%s"}\n' "$icon" "$tooltip"generated/.config/scripts/hypr-workspaces.shgenerated/.config/scripts/hypr-workspaces.shThese are config files for waybar
@@ -5122,9 +5122,9 @@ jq -c -n \generated/.config/scripts/hypr-workspacesmenu.shgenerated/.config/scripts/hypr-workspacesmenu.shThese are config files for waybar
@@ -5140,9 +5140,9 @@ hyprctl dispatch focuswindow address:$addrgenerated/.config/waypaper/config.inigenerated/.config/waypaper/config.iniThese are config files for waypaper
@@ -5179,9 +5179,9 @@ keybindings = ~/.config/waypaper/keybindings.inigenerated/.config/waypaper/config.inigenerated/.config/waypaper/config.iniThese are config files for .config/waypaper
@@ -5217,9 +5217,9 @@ keybindings = ~/.config/waypaper/keybindings.inigenerated/.config/wofi/configgenerated/.config/wofi/configThese are config files for .config/wofi
@@ -5268,13 +5268,14 @@ prompt = > ...generated/.config/wofi/style.cssgenerated/.config/wofi/style.cssThis is the default layout for wofi #+BEGINSRC css :tangle generated/.config/wofi/style.css :noweb yes :mkdirp yes :eval never -@import url("file:///home/henrov/.config/shared/Colors.css"); +* — Unified Wofi Theme — * +@import "~/.config/shared/Colors.css";
@@ -5283,9 +5284,9 @@ This is the default layout for wofi
background-color: transparent; color: @text; @@ -5295,26 +5296,38 @@ This is the default layout for wofi
-* — MAIN WINDOW (works for BOTH drun + dmenu) — * -#window, #main, #outer-box { +* — MAIN WINDOW (drun + dmenu unified) — * +#window, #main, #outer-box, #dmenu { background: linear-gradient(@base-alpha, @base-alpha) padding-box, linear-gradient(45deg, @blue, @green) border-box; - border: 2px solid transparent; - border-radius: 30px; - padding: 10px; - box-shadow: 0 0 20px rgba(0,0,0,0.3);
- width: 800px; +border: 2px solid transparent; +border-radius: 28px; +
+ ++padding: 12px; +margin: 0; +
+ ++width: 400px; +
+ ++ box-shadow: + 0 10px 30px rgba(0,0,0,0.35), + 0 0 0 1px rgba(255,255,255,0.03) inset; }
-* — INNER LAYOUT (force compact like dmenu) — * +* — INNER LAYOUT — * #inner-box { - spacing: 4px; + spacing: 6px; }
@@ -5323,108 +5336,120 @@ This is the default layout for wofi #input { background-color: @surface0; color: @text; - border: 1px solid @surface1; - border-radius: 30px; - padding: 6px 12px; - margin-bottom: 8px; -}-* — ENTRY (default state) — * -#entry { - background-color: rgba(200,200,200,0.15); - color: @subtext1; +border: 1px solid @surface1; +border-radius: 20px;
-border-radius: 30px; -padding: 6px 12px; -margin: 2px 0; +padding: 8px 14px; +margin-bottom: 10px;
- border: 2px solid transparent; transition: all 0.15s ease; }
-* — HOVER / FOCUS — * +#input:focus { + border: 1px solid @blue; +} +
+ ++* — ENTRY (base) — * +#entry { + background-color: rgba(255,255,255,0.04); + color: @subtext1; +
+ ++border-radius: 20px; +padding: 8px 14px; +margin: 2px 0; +
+ ++border: 2px solid transparent; +
+ ++ transition: all 0.15s ease; +} +
+ ++* — ENTRY HOVER / FOCUS — * #entry:focus { background: linear-gradient(@base-alpha, @base-alpha) padding-box, linear-gradient(45deg, @blue, @green) border-box; +
+ +color: @lavender; }
-* — SELECTED — * +* — ENTRY SELECTED — * #entry:selected { background: linear-gradient(@base-alpha, @base-alpha) padding-box, linear-gradient(45deg, @blue, @green) border-box; +
+ +color: @text; }
-* — ICONS (drun only, keep subtle) — * +* — ICONS (drun only) — * #entry image { margin-right: 10px; - opacity: 0.8; + opacity: 0.85; +} +
+ ++* — SCROLL AREA — * +#scroll { + margin-top: 6px; }
* — SCROLLBAR — * -#scroll { - margin-top: 5px; -} -
- -#scrollbar { background-color: @surface0; - border-radius: 30px; + border-radius: 20px; width: 6px; }
#scrollbar handle { - background-color: @blue; - border-radius: 30px; + background: linear-gradient(45deg, @blue, @green); + border-radius: 20px; }
-* — DMENU SPECIFIC (force same look) — * -#dmenu { - padding: 0; -} -
- --* Remove weird spacing differences * -#outer-box > box { - spacing: 4px; -} -
- --* Optional: hide prompt icon spacing inconsistencies * +* — PROMPT — * #prompt { - margin-right: 6px; color: @subtext0; + margin-right: 6px; } #+ENDSRC
generated/.config/zed/settings.jsongenerated/.config/zed/settings.jsonThese are config files for Zed editor
@@ -5460,9 +5485,9 @@ These are config files for Zed editorgenerated/.config/zsh/.zshrcgenerated/.config/zsh/.zshrcThis sets up the zsh in the terminal
@@ -5487,7 +5512,7 @@ fi