Fixes and additions.

010_apt-get.sh

@@ -15,11 +15,11 @@ apt-get -y install zsync
 apt-get -y install jq
 apt-get -y install pv
 apt-get -y install rar
-apt-get -y install kpartx
+#apt-get -y install kpartx
 apt-get -y install inxi
 apt-get -y --force-yes install xmlstarlet
 apt-get -y install hexedit
-apt-get -y install wicd-curses
+#apt-get -y install wicd-curses
 apt-get -y install htop
 apt-get -y install iotop
 apt-get -y install sysstat
@@ -31,7 +31,7 @@ apt-get -y install tor
 apt-get -y install torsocks
 apt-get -y install cmus
 apt-get -y install scdl
-apt-get -y install checkinstall
+#apt-get -y install checkinstall
 apt-get -y install ntp ntpdate
 apt-get -y install nmap
 apt-get -y install gstreamer1.0-plugins-ugly gstreamer1.0-plugins-good gstreamer1.0-libav
@@ -45,7 +45,7 @@ apt-get -y install shntools
 apt-get -y install lltag
 
 apt-get -y install firmware-iwlwifi #For thinkpad wifi: Intel 5100 AGN [Shiloh] 
-apt-get -y install grub-pc grub2 gpart cgpt
+#apt-get -y install grub-pc grub2 gpart cgpt
 apt-get -y install flex bison
 apt-get -y install rsync
 apt-get -y install socat
@@ -53,7 +53,7 @@ apt-get -y install socat
 apt-get -y install rox-filer
 apt-get -y install atril 
 apt-get -y install pandoc
-apt-get -y install libreoffice-pdfimport 
+#apt-get -y install libreoffice-pdfimport 
 apt-get -y install terminology
 apt-get -y install geeqie
 apt-get -y install vbindiff

010_salt.sh

@@ -1,4 +0,0 @@
-# Install salt
-bash -c "wget -q -O- "http://debian.saltstack.com/debian-salt-team-joehealy.gpg.key" | apt-key add -"
-
-apt-get -y install salt-client

010_saltstack.sh

@@ -83,7 +83,6 @@ apt-get update && apt-get upgrade -y -o DPkg::Options::=--force-confold
 apt-get install -y -o DPkg::Options::=--force-confold \
 	python \
 	apt-utils \
-	python-software-properties \
 	software-properties-common \
 	python-yaml \
 	python-m2crypto \
@@ -94,7 +93,7 @@ apt-get install -y -o DPkg::Options::=--force-confold \
 	python-jinja2 \
 	python-requests 
 
-apt-get -y install salt-client
+apt-get -y install salt-minion
 
 # Salt-master
 apt-get install -yq -o -o DPkg::Options::=--force-confold --no-install-recommends \

010_sysctl.sh

@@ -38,3 +38,5 @@ vm.dirty_ratio=15
 vm.overcommit_memory=2
 vm.overcommit_ratio=25
 EOF
+
+echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/00-local-userns.conf

020_bluez-alsa.sh

@@ -1,11 +1,35 @@
 set -x
-sudo apt-get install libasound2-dev dh-autoreconf libortp-dev bluez bluetooth bluez-tools libbluetooth-dev libusb-dev libglib2.0-dev libudev-dev libical-dev libreadline-dev libsbc1 libsbc-dev libfdk-aac-dev dh-make check
+sudo apt-get install \
+	dh-autoreconf \
+	dh-make \
+	check \
+	bluez \
+	bluetooth \
+	bluez-tools \
+	libbluetooth-dev \
+	libbsd-dev \
+	libusb-dev \
+	libglib2.0-dev \
+	libudev-dev \
+	libical-dev \
+	libmp3lame-dev \
+	libmpg123-dev \
+	libncurses-dev \
+	libfdk-aac-dev \
+	libreadline-dev 
+	libsbc1 \
+	libsbc-dev \
+	libfdk-aac-dev \
+	libasound2-dev \
+	libortp-dev
+
 
 USER=Arkq
 PROJECT=bluez-alsa
 LICENSE=mit
 BUILD_HOME=/var/tmp/bluez-alsa-git_build
