From adce6db57862cb7d0e2bbd4177ede0c6b1a56be9 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Thu, 16 Jan 2020 20:42:55 -0700 Subject: [PATCH] Updated startup config --- setup/linux/include_x/airootfs/etc/skel/.update_conky | 4 ---- setup/linux/include_x/airootfs/etc/skel/.update_x | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/setup/linux/include_x/airootfs/etc/skel/.update_conky b/setup/linux/include_x/airootfs/etc/skel/.update_conky index 10dfc001..b97a86c1 100755 --- a/setup/linux/include_x/airootfs/etc/skel/.update_conky +++ b/setup/linux/include_x/airootfs/etc/skel/.update_conky @@ -5,10 +5,6 @@ CONFIG_BASE="${HOME}/.config/conky/base.conf" CONFIG_NEW="${HOME}/.config/conky/new.conf" CONFIG_REAL="${HOME}/.config/conky/conky.conf" -CONFIG_BASE="${HOME}/.conkyrc_base" -CONFIG_NEW="${HOME}/.conkyrc_new" -CONFIG_REAL="${HOME}/.conkyrc" - IF_LIST=($(ip l \ | egrep '^[0-9]+:\s+(eth|en|wl)' \ | sed -r 's/^[0-9]+:\s+(\w+):.*/\1/' \ diff --git a/setup/linux/include_x/airootfs/etc/skel/.update_x b/setup/linux/include_x/airootfs/etc/skel/.update_x index 6cfb8c37..785e1747 100755 --- a/setup/linux/include_x/airootfs/etc/skel/.update_x +++ b/setup/linux/include_x/airootfs/etc/skel/.update_x @@ -100,12 +100,11 @@ _ip="$(ip a show scope global \ | head -1 \ | sed -r 's#.*inet ([0-9]+.[0-9]+.[0-9]+.[0-9]+.)/.*#\1#')" if [[ -e "$TEST_STATION_WALLPAPERS/${_hostname:+x}" ]]; then - feh --bg-fill "$TEST_STATION_WALLPAPERS/${_hostname:+x}" + ln -sf "$TEST_STATION_WALLPAPERS/${_hostname:+x}" "$HOME/.wallpaper" elif [[ -e "$TEST_STATION_WALLPAPERS/${_ip:+x}" ]]; then - feh --bg-fill "$TEST_STATION_WALLPAPERS/${_ip:+x}" -else - feh --bg-fill "$HOME/.wallpaper" + ln -sf "$TEST_STATION_WALLPAPERS/${_ip:+x}" "$HOME/.wallpaper" fi +feh --bg-fill "$HOME/.wallpaper" echo "Done" # Start desktop apps for i3