From f159d2cab98e321a568b08bc264c1a7a281965ec Mon Sep 17 00:00:00 2001 From: Ambrose Chua Date: Tue, 9 Oct 2018 19:03:43 +0800 Subject: [PATCH] More sway and move to .local/bin --- .Xresources | 61 +++++++++++++++++++++++++++++++++++++++++++++ .config/sway/config | 2 +- .dockerfile | 21 ++++++++-------- .install/kubectl.sh | 8 +++--- .install/pure.sh | 10 ++++---- .install/thefuck.sh | 8 +++--- .install/yadm.sh | 10 ++++---- .zshrc | 8 ++++++ 8 files changed, 98 insertions(+), 30 deletions(-) create mode 100644 .Xresources diff --git a/.Xresources b/.Xresources new file mode 100644 index 0000000..701885d --- /dev/null +++ b/.Xresources @@ -0,0 +1,61 @@ +XTerm.vt100.saveLines: 4096 +XTerm.vt100.faceName: Ubuntu Mono:size=11 + +// https://raw.githubusercontent.com/solarized/xresources/master/Xresources.dark + +#define S_base03 #002b36 +#define S_base02 #073642 +#define S_base01 #586e75 +#define S_base00 #657b83 +#define S_base0 #839496 +#define S_base1 #93a1a1 +#define S_base2 #eee8d5 +#define S_base3 #fdf6e3 + +*background: S_base03 +*foreground: S_base0 +*fadeColor: S_base03 +*cursorColor: S_base1 +*pointerColorBackground:S_base01 +*pointerColorForeground:S_base1 + +#define S_yellow #b58900 +#define S_orange #cb4b16 +#define S_red #dc322f +#define S_magenta #d33682 +#define S_violet #6c71c4 +#define S_blue #268bd2 +#define S_cyan #2aa198 +#define S_green #859900 + +!! black dark/light +*color0: S_base02 +*color8: S_base03 + +!! red dark/light +*color1: S_red +*color9: S_orange + +!! green dark/light +*color2: S_green +*color10: S_base01 + +!! yellow dark/light +*color3: S_yellow +*color11: S_base00 + +!! blue dark/light +*color4: S_blue +*color12: S_base0 + +!! magenta dark/light +*color5: S_magenta +*color13: S_violet + +!! cyan dark/light +*color6: S_cyan +*color14: S_base1 + +!! white dark/light +*color7: S_base2 +*color15: S_base3 diff --git a/.config/sway/config b/.config/sway/config index 3c118d2..ac7dc7f 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -14,7 +14,7 @@ set $down j set $up k set $right l # Your preferred terminal emulator -set $term urxvt -e /bin/zsh +set $term xterm # Your preferred application launcher set $menu dmenu_run diff --git a/.dockerfile b/.dockerfile index 421bb9d..3bd6832 100644 --- a/.dockerfile +++ b/.dockerfile @@ -19,17 +19,11 @@ RUN ./.install/archival.sh RUN ./.install/git.sh RUN ./.install/zsh.sh RUN ./.install/neovim.sh -# shell config, env manager -RUN ./.install/pure.sh -RUN ./.install/thefuck.sh -RUN ./.install/yadm.sh # languages +RUN ./.install/python.sh RUN ./.install/golang.sh RUN ./.install/node.sh -RUN ./.install/python.sh #RUN ./.install/jdk.sh -# tools -RUN ./.install/kubectl.sh # switch to user @@ -37,16 +31,21 @@ USER ambrose # install user programs -# shell, editor -RUN ./.install/plug.sh +# shell config +RUN ./.install/pure.sh +RUN ./.install/thefuck.sh RUN ./.install/zsh-autosuggestions.sh +# editor +RUN ./.install/plug.sh # tools +RUN ./.install/yadm.sh RUN ./.install/vgo.sh RUN ./.install/packr.sh RUN ./.install/caddy.sh +RUN ./.install/kubectl.sh #RUN ./.install/gradlr.sh -RUN ./.install/grunt.sh -RUN ./.install/gulp.sh +#RUN ./.install/grunt.sh +#RUN ./.install/gulp.sh # open login shell by default diff --git a/.install/kubectl.sh b/.install/kubectl.sh index 1b22a5c..0035c2e 100755 --- a/.install/kubectl.sh +++ b/.install/kubectl.sh @@ -7,10 +7,10 @@ echo echo "Installing kubectl $KUBECTL_VERSION..." echo -apk add --no-cache --virtual .build-deps \ +sudo apk add --no-cache --virtual .build-deps \ curl -curl -fLo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl -chmod a+x /usr/local/bin/kubectl +curl -fLo ~/.local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl +chmod a+x ~/.local/bin/kubectl -apk del .build-deps +sudo apk del .build-deps diff --git a/.install/pure.sh b/.install/pure.sh index 9627052..651922d 100755 --- a/.install/pure.sh +++ b/.install/pure.sh @@ -7,13 +7,13 @@ echo echo "Installing pure-prompt for zsh..." echo -apk add --no-cache --virtual .build-deps \ +sudo apk add --no-cache --virtual .build-deps \ curl -mkdir -p /usr/local/share/zsh/site-functions -curl -fLo /usr/local/share/zsh/site-functions/prompt_pure_setup \ +mkdir -p ~/.zsh/functions +curl -fLo ~/.zsh/functions/prompt_pure_setup \ https://raw.githubusercontent.com/sindresorhus/pure/master/pure.zsh -curl -fLo /usr/local/share/zsh/site-functions/async \ +curl -fLo ~/.zsh/functions/async \ https://raw.githubusercontent.com/sindresorhus/pure/master/async.zsh -apk del .build-deps +sudo apk del .build-deps diff --git a/.install/thefuck.sh b/.install/thefuck.sh index 03f2ad8..666e11f 100755 --- a/.install/thefuck.sh +++ b/.install/thefuck.sh @@ -7,14 +7,14 @@ echo echo "Installing thefuck for zsh..." echo -apk add --no-cache --virtual .build-deps \ +sudo apk add --no-cache --virtual .build-deps \ build-base \ python3-dev \ linux-headers -apk add --no-cache \ +sudo apk add --no-cache \ python3 -pip3 install thefuck +pip3 install --user thefuck -apk del .build-deps +sudo apk del .build-deps diff --git a/.install/yadm.sh b/.install/yadm.sh index 1d891ec..762d66b 100755 --- a/.install/yadm.sh +++ b/.install/yadm.sh @@ -7,14 +7,14 @@ echo echo "Installing yadm..." echo -apk add --no-cache --virtual .build-deps \ +sudo apk add --no-cache --virtual .build-deps \ curl -apk add --no-cache \ +sudo apk add --no-cache \ git \ bash -curl -fLo /usr/local/bin/yadm https://github.com/TheLocehiliosan/yadm/raw/master/yadm -chmod a+x /usr/local/bin/yadm +curl -fLo ~/.local/bin/yadm https://github.com/TheLocehiliosan/yadm/raw/master/yadm +chmod a+x ~/.local/bin/yadm -apk del .build-deps +sudo apk del .build-deps diff --git a/.zshrc b/.zshrc index db4cfe3..da97454 100644 --- a/.zshrc +++ b/.zshrc @@ -17,17 +17,25 @@ setopt auto_cd setopt interactivecomments setopt extended_glob +# zsh imports +fpath=( ~/.zsh/functions $fpath ) + # editor export EDITOR=nvim # pure +export PURE_PROMPT_SYMBOL=$ autoload -U promptinit; promptinit prompt pure # autosuggestions source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh +export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=239' +export ZSH_AUTOSUGGEST_USE_ASYNC=true +bindkey '^e' autosuggest-accept # thefuck +export PATH="$HOME/.local/bin:$PATH" eval $(thefuck --alias nope) # golang