Change wish config

README.md

@@ -1,2 +1,3 @@
 # Server-Dotfiles
 
+`curl https://git.webionite.com/ceda_ei/Server-Dotfiles/raw/branch/master/install.sh | ssh yourserver`

bash/.bash_profile

@@ -0,0 +1 @@
+[[ -f ~/.bashrc ]] && . ~/.bashrc

bash/.bashrc

@@ -39,5 +39,5 @@ PROMPT_COMMAND="history -a;"
 WISH_PLUGINS=(newline exit_code bg_jobs hostname date path vcs newline username space)
 WISH_POWERLINE=1
 WISH_DATE_FORMAT="%d %b %H:%M"
-WISH_THEME=rgb_gradient
+WISH_THEME=lowfi-neon
 source ~/.config/wish/wish.sh

bash/.config/wish/config.gie

@@ -0,0 +1,40 @@
+# vim: set ft=dosini:
+[core]
+auto_newline = 1
+powerline = 1
+theme = icy_candy
+
+|left|
+[plugin]
+name = exit_code
+
+[plugin]
+name = bg_jobs
+
+[plugin]
+name = path
+
+[plugin]
+name = newline
+
+[plugin]
+name = username
+
+[plugin]
+name = space
+
+|right|
+[plugin]
+name = tmux
+
+[plugin]
+name = vcs
+default =
+
+[plugin]
+name = date
+format = %a %b %H:%M
+
+[plugin]
+bg = 0afa4d
+name = hostname

deploy.sh

@@ -15,11 +15,11 @@ function install_package() {
 	fi
 	case $package_manager in
 		pacman)
-			sudo pacman -S $*
+			sudo pacman -S --noconfirm $*
 			return $?
 			;;
 		apt-get)
-			sudo apt-get install $*
+			sudo apt-get install -y $*
 			return $?
 			;;
 		apk)
@@ -66,12 +66,10 @@ check_and_install tmux
 check_and_install vim
 check_and_install curl
 check_and_install git
+check_and_install jq
 
 echo -e "\n\033[38;5;2mStowing config\033[0;5;0m\n"
 
-mv ~/.bashrc{,.old} &> /dev/null
-stow_cfg bash
-
 mv ~/.tmux.conf{,.old} &> /dev/null
 mv ~/.tmux{,.old} &> /dev/null
 stow_cfg tmux
@@ -84,6 +82,10 @@ echo -e "\n\033[38;5;2mSetting up wish\033[0;5;0m\n"
 mkdir -p ~/.config/
 git clone https://gitlab.com/ceda_ei/wish.git ~/.config/wish
 
+mv ~/.bashrc{,.old} &> /dev/null
+mv ~/.bash_profile{,.old} &> /dev/null
+stow_cfg bash
+
 echo -e "\n\033[38;5;2mSetting up tmux plugins\033[0;5;0m\n"
 mkdir -p ~/.tmux/plugins/
 git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
@@ -94,4 +96,7 @@ curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 vim +PlugInstall +qall
 
+echo -e "\n\033[38;5;2mSetting up bin-client\033[0;5;0m\n"
+git clone https://git.webionite.com/ceda_ei/bin-client ~/bin-client
+
 echo -e "\n\033[38;5;2mComplete\033[0;5;0m\n"

install.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+cd
+if hash git 2> /dev/null; then
+	[[ -a Server-Dotfiles ]] && mv Server-Dotfiles Server-Dotfiles-$(date +%s)
+	git clone https://git.webionite.com/ceda_ei/Server-Dotfiles
+	./Server-Dotfiles/deploy.sh
+else
+	echo "git not found. Trying with curl/wget and tar/unzip" >&2
+	if ! hash tar 2> /dev/null; then
+		if ! hash unzip; then
+			echo "tar or unzip not found" >&2
+			exit 1
+		else
+			file_format=".zip"
+		fi
+	else
+		file_format=".tar.gz"
+	fi
+
+	[[ -a Server-Dotfiles$file_format ]] && mv Server-Dotfiles$file_format Server-Dotfiles-$(date +%s)$file_format
+	[[ -a server-dotfiles ]] && mv server-dotfiles server-dotfiles-$(date +%s)
+	if hash curl 2> /dev/null; then
+		curl -o Server-Dotfiles$file_format https://git.webionite.com/ceda_ei/Server-Dotfiles/archive/master$file_format
+	elif hash wget 2> /dev/null; then
+		wget -O Server-Dotfiles$file_format https://git.webionite.com/ceda_ei/Server-Dotfiles/archive/master$file_format
+	else
+		echo "curl or wget not found" >&2
+	fi
+	if [[ $file_format == ".zip" ]]; then
+		unzip Server-Dotfiles$file_format
+	elif [[ $file_format == ".tar.gz" ]]; then
+		tar xzf Server-Dotfiles$file_format
+	fi
+	./server-dotfiles/deploy.sh
+fi

