From 267b1cd9ccc5a8e70bfba41e385f9b0fb6115175 Mon Sep 17 00:00:00 2001 From: Ambrose Chua Date: Wed, 16 Jan 2019 11:27:00 +0800 Subject: [PATCH] Add macOS Brewfile and jq --- .brewfile | 158 +++++++++++++++++++++++++++++++++++++++++++++++++ .dockerfile | 3 +- .drone.yml | 10 ++++ .install/jq.sh | 14 +++++ .versions | 2 + README.md | 26 ++------ 6 files changed, 191 insertions(+), 22 deletions(-) create mode 100644 .brewfile create mode 100755 .install/jq.sh diff --git a/.brewfile b/.brewfile new file mode 100644 index 0000000..36ab6c9 --- /dev/null +++ b/.brewfile @@ -0,0 +1,158 @@ +cask_args appdir: "/Applications" +tap "homebrew/cask" + +# system +brew "wget" +brew "xz" +brew "gnupg" +brew "git" +brew "zsh" +brew "neovim" +# languages +brew "python" +brew "go" +brew "node" +# more system +cask "docker" +# desktop +tap "koekeishiya/formulae" +brew "koekeishiya/formulae/skhd" +brew "koekeishiya/formulae/chunkwm" +cask "bitbar" +cask "iterm2-nightly" +cask "firefoxnightly" + +# user tools +brew "thefuck" +brew "pass" +brew "jq" +brew "kubernetes-cli" +tap "minio/stable" +brew "minio/stable/mc" + + +# extra system +brew "coreutils" +brew "gawk" +brew "gnu-getopt" +brew "gnu-sed" +brew "figlet" +brew "toilet" +brew "lolcat" +#brew "neofetch" +brew "openssl" +brew "p7zip" +brew "unrar" +#brew "fswatch" +brew "watch" +brew "socat" +brew "htop" +brew "tmux" +brew "mosh" +#brew "qemu" +cask "intel-haxm" +cask "virtualbox" +cask "xquartz" +cask "daisydisk" +#cask "osxfuse" +#cask "gpgtools" +#cask "karabiner-elements" +cask "switchresx" +#cask "keycastr" # replaced by custom keycastr +cask "whoozle-android-file-transfer-nightly" +cask "intel-power-gadget" +#cask "wacom-tablet" + +# extra tools +brew "highlight" +brew "pwgen" +brew "ghi" +brew "hadolint" +brew "upx" +#brew "kubernetes-helm" +#brew "terraform" +brew "ykman" +cask "keybase" +#cask "yubikey-neo-manager" +#cask "yubikey-personalization-gui" +#cask "yubikey-piv-manager" +#cask "dash" + +# extra network +brew "aria2" +brew "shadowsocks-libev", restart_service: true +#brew "wrk" +#cask "tuntap" +# speedtest.net app + +# extra database +#brew "cockroach" +#brew "redis" + +# extra analysis +brew "masscan" +brew "nmap" +#brew "binwalk" +#brew "foremost" +#brew "pngcheck" +#cask "burp-suite" +#cask "cutter" +#cask "binary-ninja" +cask "wireshark" + +# extra media +brew "ffmpeg" +#brew "lame" +#brew "sox" +#brew "gifsicle" +brew "graphicsmagick", args: ["with-webp"] +brew "asciinema" +cask "gimp" +#cask "adobe-dng-converter" +cask "inkscape" +# audacity +cask "obs" +cask "vlc" +# blackmagic davinci resolve +# blackmagic disk speed test +# epson scan +cask "skyfonts" + +# extra electronics +#brew "avrdude" +#brew "stlink" +#cask "arduino" +cask "betaflight-configurator" +cask "coolterm" +#cask "etcher" +cask "kicad" + +# extra lang +brew "sbt" +#cask "android-sdk" +cask "java-beta" +#cask "qt-creator" + +# extra apps +tap "browsh-org/homebrew-browsh" +brew "browsh-org/homebrew-browsh/browsh" +cask "google-chrome" +cask "brave-browser" +cask "libreoffice" +cask "figma" +cask "spotify" + +# extra apps social +cask "slack" +cask "trello" +cask "telegram" +cask "signal" +cask "whatsapp" +cask "discord" +cask "skype" +cask "flume" +cask "ghost" + +# extra apps gaming +cask "steam" + diff --git a/.dockerfile b/.dockerfile index 8d56e6d..d84df36 100644 --- a/.dockerfile +++ b/.dockerfile @@ -27,7 +27,7 @@ RUN ./.install/python.sh RUN ./.install/golang-source.sh RUN ./.install/node-source.sh #RUN ./.install/jdk.sh -# system +# more system RUN ./.install/docker.sh # desktop #RUN ./.install/desktop.sh @@ -53,6 +53,7 @@ RUN ./.install/pass.sh RUN ./.install/packr.sh RUN ./.install/caddy.sh RUN ./.install/httpie.sh +RUN ./.install/jq.sh RUN ./.install/kubectl.sh RUN ./.install/minio-client.sh RUN ./.install/yarn.sh diff --git a/.drone.yml b/.drone.yml index 67cbc12..39fe5ac 100644 --- a/.drone.yml +++ b/.drone.yml @@ -175,6 +175,16 @@ steps: - ~/.local/bin/http --version --- kind: pipeline +name: test-jq +steps: +- name: test-jq + image: alpine:latest + commands: + - ./.install/core.sh + - ./.install/jq.sh + - ~/.local/bin/jq --version +--- +kind: pipeline name: test-kubectl steps: - name: test-kubectl diff --git a/.install/jq.sh b/.install/jq.sh new file mode 100755 index 0000000..3a1a67b --- /dev/null +++ b/.install/jq.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e +source ./.versions + +echo +echo "Installing jq $JQ_VERSION..." +echo + +mkdir -p ~/.local/bin +curl -fLo ~/.local/bin/jq \ + https://github.com/stedolan/jq/releases/download/jq-$JQ_VERSION/jq-linux64 +chmod a+x ~/.local/bin/jq + diff --git a/.versions b/.versions index 4d34041..e86936e 100755 --- a/.versions +++ b/.versions @@ -23,5 +23,7 @@ export ZSH_SYNTAX_HIGHLIGHTING_VERSION=0.6.0 export CADDY_VERSION=0.11.1 +export JQ_VERSION=1.6 + export KUBECTL_VERSION=1.13.2 diff --git a/README.md b/README.md index 6725a97..e1869a5 100644 --- a/README.md +++ b/README.md @@ -22,27 +22,10 @@ runenv -h ### macOS ```sh -brew install \ - wget \ - xz \ - gnupg \ - git \ - zsh \ - neovim \ - python \ - go \ - node \ - \ - pass -brew cask install \ - java8 \ - docker \ - iterm2-nightly \ - bitbar \ - firefoxnightly +brew bundle --file=.brewfile ./.install/dircolors.sh ./.install/pure.sh -pip3 install --user thefuck +# thefuck is installed using homebrew ./.install/zsh-autosuggestions.sh ./.install/zsh-syntax-highlighting.sh ./.install/plug.sh @@ -51,8 +34,9 @@ pip3 install --user thefuck ./.install/packr.sh ./.install/caddy.sh ./.install/httpie.sh -./.install/kubectl.sh -./.install/minio-client.sh +# jq is installed using homebrew +# kubectl is installed using homebrew +# minio-client is installed using homebrew ./.install/yarn.sh yadm clone git@github.com:serverwentdown/env.git ```