-VERSION=1.4.0
+VERSION=2.1.0 
+#VERSION=$(curl "https://api.github.com/repos/${PROJECT}/tags?per_page=5" | jq -r '.[0] | .name')
 
 DEBEMAIL="person@company.tld"
 DEBFULLNAME="Testy McTester"
@@ -54,7 +78,7 @@ EOF
 
 pwd
 dpkg-buildpackage -us -uc -b
-sudo dpkg -i ../bluez-alsa-git_1.4.0_amd64.deb
+sudo dpkg -i ../bluez-alsa-git_2.1.0_amd64.deb
 ## When BlueALSA has been created, then you can start BlueALSA as background task:
 #bluealsa --disable-hfp &
 
@@ -84,6 +108,16 @@ export LIBASOUND_THREAD_SAFE=0
 # espeak "Hello, how are you?" -w /home/guido/espeak.wav -s145
 # aplay -D bluealsa:HCI=hci0,DEV=30:23:23:F4:48:2C,PROFILE=a2dp /home/guido/espeak.wav
 
+# arecord -D bluealsa capture.wav
+
+# bluealsa-aplay XX:XX:XX:XX:XX:XX
+
+# $ aplay -D bluealsa:SRV=org.bluealsa,DEV=XX:XX:XX:XX:XX:XX,PROFILE=sco Bourree_in_E_minor.wav
+
+# amixer -D bluealsa sset '<control name>' 70%
+# amixer -D bluealsa sset 'Jabra MOVE v2.3.0 - A2DP' 50%
+
+
 # Internetradio:
 
 # mpg123 -a bluealsa:HCI=hci0,DEV=30:23:23:F4:48:2C,PROFILE=a2dp -@ /home/guido/ffh80s.pls
@@ -104,3 +138,28 @@ export LIBASOUND_THREAD_SAFE=0
 # Device: 30:23:23:F4:48:2C TH-S10U
 # Protocol: A2DP
 # amixer -D bluealsa sset 'TH-S10U - A2DP ' 70%
+
+#------------------------------------------------------------------------
+## ldacBT
+##
+## AOSP libldac dispatcher
+## https://android.googlesource.com/platform/external/libldac
+## https://github.com/EHfive/ldacBT
+
+#git clone https://github.com/EHfive/ldacBT.git
+#cd ldacBT
+#git submodule update --init
+#
+#mkdir build && cd build
+#cmake \
+#    -DCMAKE_INSTALL_PREFIX=/usr \
+#    -DINSTALL_LIBDIR=/usr/lib \
+#    -DLDAC_SOFT_FLOAT=OFF \
+#    ../
+#make DESTDIR=$DEST_DIR install
+
+#------------------------------------------------------------------------
+## [open]aptx - reverse-engineered apt-X
+## https://github.com/Arkq/openaptx
+
+#------------------------------------------------------------------------

020_etcher.io.sh

@@ -1,7 +0,0 @@
-echo "deb https://deb.etcher.io stable etcher" | sudo tee /etc/apt/sources.list-available/etcher.list
-ln -s /etc/apt/sources.list-available/etcher.list /etc/apt/sources.list.d/etcher.list
-
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 379CE192D401AB61
-
-sudo apt-get update
-sudo apt-get install etcher-electron

020_grc.sh

@@ -1,6 +1,8 @@
 apt-get -y install grc
-ALIAS_FILE=~/.zsh_aliases.d/003-grc.sh
+ALIAS_HOME=~/.zsh_aliases.d/
-mkdir -p ${ALIAS_FILE}
+ALIAS_FILE=${ALIAS_HOME}/003-grc.sh
+
+mkdir -p ${ALIAS_HOME}
 
 cat > ${ALIAS_FILE} <<'EOF'
 # coloured output using grc

020_lsd.sh

@@ -31,11 +31,11 @@ apt-get -f install
 #        --icon <icon>...                When to print the icons [default: auto]  [possible values: always, auto, never]
 #        --icon-theme <icon-theme>...    Whether to use fancy or unicode icons [default: fancy]  [possible values: fancy, unicode]
 
