diff --git a/.020_waterfox.sh.swp b/.020_waterfox.sh.swp deleted file mode 100644 index 766c61b..0000000 Binary files a/.020_waterfox.sh.swp and /dev/null differ diff --git a/010_apt-get.sh b/010_apt-get.sh index 996474e..b2a2e33 100644 --- a/010_apt-get.sh +++ b/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 diff --git a/010_salt.sh b/010_salt.sh deleted file mode 100644 index 855c57f..0000000 --- a/010_salt.sh +++ /dev/null @@ -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 diff --git a/010_saltstack.sh b/010_saltstack.sh index 3a8908d..9c2ff97 100644 --- a/010_saltstack.sh +++ b/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 \ diff --git a/010_sysctl.sh b/010_sysctl.sh index 1ee5ff9..0706067 100644 --- a/010_sysctl.sh +++ b/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 diff --git a/020_bluez-alsa.sh b/020_bluez-alsa.sh index d17bc97..07f6759 100644 --- a/020_bluez-alsa.sh +++ b/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 '' 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 + +#------------------------------------------------------------------------ diff --git a/020_etcher.io.sh b/020_etcher.io.sh deleted file mode 100644 index 6f469f5..0000000 --- a/020_etcher.io.sh +++ /dev/null @@ -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 diff --git a/020_grc.sh b/020_grc.sh index afcf265..5febfdb 100644 --- a/020_grc.sh +++ b/020_grc.sh @@ -1,6 +1,8 @@ apt-get -y install grc -ALIAS_FILE=~/.zsh_aliases.d/003-grc.sh -mkdir -p ${ALIAS_FILE} +ALIAS_HOME=~/.zsh_aliases.d/ +ALIAS_FILE=${ALIAS_HOME}/003-grc.sh + +mkdir -p ${ALIAS_HOME} cat > ${ALIAS_FILE} <<'EOF' # coloured output using grc diff --git a/020_lsd.sh b/020_lsd.sh index 89275a7..8bf0472 100644 --- a/020_lsd.sh +++ b/020_lsd.sh @@ -31,11 +31,11 @@ apt-get -f install # --icon ... When to print the icons [default: auto] [possible values: always, auto, never] # --icon-theme ... Whether to use fancy or unicode icons [default: fancy] [possible values: fancy, unicode] - -ALIAS_FILE=/home/default/.zsh_aliases.d/003-lsd.sh +mkdir -p ~/.zsh_aliases.d/ +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 diff --git a/020_nanorc.sh b/020_nanorc.sh index 449b2dc..60e175c 100644 --- a/020_nanorc.sh +++ b/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 \ - --pkgname=nanorc \ - --pkgversion=1.0 \ - --pkgrelease=1 \ - --pkgarch=amd64 \ - --pkggroup=admin \ - --pkglicense=LICENSE \ - --pkgsource=${LATEST_URL} \ - --maintainer=cyteen@ring-zero.co.uk \ - --requires=nano,unzip,wget \ - -D \ +#checkinstall -y --fstrans \ +# --pkgname=nanorc \ +# --pkgversion=1.0 \ +# --pkgrelease=1 \ +# --pkgarch=amd64 \ +# --pkggroup=admin \ +# --pkglicense=LICENSE \ +# --pkgsource=${LATEST_URL} \ +# --maintainer=cyteen@ring-zero.co.uk \ +# --requires=nano,unzip,wget \ +# -D \ git clone ${LATEST_URL} ${DIR_NAME} cp ${DIR_NAME}/*.nanorc ${install_path} && \ echo "include ${install_path}/*.nanorc" >> /etc/nanorc diff --git a/020_powerline-bash.sh b/020_powerline-bash.sh index 6aa3f9f..f58c234 100644 --- a/020_powerline-bash.sh +++ b/020_powerline-bash.sh @@ -1,3 +1,4 @@ +apt-get -y install powerline bash -c "cat > /etc/profile.d/powerline.sh" < ~/.config/powerline/config.json" < ~/.config/rox.sourceforge.net/ROX-Filer/Options <<'EOF' + + + + + + + + + + + + + + @@ -19,25 +33,19 @@ cat > ~/.config/rox.sourceforge.net/ROX-Filer/Options <<'EOF' - - - - - - @@ -46,7 +54,6 @@ cat > ~/.config/rox.sourceforge.net/ROX-Filer/Options <<'EOF' - @@ -56,7 +63,6 @@ cat > ~/.config/rox.sourceforge.net/ROX-Filer/Options <<'EOF' - @@ -67,24 +73,19 @@ cat > ~/.config/rox.sourceforge.net/ROX-Filer/Options <<'EOF' - - - - - @@ -96,7 +97,6 @@ cat > ~/.config/rox.sourceforge.net/ROX-Filer/Options <<'EOF' - diff --git a/020_themes.sh b/020_themes.sh index eeb28fe..ea50757 100644 --- a/020_themes.sh +++ b/020_themes.sh @@ -1,3 +1,14 @@ -apt-get install mate-themes -apt-get install albatross-gtk-theme -apt-get install blackbird-gtk-theme +apt-get install -y mate-themes +apt-get install -y albatross-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" + diff --git a/020_tmux.sh b/020_tmux.sh index 0f92d59..0aa5b53 100644 --- a/020_tmux.sh +++ b/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-shell /bin/fish -# set-option -g default-shell "/usr/bin/fish" +set-option -g default-terminal xterm-256color 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 -t vi-copy 'y' copy-selection - - +bind-key -Tcopy-mode-vi 'v' send -X begin-selection +bind-key -Tcopy-mode-vi 'y' send -X copy-selection # Removes ESC delay set -sg escape-time 0 diff --git a/020_torbrowser.sh b/020_torbrowser.sh index b0ef2c5..9d03b4e 100644 --- a/020_torbrowser.sh +++ b/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 diff --git a/020_vim.sh b/020_vim.sh index 10226b5..825087c 100644 --- a/020_vim.sh +++ b/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("") +silent! call togglebg#map("") " Airline customizations let g:airline#extensions#tabline#enabled = 1 diff --git a/020_waterfox.sh b/020_waterfox.sh index 0721cd6..704cb65 100644 --- a/020_waterfox.sh +++ b/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 diff --git a/020_zsh.sh b/020_zsh.sh index b0fe72a..75082c0 100644 --- a/020_zsh.sh +++ b/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/ -git clone http://github.com/robbyrussell/oh-my-zsh ~/.zgen/robbyrussell/oh-my-zsh-master/ +mkdir -p ~/.zgen/robbyrussell/ +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 diff --git a/020_zsh_aliases.d.sh b/020_zsh_aliases.d.sh index b9fccad..352b33f 100644 --- a/020_zsh_aliases.d.sh +++ b/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' diff --git a/050_wicd.sh b/050_wicd.sh index 21458e3..83c605f 100644 --- a/050_wicd.sh +++ b/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,^\(key = \).*,\1'794900B697',' /etc/wicd/wireless-settings.conf +sed -i 's,^\(essid = \).*,\1'vodafoneBFAF1F',' /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