From b0fbbd8445dc2984daebb51ad4d95eb1500690f8 Mon Sep 17 00:00:00 2001 From: cyteen Date: Sat, 13 Jun 2020 11:28:52 +0100 Subject: [PATCH] Non-specific change over time. --- 001_apt-sources.sh | 6 ++- 010_alsa.sh | 2 +- 010_apt-get.sh | 5 +- 010_generate-ssh.sh | 2 +- 020_bluez-alsa_dhmake.sh | 2 +- 020_conky.sh | 2 +- 020_distcc_master.sh | 100 ++++++++++++++++++++++++++++++++++++++ 020_distcc_slave.sh | 101 +++++++++++++++++++++++++++++++++++++++ 020_djmount.sh | 2 +- 020_free42.sh | 2 +- 020_free42_from_dsc.sh | 2 +- 020_grc.sh | 2 +- 020_mkusb.sh | 3 +- 020_neovim.sh | 2 +- 020_powerline-bash.sh | 2 +- 020_qemu-arm64.sh | 4 ++ 020_rox-filer.sh | 2 +- 020_shellcheck.sh | 2 +- 020_slim.sh | 2 +- 020_tmux.sh | 81 ++++++++++++++++++++++++++++--- 020_ubuntu-kernels.sh | 66 +++++++++++++++++++++++++ 020_vim.sh | 4 +- 020_zsh_aliases.d.sh | 2 +- 020_zsh_quickstart.sh | 2 +- change-DEST.sh | 12 +++++ 25 files changed, 386 insertions(+), 26 deletions(-) create mode 100644 020_distcc_master.sh create mode 100644 020_distcc_slave.sh create mode 100644 020_qemu-arm64.sh create mode 100755 020_ubuntu-kernels.sh create mode 100644 change-DEST.sh diff --git a/001_apt-sources.sh b/001_apt-sources.sh index 7d890b3..ed20def 100755 --- a/001_apt-sources.sh +++ b/001_apt-sources.sh @@ -9,8 +9,8 @@ AVAILABLE=/etc/apt/sources.list-available mkdir -p "${AVAILABLE}" SECTION=(main contrib non-free) -#ACTIVE_LIST=('chimaera' 'chimaera-security' 'chimaera-updates' 'chimaera-backports') -ACTIVE_LIST=('beowulf' 'beowulf-security' 'beowulf-updates' 'beowulf-backports') +ACTIVE_LIST=('chimaera' 'chimaera-security' 'chimaera-updates' 'chimaera-backports') +#ACTIVE_LIST=('beowulf' 'beowulf-security' 'beowulf-updates' 'beowulf-backports') #ACTIVE_LIST=('ascii' 'ascii-security' 'ascii-updates' 'ascii-backports') #INACTIVE_LIST=('jessie' 'jessie-security' 'jessie-updates' 'jessie-backports' 'beowulf' 'beowulf-security' 'beowulf-updates' 'beowulf-backports' 'ceres') INACTIVE_LIST=('jessie' 'jessie-security' 'jessie-updates' 'jessie-backports' 'ascii' 'ascii-security' 'ascii-updates' 'ascii-backports' 'ceres') @@ -65,6 +65,8 @@ bash -c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-key apt update && apt install -y --force-yes devuan-keyring +rm /etc/apt/sources.list + #bash -c "cat > /etc/apt/sources.list.d/x2go.list" <<'EOF' ## apt-key adv --recv-keys --keyserver keys.gnupg.net E1F958385BFE2B6E ## X2Go Repository (release builds) diff --git a/010_alsa.sh b/010_alsa.sh index 7ffdaf3..ca28d43 100755 --- a/010_alsa.sh +++ b/010_alsa.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash apt remove -y --purge pulseaudio pulseaudio-module-x11 pulseaudio-utils pavucontrol gstreamer1.0-pulseaudio pacman pavumeter pavucontrol -DEST=/etc/skel +DEST=${1:-/etc/skel} # Assume clean install #kill -9 `ps aux | grep -v grep | grep start-pulseaudio | awk {'print $2'}` diff --git a/010_apt-get.sh b/010_apt-get.sh index 604b3fe..f68baa2 100755 --- a/010_apt-get.sh +++ b/010_apt-get.sh @@ -20,7 +20,10 @@ apt install -y zsync apt install -y jq apt install -y pv apt install -y rar -#apt install -y kpartx +apt install -y pixz +apt install -y xz +apt install -y unzip +apt install -y kpartx apt install -y inxi apt --force-yes install -y xmlstarlet apt install -y hexedit diff --git a/010_generate-ssh.sh b/010_generate-ssh.sh index ff284ea..9395df7 100755 --- a/010_generate-ssh.sh +++ b/010_generate-ssh.sh @@ -34,7 +34,7 @@ EOF -DEST=/etc/skel +DEST=${1:-/etc/skel} cat > ${DEST}/.zprofile <<'EOF' if [ -f ${HOME}/.ssh/id_rsa.pub ]; then diff --git a/020_bluez-alsa_dhmake.sh b/020_bluez-alsa_dhmake.sh index f083745..b758be5 100755 --- a/020_bluez-alsa_dhmake.sh +++ b/020_bluez-alsa_dhmake.sh @@ -111,7 +111,7 @@ echo ${PACKAGE}_${VERSION}_amd64.deb sudo dpkg -i ../${PACKAGE}_${VERSION}_amd64.deb -sudo apt install-y \ +sudo apt install -y \ libbluetooth-dev \ libbsd-dev \ libusb-dev \ diff --git a/020_conky.sh b/020_conky.sh index d5b2deb..ff08662 100755 --- a/020_conky.sh +++ b/020_conky.sh @@ -3,7 +3,7 @@ apt install -y conky conky-all curl jq ttf-ubuntu-font-family #USER=default USER=root -DEST=/etc/skel +DEST=${1:-/etc/skel} echo "Hidden folder conky is created if it is not there" [ -d "${DEST}/.conky" ] || mkdir -p ${DEST}/".conky" diff --git a/020_distcc_master.sh b/020_distcc_master.sh new file mode 100644 index 0000000..57e2005 --- /dev/null +++ b/020_distcc_master.sh @@ -0,0 +1,100 @@ +!#/usr/bin/env bash +apt-get install -y distcc distcc-pump ccache dmucs distccmon-gnome + +# For avahi/bonjour mdns support +apt-get install avahi-daemon avahi-utils libnss-mdns +apt-get install avahi-ui-utils avahi-discover + +# Update the symlinks found in +/usr/sbin/update-ccache-symlinks + +## distcc will use Avahi Zeroconf DNS Service Discovery (DNS-SD) to locate any available distccd servers on the local network. +# +# The distccd server must be started with --zeroconf or /etc/default/distcc STARTDISTCC set to true. +# +# NB An important caveat is that in the current implementation, pump mode (",cpp") and compression (",lzo") will never be used for hosts located via zeroconf. Enabling compression makes the distcc client and server use more CPU time, but less network traffic. The added CPU time is insignificant for pump mode. Compression is usually economical on networks slower than 100Mbps + +cat > /etc/distcc/hosts </share/dmucs/hosts-info). + +#Here is a sample hosts-info file: +# Format: machine number-of-cpus power-index +# +#linux-comp-1 4 10 +#solaris-comp-1 2 5 +#solaris-comp-2 2 5 +#old-linux-comp-1 1 4 +#old-solaris-comp-3 1 2 +#169.144.80.25 1 2 + +cat > /etc/dmuc.conf < /etc/distcc/hosts </share/dmucs/hosts-info). + +#Here is a sample hosts-info file: +# Format: machine number-of-cpus power-index +# +#linux-comp-1 4 10 +#solaris-comp-1 2 5 +#solaris-comp-2 2 5 +#old-linux-comp-1 1 4 +#old-solaris-comp-3 1 2 +#169.144.80.25 1 2 + +cat > /etc/dmuc.conf <> /etc/apt/apt.conf.d/02proxy fi -sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 54B8C8AC +sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ${PPA_KEY} sudo apt update diff --git a/020_neovim.sh b/020_neovim.sh index 4eb6ae9..c2cd30e 100755 --- a/020_neovim.sh +++ b/020_neovim.sh @@ -10,7 +10,7 @@ apt install -y #python-neovim python3-neovim #pip2 install --user --upgrade neovim #pip3 install --user --upgrade neovim -DEST=/etc/skel +DEST=${1:-/etc/skel} #ln -sfr ${DEST}/.vim ${DEST}/.config/nvim mkdir -p ${DEST}/.config/nvim diff --git a/020_powerline-bash.sh b/020_powerline-bash.sh index 6f9e2a2..9420079 100755 --- a/020_powerline-bash.sh +++ b/020_powerline-bash.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash apt install -y powerline -DEST=/etc/skel +DEST=${1:-/etc/skel} bash -c "cat > /etc/profile.d/powerline.sh" < ${DEST}/.shellcheckrc< ${DEST}/.zshrc.d/006_tmuxinator.zsh mkdir -p ${DEST}/.tmux/plugins/tpm -mkdir -p ${DEST}/.tmux/.tmuxp +mkdir -p ${DEST}/.tmuxp #cat > ${DEST}/.config/tmux/tmux.conf << 'EOF' cat > ${DEST}/.tmux.conf << 'EOF' @@ -276,3 +276,72 @@ run '/usr/share/tmux-plugin-manager/tpm' EOF # HOME=${DEST} TMUX_PLUGIN_MANAGER_PATH="${DEST}/.tmux/plugins" bash /usr/share/tmux-plugin-manager/bin/install_plugins + + +# tmux session manager examples. include in your project directory as .tmuxp.{yaml,json} +# and load with 'tmuxp load .' +# see https://github.com/tony/tmuxp-config +cat > ${DEST}/.tmuxp/docker.yaml </dev/null 2>&1 || { pip install virtualenv; } + - '[ -d .env -a -f .env/bin/activate ] && source .env/bin/activate || virtualenv .env' + - '[ ! -d .env/build ] || rm -rf .env/build' + - cd ./doc + - command -v .env/bin/tmuxp >/dev/null 2>&1 || { pip install -r requirements.pip; } + panes: + - shell_command: + - reset + - vim + - :Ex + focus: true + - pwd + - echo 'docs built to '; python -m SimpleHTTPServer 8007 + - shell_command: + - command -v watching_testrunner >/dev/null 2>&1 || { pip install watching_testrunner; } + - watching_testrunner --basepath ./ --pattern="*.rst" 'make html' +- window_name: postgresql + layout: 6da5,239x56,0,0[239x34,0,0,65,239x21,0,35{119x21,0,35,66,119x21,120,35,67}] + options: + automatic-rename: 'off' + start_directory: postgresql + panes: + - shell_command: + - vim + - :e Dockerfile + - pane + - pane +EOF + +cat > ${DEST}/.tmuxp/top.yaml < /etc/apt/sources.list-available/${APP}.list +#sudo echo "deb-src http://${URL}/${APP}/${VERSION} ${RELEASE} main" >> /etc/apt/sources.list-available/${APP}.list +# +#sudo ln -sf /etc/apt/sources.list-available/${APP}.list /etc/apt/sources.list.d/${APP}.list +# +## Bypass apt-proxy for mkusb packages +#if [ -d /etc/apt/apt.conf.d/02proxy ]; then +# if [ ! -z $(grep ${URL}) ]; then +# echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy +# fi +#else +# echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy +#fi +# +#sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ${PPA_KEY} +# +#sudo apt update +# +#sudo apt install -y --no-install-recommends $packages + +ARCH=amd64 +ARCH=arm64 + +sudo apt-get upgrade +sudo apt-get update +cd /tmp/ + +wget -c https://kernel.ubuntu.com/~kernel-ppa/mainline/v5.7-rc6/linux-headers-5.7.0-050700rc6_5.7.0-050700rc6.202005172030_all.deb +wget -c https://kernel.ubuntu.com/~kernel-ppa/mainline/v5.7-rc6/linux-headers-5.7.0-050700rc6-generic_5.7.0-050700rc6.202005172030_${ARCH}.deb +wget -c https://kernel.ubuntu.com/~kernel-ppa/mainline/v5.7-rc6/linux-image-unsigned-5.7.0-050700rc6-generic_5.7.0-050700rc6.202005172030_${ARCH}.deb +wget -c https://kernel.ubuntu.com/~kernel-ppa/mainline/v5.7-rc6/linux-modules-5.7.0-050700rc6-generic_5.7.0-050700rc6.202005172030_${ARCH}.deb + +# https://gitlab.com/ayufan-repos/rock64/linux-mainline-kernel/-/tree/mainline-master +wget -c https://github.com/ayufan-rock64/linux-mainline-kernel/releases/download/5.6.0-1137-ayufan/linux-headers-5.6.0-1137-ayufan-ge57f05e7bf8f_5.6.0-1137-ayufan_arm64.deb +wget -c https://github.com/ayufan-rock64/linux-mainline-kernel/releases/download/5.6.0-1137-ayufan/linux-image-5.6.0-1137-ayufan-ge57f05e7bf8f_5.6.0-1137-ayufan_arm64.deb + +sudo dpkg -i *.deb +sudo apt-get update + + + diff --git a/020_vim.sh b/020_vim.sh index c157911..ae06dd2 100755 --- a/020_vim.sh +++ b/020_vim.sh @@ -2,7 +2,7 @@ set -x apt install -y powerline #vim-airline vim-airline-themes -DEST=/etc/skel +DEST=${1:-/etc/skel} sed -i -e 's/"syntax on/syntax on/' /etc/vim/vimrc sed -i -e 's/"set background=dark/set background=dark/' /etc/vim/vimrc @@ -148,6 +148,7 @@ Plugin 'VundleVim/Vundle.vim' " plugin on GitHub repos Plugin 'joonty/vdebug' +Plugin 'voldikiss/vim-floaterm' Plugin 'tpope/vim-fugitive' Plugin 'jreybert/vimagit' Plugin 'wincent/command-t' @@ -160,6 +161,7 @@ Plugin 'w0ng/vim-hybrid' Plugin 'altercation/vim-colors-solarized' "Plugin 'kien/ctrlp.vim' Plugin 'ctrlpvim/ctrlp.vim' +Plugin 'liuchengxu/vim-which-key' "Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'} Plugin 'vim-airline/vim-airline' Plugin 'vim-airline/vim-airline-themes' diff --git a/020_zsh_aliases.d.sh b/020_zsh_aliases.d.sh index eee4f0b..6dc296a 100755 --- a/020_zsh_aliases.d.sh +++ b/020_zsh_aliases.d.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -DEST=/etc/skel +DEST=${1:-/etc/skel} mkdir -p ${DEST}/.zsh_aliases.d diff --git a/020_zsh_quickstart.sh b/020_zsh_quickstart.sh index 0021896..3ab73d3 100755 --- a/020_zsh_quickstart.sh +++ b/020_zsh_quickstart.sh @@ -24,7 +24,7 @@ cd ~ || exit chsh -s "$(which zsh)" "${USER}" #DEST=$HOME -DEST=/etc/skel +DEST=${1:-/etc/skel} HOME=${DEST} apt install -y git diff --git a/change-DEST.sh b/change-DEST.sh new file mode 100644 index 0000000..819e33f --- /dev/null +++ b/change-DEST.sh @@ -0,0 +1,12 @@ +FIND_DIR=/tmp +FIND_STRING='DEST=/etc/skel' +REPLACE_STRING='DEST=${1:-/etc/skel}' + +printf $0 +printf "\nBefore: \n"; grep DEST= 020* + +sed -i "s|${FIND_STRING}|${REPLACE_STRING}|g" $(find ${FIND_DIR} -type f -name "0*0_*" ! -path "$0" | xargs grep ${FIND_STRING} | awk -F: '{print $1}') + +printf "\nAfter: \n"; grep DEST= 020* + +