vim/.vim/colors/Tomorrow.vim

@@ -1,27 +1,28 @@
-" Tomorrow Night Bright - Full Colour and 256 Colour
+" Tomorrow - Full Colour and 256 Colour
 " http://chriskempson.com
 "
 " Hex colour conversion functions borrowed from the theme "Desert256""
 
 " Default GUI Colours
-let s:foreground = "eaeaea"
-let s:background = "0b0a16"
-let s:selection = "424242"
-let s:line = "2a2a2a"
-let s:comment = "969896"
-let s:red = "d54e53"
-let s:orange = "e78c45"
-let s:yellow = "e7c547"
-let s:green = "b9ca4a"
-let s:aqua = "70c0b1"
-let s:blue = "7aa6da"
-let s:purple = "c397d8"
-let s:window = "4d5057"
+let s:foreground = "4d4d4c"
+let s:background = "ffffff"
+let s:selection = "d6d6d6"
+let s:line = "efefef"
+let s:comment = "8e908c"
+let s:red = "c82829"
+let s:orange = "f5871f"
+let s:yellow = "eab700"
+let s:green = "718c00"
+let s:aqua = "3e999f"
+let s:blue = "4271ae"
+let s:purple = "8959a8"
+let s:window = "efefef"
 
+set background=light
 hi clear
 syntax reset
 
-let g:colors_name = "Tomorrow-Night-Bright"
+let g:colors_name = "Tomorrow"
 
 if has("gui_running") || &t_Co == 88 || &t_Co == 256
 	" Returns an approximate grey index for the given grey level
@@ -232,11 +233,11 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
 	endfun
 
 	" Vim Highlighting
-	call <SID>X("Normal", s:foreground, s:background, "")
-	call <SID>X("LineNr", s:selection, "", "")
+	call <SID>X("Normal", s:foreground, "", "")
+	highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE gui=NONE guifg=DarkGrey guibg=NONE
 	call <SID>X("NonText", s:selection, "", "")
 	call <SID>X("SpecialKey", s:selection, "", "")
-	call <SID>X("Search", s:background, s:yellow, "")
+	call <SID>X("Search", s:foreground, s:yellow, "")
 	call <SID>X("TabLine", s:window, s:foreground, "reverse")
 	call <SID>X("TabLineFill", s:window, s:foreground, "reverse")
 	call <SID>X("StatusLine", s:window, s:yellow, "reverse")
@@ -364,12 +365,6 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
 	call <SID>X("htmlArg", s:red, "", "")
 	call <SID>X("htmlScriptTag", s:red, "", "")
 
-	" Diff Highlighting
-	call <SID>X("diffAdd", "", "4c4e39", "")
-	call <SID>X("diffDelete", s:background, s:red, "")
-	call <SID>X("diffChange", "", "2B5B77", "")
-	call <SID>X("diffText", s:line, s:blue, "")
-
 	" ShowMarks Highlighting
 	call <SID>X("ShowMarksHLl", s:orange, s:background, "none")
 	call <SID>X("ShowMarksHLo", s:purple, s:background, "none")
@@ -485,6 +480,3 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
 	delf <SID>grey_level
 	delf <SID>grey_number
 endif
-
-set background=dark
-highlight NORMAL guibg=NONE

vim/.vimrc

@@ -77,17 +77,11 @@ nnoremap <S-Tab> :tabprevious<CR>
 nnoremap <C-t> :tabnew<CR>
 nnoremap <C-T> :tabnew<CR>:e.<CR>
 
-nnoremap ; :
-
-
 iabbrev <// </<C-X><C-O>
 let g:indentLine_char = '|'
 
-set termguicolors
-let &t_8f = "\<Esc>[38:2:%lu:%lu:%lum"
-let &t_8b = "\<Esc>[48:2:%lu:%lu:%lum"
 set colorcolumn=80
-colorscheme Tomorrow-Night-Bright
+colorscheme Tomorrow
 let g:netrw_banner=0
 let g:airline_theme='wombat'
 let g:airline#extensions#tabline#enabled = 1