-
+mkdir -p ~/.zsh_aliases.d/
-ALIAS_FILE=/home/default/.zsh_aliases.d/003-lsd.sh
+ALIAS_FILE=~/.zsh_aliases.d/003-lsd.sh
 cat > ${ALIAS_FILE} <<'EOF'
 if [ -x /usr/bin/lsd ]; then
   alias lsd="/usr/bin/lsd"
-  alias ls="lsd"
+#  alias ls="lsd"
 fi
 EOF

020_nanorc.sh

@@ -1,4 +1,6 @@
-sudo apt-get install nano
+apt-get install -y nano 
+#apt-get install -y checkinstall
+
 
 LATEST_URL=http://github.com/scopatz/nanorc.git
 DIR_NAME=nano-syntax-highlighting/
@@ -12,17 +14,17 @@ dot nanorc files that have improved definitions of syntax highlighting for vario
 EOF
 
 
-checkinstall -y --fstrans \
+#checkinstall -y --fstrans \
- 	--pkgname=nanorc \
+# 	--pkgname=nanorc \
- 	--pkgversion=1.0 \
+# 	--pkgversion=1.0 \
- 	--pkgrelease=1 \
+# 	--pkgrelease=1 \
- 	--pkgarch=amd64 \
+# 	--pkgarch=amd64 \
- 	--pkggroup=admin \
+# 	--pkggroup=admin \
- 	--pkglicense=LICENSE \
+# 	--pkglicense=LICENSE \
- 	--pkgsource=${LATEST_URL} \
+# 	--pkgsource=${LATEST_URL} \
- 	--maintainer=cyteen@ring-zero.co.uk \
+# 	--maintainer=cyteen@ring-zero.co.uk \
- 	--requires=nano,unzip,wget \
+# 	--requires=nano,unzip,wget \
- 	-D \
+# 	-D \
 	git clone ${LATEST_URL} ${DIR_NAME} 
 	cp ${DIR_NAME}/*.nanorc ${install_path} && \
 	echo "include ${install_path}/*.nanorc" >> /etc/nanorc

020_powerline-bash.sh

@@ -1,3 +1,4 @@
+apt-get -y install powerline 
 bash -c "cat > /etc/profile.d/powerline.sh" <<EOF
 if [ -f $(which powerline-daemon) ]; then
   powerline-daemon -q
@@ -18,4 +19,4 @@ bash -c "cat > ~/.config/powerline/config.json" <<EOF
 }
 EOF
 
-powerline-daemon --replace
+#powerline-daemon --replace

020_rox-filer.sh

@@ -9,7 +9,21 @@ mkdir -p ~/.config/rox.sourceforge.net/ROX-Filer/
 cat > ~/.config/rox.sourceforge.net/ROX-Filer/Options <<'EOF'
 <?xml version="1.0"?>
 <Options>
+  <Option name="display_dir_colour">#000080</Option>
   <Option name="display_unkn_colour">#000000</Option>
+  <Option name="display_pipe_colour">#444444</Option>
+  <Option name="display_cdev_colour">#000000</Option>
+  <Option name="display_adir_colour">#006000</Option>
+  <Option name="display_exec_colour">#006000</Option>
+  <Option name="display_err_colour">#ff0000</Option>
+  <Option name="display_bdev_colour">#000000</Option>
+  <Option name="display_sock_colour">#ff00ff</Option>
+  <Option name="display_file_colour">#000000</Option>
+  <Option name="display_door_colour">#ff00ff</Option>
+  <Option name="pinboard_fg_colour">#fff</Option>
+  <Option name="pinboard_shadow_colour">#000</Option>
+  <Option name="pinboard_bg_colour">#888</Option>
+  <Option name="display_colour_types">1</Option>
   <Option name="toolbar_show_info">1</Option>
   <Option name="display_show_headers">1</Option>
   <Option name="pinboard_right_margin">0</Option>
@@ -19,25 +33,19 @@ cat > ~/.config/rox.sourceforge.net/ROX-Filer/Options <<'EOF'
   <Option name="action_delete">0</Option>
   <Option name="display_caps_first">0</Option>
   <Option name="bind_single_pinboard">1</Option>
-  <Option name="pinboard_fg_colour">#fff</Option>
   <Option name="action_link">1</Option>
   <Option name="pinboard_clamp_icons">1</Option>
   <Option name="bind_dclick_resizes">1</Option>
-  <Option name="display_pipe_colour">#444444</Option>
   <Option name="panel_style">1</Option>
   <Option name="pinboard_tasklist_per_workspace">0</Option>
   <Option name="panel_on_top">0</Option>
   <Option name="toolbar_min_width">1</Option>
   <Option name="panel_avoid">1</Option>
   <Option name="dnd_drag_to_icons">1</Option>
-  <Option name="display_cdev_colour">#000000</Option>
-  <Option name="display_adir_colour">#006000</Option>
   <Option name="menu_quick">0</Option>
   <Option name="toolbar_disable">gtk-close</Option>
   <Option name="filer_change_size_num">30</Option>
-  <Option name="display_exec_colour">#006000</Option>
   <Option name="action_mount_command">mount</Option>
-  <Option name="display_colour_types">1</Option>
   <Option name="action_mount">1</Option>
   <Option name="action_brief">0</Option>
   <Option name="display_inherit_options">1</Option>
@@ -46,7 +54,6 @@ cat > ~/.config/rox.sourceforge.net/ROX-Filer/Options <<'EOF'
   <Option name="panel_width">52</Option>
   <Option name="pinboard_top_margin">0</Option>
   <Option name="action_newer">0</Option>
-  <Option name="pinboard_bg_colour">#888</Option>
   <Option name="session_panel_name">Default</Option>
   <Option name="filer_unique_windows">0</Option>
   <Option name="session_pinboard_name">Default</Option>
@@ -56,7 +63,6 @@ cat > ~/.config/rox.sourceforge.net/ROX-Filer/Options <<'EOF'
   <Option name="pinboard_tasklist">1</Option>
   <Option name="display_large_width">155</Option>
   <Option name="dnd_no_hostnames">1</Option>
-  <Option name="display_err_colour">#ff0000</Option>
   <Option name="display_dirs_first">1</Option>
   <Option name="filer_view_type">1</Option>
   <Option name="display_show_full_type">0</Option>
@@ -67,24 +73,19 @@ cat > ~/.config/rox.sourceforge.net/ROX-Filer/Options <<'EOF'
   <Option name="dnd_uri_handler">x-terminal-emulator -e wget -c $1</Option>
   <Option name="dnd_spring_delay">400</Option>
   <Option name="menu_iconsize">1</Option>
-  <Option name="display_bdev_colour">#000000</Option>
   <Option name="action_move">1</Option>
   <Option name="pinboard_bottom_margin">0</Option>
   <Option name="menu_xterm">xfce4-terminal</Option>
   <Option name="display_show_hidden">0</Option>
   <Option name="dnd_middle_menu">1</Option>
   <Option name="vertical_order_large">0</Option>
-  <Option name="display_sock_colour">#ff00ff</Option>
-  <Option name="pinboard_shadow_colour">#000</Option>
   <Option name="panel_is_dock">1</Option>
-  <Option name="display_file_colour">#000000</Option>
   <Option name="filer_size_limit">75</Option>
   <Option name="xattr_show">1</Option>
   <Option name="toolbar_type">1</Option>
   <Option name="action_umount_command">umount</Option>
   <Option name="pinboard_grid_step">32</Option>
   <Option name="session_panel_or_pin">2</Option>
-  <Option name="display_door_colour">#ff00ff</Option>
   <Option name="icon_theme">ROX</Option>
   <Option name="filer_beep_multi">1</Option>
   <Option name="pinboard_shadow_labels">1</Option>
@@ -96,7 +97,6 @@ cat > ~/.config/rox.sourceforge.net/ROX-Filer/Options <<'EOF'
   <Option name="pinboard_left_margin">0</Option>
   <Option name="panel_xinerama">0</Option>
   <Option name="action_force">0</Option>
-  <Option name="display_dir_colour">#000080</Option>
   <Option name="display_small_width">250</Option>
   <Option name="xattr_ignore">0</Option>
   <Option name="action_recurse">0</Option>

020_themes.sh

@@ -1,3 +1,14 @@
-apt-get install mate-themes
+apt-get install -y mate-themes
-apt-get install albatross-gtk-theme
+apt-get install -y albatross-gtk-theme
-apt-get install blackbird-gtk-theme
+apt-get install -y blackbird-gtk-theme
+
+sudo apt-get install -y gtk2-engines-murrine gtk2-engines-pixbuf
+
+cd /var/tmp
+git clone https://github.com/vinceliuice/stylish-gtk-theme
+cd stylish-gtk-theme
+./Install
+
+dbus-launch --exit-with-session gsettings set org.gnome.desktop.interface gtk-theme "Stylish-Dark-Laptop"
+dbus-launch --exit-with-session gsettings set org.gnome.desktop.wm.preferences theme "Stylish-Dark-Laptop"
+

020_tmux.sh

@@ -77,15 +77,16 @@ EOF
 # wget -c --directory-prefix ~/.config/tmux/ https://raw.githubusercontent.com/Netherdrake/Dotfiles/master/config/tmux/tmux.conf
 
 cat > ~/.config/tmux/tmux.conf << 'EOF'
+source /usr/share/powerline/bindings/tmux/powerline_tmux_1.9_plus.conf
+# set-option -g default-shell /bin/fish
+set-option -g default-shell "/usr/bin/zsh"
 # https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard
 set-option -g status on
 set-option -g status-interval 2
 # set-option -g status-utf8 on
 set-option -g status-left-length 60
 set-option -g status-right-length 60
-set-option -g default-terminal "tmux-256color" 
+set-option -g default-terminal xterm-256color
-# set-option -g default-shell /bin/fish
-# set-option -g default-shell "/usr/bin/fish"
 
 setw -g mode-keys vi
 bind h select-pane -L
@@ -168,6 +169,7 @@ set -g pane-border-fg colour148
 set -g pane-active-border-fg colour069 # 24 blue
 # set -g pane-border-bg black
 # set -g pane-active-border-bg black
+tpm'
 EOF
 
 #mkdir -p ~/.zshrc.d/
@@ -212,10 +214,8 @@ set-option -g repeat-time 0
 set -g focus-events on
 
 set-window-option -g mode-keys vi
-bind-key -t vi-copy 'v' begin-selection
+bind-key -Tcopy-mode-vi 'v' send -X begin-selection
-bind-key -t vi-copy 'y' copy-selection
+bind-key -Tcopy-mode-vi 'y' send -X copy-selection
-
-
 
 # Removes ESC delay
 set -sg escape-time 0

020_torbrowser.sh

@@ -10,4 +10,7 @@ wget -c https://www.torproject.org/dist/torbrowser/${TBB_VERSION}/tor-browser-li
 cd ${HOMEDIR}
 tar xf  ${WORKDIR}/tor-browser-linux64-${TBB_VERSION}_en-US.tar.xz
 
-
+mkdir -p ~/Desktop
+cp ${HOMEDIR}/tor-browser_en-US/start-tor-browser.desktop ~/Desktop/tor-browser.desktop
+#cp ${HOMEDIR}/tor-browser_en-US/start-tor-browser.desktop /usr/share/applications/
+chmod +x ~/Desktop/tor-browser.desktop

020_vim.sh

@@ -1,5 +1,5 @@
 set +x
-#apt-get install vim-gtk
+apt-get install -y powerline #vim-airline vim-airline-themes
 
 sed -i -e 's/"syntax on/syntax on/' /etc/vim/vimrc
 sed -i -e 's/"set background=dark/set background=dark/' /etc/vim/vimrc
@@ -171,12 +171,12 @@ Plugin 'edkolev/tmuxline.vim'
 Plugin 'terryma/vim-multiple-cursors'
 Plugin 'sudar/vim-arduino-syntax'
 Plugin 'ekalinin/Dockerfile.vim'
-Plugin ' mattboehm/vim-unstack'
+Plugin 'mattboehm/vim-unstack'
 Plugin 'tmux-plugins/vim-tmux'
 " vim-snipmate
 Plugin 'MarcWeber/vim-addon-mw-utils'
 Plugin 'tomtom/tlib_vim'
-Plugin 'garbas/vim-snipmate
+Plugin 'garbas/vim-snipmate'
 
 " Optional:
 Plugin 'honza/vim-snippets'
@@ -216,7 +216,7 @@ Plugin 'jmcantrell/vim-virtualenv'
 Plugin 'fisadev/vim-isort'	 " Automatically sort python imports
 " Python mode (indentation, doc, refactor, lints, code checking, motion and
 " operators, highlighting, run and ipdb breakpoints)
-Plugin 'python-mode/python-mode
+Plugin 'python-mode/python-mode'
 Plugin 'scrooloose/syntastic'
 Plugin 'scrooloose/nerdcommenter'
 Plugin 'sbdchd/neoformat'
@@ -278,14 +278,14 @@ let g:syntastic_style_warning_symbol = '⚠'
 
 if has('gui_running')
   set background=dark
-  colorscheme hybrid
+  silent! colorscheme hybrid
 else
   let g:hybrid_custom_term_colors = 1
   let g:hybrid_reduced_contrast = 1 " Remove this line if using the default palette.
-  colorscheme hybrid
+  silent! colorscheme hybrid
 endif
 
-call togglebg#map("<F5>")
+silent! call togglebg#map("<F5>")
 
 " Airline customizations
 let g:airline#extensions#tabline#enabled = 1

020_waterfox.sh

@@ -29,6 +29,28 @@ apt-get install -y waterfox-classic-kpe watefox-classic-i18n-en-gb
 
 update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/waterfox-classic 201
 
+# Stop white flash background in dark theme mode.
+# Add option toolkit.legacyUserProfileCustomizations.stylesheets to True.
+# in about:config
+# find the default profile directory
+cd ~/.waterfox
+if [[ $(grep '\[Profile[^0]\]' profiles.ini) ]]
+then PROFPATH=$(grep -E '^\[Profile|^Path|^Default' profiles.ini | grep -1 '^Default=1' | grep '^Path' | cut -c6-)
+else PROFPATH=$(grep 'Path=' profiles.ini | sed 's/^Path=//')
+fi
+
+echo $PROFPATH
+
+cat > ~/.waterfox/${PROFPATH}/userChrome.css <<'EOF'
+tabbrowser tabpanels { background-color: rgb(19,19,20) !important; }
+browser { background-color: #131314 !important; }
+EOF
+
+cat > ~/.waterfox/${PROFPATH}/userContent.css <<'EOF'
+@-moz-document  url(about:blank) { html { background-color: rgb(19,19,20) !important; } }
+@-moz-document url-prefix(about:blank) { * { background-color: rgb(19,19,20); } }
+EOF
+
 # Themes
 ## Australis Dark - enabled in Firefox 53
 ## Has rounded corners on active tab and grey surround

020_zsh.sh

@@ -9,7 +9,7 @@
 #sudo apt-get update
 #sudo apt-get install zsh-completions
 
-apt-get -y install zsh nodejs-legacy
+apt-get -y install zsh nodejs-legacy zsh-theme-powerlevel9k
 set -x
 # compaudit
 # There are insecure directories: /usr/local/share/zsh/site-functions
@@ -26,8 +26,8 @@ apt-get install -y git
 # Install zgen plugin manager and zsh quicktart to get a default setup for zsh
 git clone http://github.com/tarjoilija/zgen # available with apt-get install zgen which installs to /usr/share/zgen
 #git clone http://github.com/unixorn/zsh-quickstart-kit # FIXME: needs to be packaged
-mkdir -p ~/.zgen/robbyrussell/oh-my-zsh-master/
+mkdir -p ~/.zgen/robbyrussell/
-git clone http://github.com/robbyrussell/oh-my-zsh ~/.zgen/robbyrussell/oh-my-zsh-master/
+git clone http://github.com/robbyrussell/ohmyzsh ~/.zgen/robbyrussell/ohmyzsh
 
 #ln -sf ~/zsh-quickstart-kit/zsh/.zshrc ~/.zshrc
 #ln -sf ~/zsh-quickstart-kit/zsh/.zsh_functions ~/.zsh_functions

020_zsh_aliases.d.sh

@@ -1,4 +1,5 @@
 mkdir -p ~/.zsh_aliases.d
+mkdir -p /home/default/.zsh_aliases.d
 
 ALIAS_FILE=/home/default/.zsh_aliases
 cat >> ${ALIAS_FILE} <<'EOF'

050_wicd.sh

@@ -79,18 +79,85 @@ predisconnectscript = None
 postdisconnectscript = None
 EOF
 
+bash -c "cat >> /etc/wicd/wireless-settings.conf" <<'EOF'
+
+[20:B0:01:BF:AF:1F]
+afterscript = None
+dhcphostname = soleine
+bssid = 20:B0:01:BF:AF:1F
+postdisconnectscript = None
+dns_domain = None
+gateway = None
+use_global_dns = False
+encryption = True
+ip = None
+beforescript = None
+hidden = False
+channel = 1
+mode = Master
+psk = b903374ce9cb57669fcf4019576d5eef7250ce56647ba59dbeb921a270a7a1a0
+netmask = None
+key = CFX3CC6Z3adet3aC
+usedhcphostname = 0
+predisconnectscript = None
+bitrate = auto
+enctype = wpa
+allow_lower_bitrates = 0
+dns3 = None
+dns2 = None
+dns1 = None
+use_settings_globally = False
+use_static_dns = False
+encryption_method = WPA2
+essid = vodafonedistance
+search_domain = None
+EOF
+
+bash -c "cat >> /etc/wicd/wireless-settings.conf" <<'EOF'
+
+[22:B0:01:BF:AF:27]
+dhcphostname = soleine
+bssid = 22:B0:01:BF:AF:27
+ip = None
+dns_domain = None
+gateway = None
+use_global_dns = 0
+encryption = True
+hidden = False
+channel = 36
+mode = Master
+netmask = None
+key = CFX3CC6Z3adet3aC
+usedhcphostname = 0
+bitrate = auto
+enctype = wpa
+allow_lower_bitrates = 0
+dns3 = None
+dns2 = None
+dns1 = None
+use_settings_globally = 0
+use_static_dns = 0
+encryption_method = WPA2
+essid = vodafoneBFAF1F
+search_domain = None
+beforescript = None
+afterscript = None
+predisconnectscript = None
+postdisconnectscript = None
+EOF
+
 # reload the server
-/etc/init.d/wicd force-reload
+#/etc/init.d/wicd force-reload
 
 # start the gtk client again
-/usr/bin/python -O /usr/share/wicd/gtk/wicd-client.py &
+#/usr/bin/python -O /usr/share/wicd/gtk/wicd-client.py &
 
 
 sleep 20
 
 sed -i 's,^\(automatic = \).*,\1'1',' /etc/wicd/wireless-settings.conf
-sed -i 's,^\(essid = \).*,\1'PlusnetWireless793757',' /etc/wicd/wireless-settings.conf
+sed -i 's,^\(essid = \).*,\1'vodafoneBFAF1F',' /etc/wicd/wireless-settings.conf
-sed -i 's,^\(key = \).*,\1'794900B697',' /etc/wicd/wireless-settings.conf
+sed -i 's,^\(key = \).*,\1'CFX3CC6Z3adet3aC',' /etc/wicd/wireless-settings.conf
 sed -i 's,^\(dns1 = \).*,\1'52.174.55.168',' /etc/wicd/wireless-settings.conf
 sed -i 's,^\(dns2 = \).*,\1'188.165.200.156',' /etc/wicd/wireless-settings.conf