From d07dedc44438d8ca9c6dc0c849b11a10b1ef86bf Mon Sep 17 00:00:00 2001 From: Fuad Saud Date: Tue, 12 Sep 2017 19:10:41 -0300 Subject: [PATCH] =?UTF-8?q?=E2=80=A2=E2=80=A2=E2=80=A2=E2=80=A2=E2=80=A2<[?= =?UTF-8?q?WIP]>=E2=80=A2=E2=80=A2=E2=80=A2=E2=80=A2=E2=80=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bash/rc.bash | 1 + bin/j2w | 2 +- nu/bin/bonafont-deadletter | 6 ++++++ nu/bin/get-mapping | 6 ++++++ nu/bin/mq | 11 +++++++++++ nu/bin/mqf | 12 ++++++++++++ nu/bin/mqr | 11 +++++++++++ nu/bin/mqrf | 12 ++++++++++++ nvim/init.vim | 1 - nvim/mappings.vim | 4 ++-- nvim/plug.vim | 1 - zsh/aliases.zsh | 7 ++++--- zsh/fasd.zsh | 13 +++++++++++++ zsh/profile.zsh | 4 ++-- zsh/rc.zsh | 3 ++- 15 files changed, 83 insertions(+), 11 deletions(-) mode change 100644 => 100755 bin/j2w create mode 100755 nu/bin/bonafont-deadletter create mode 100755 nu/bin/get-mapping create mode 100755 nu/bin/mq create mode 100755 nu/bin/mqf create mode 100755 nu/bin/mqr create mode 100755 nu/bin/mqrf create mode 100644 zsh/fasd.zsh diff --git a/bash/rc.bash b/bash/rc.bash index 828363a..aedb754 100644 --- a/bash/rc.bash +++ b/bash/rc.bash @@ -14,6 +14,7 @@ fasd_cd() { alias g=git source ~/.zsh/aliases.zsh +source ~/.zsh/fasd.zsh source ~/.nurc source /usr/local/opt/chruby/share/chruby/chruby.sh diff --git a/bin/j2w b/bin/j2w old mode 100644 new mode 100755 index 7aa2872..be7a47b --- a/bin/j2w +++ b/bin/j2w @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash set -o errexit set -o nounset diff --git a/nu/bin/bonafont-deadletter b/nu/bin/bonafont-deadletter new file mode 100755 index 0000000..c732279 --- /dev/null +++ b/nu/bin/bonafont-deadletter @@ -0,0 +1,6 @@ +#!/usr/bin/env zsh + +jq -s 'map(.payload) | .[]' -r | \ + jq -s 'map(.payload) | .[]' -r | \ + jq -s 'to_entries[] | {"chunk_id": .value.id, "customer_id": .value.customer_id, "account_request_id": .value.owner_id, "cid": .value.meta.cid, "produced_at": .value.meta.produced_at}' | \ + jq -s diff --git a/nu/bin/get-mapping b/nu/bin/get-mapping new file mode 100755 index 0000000..aaf4584 --- /dev/null +++ b/nu/bin/get-mapping @@ -0,0 +1,6 @@ +#!/usr/bin/env zsh + +kind=$1 +id=$2 + +nu ser curl GET global auth /api/mapping/${kind}/${id}\?fallback=false -- -I diff --git a/nu/bin/mq b/nu/bin/mq new file mode 100755 index 0000000..cbfb205 --- /dev/null +++ b/nu/bin/mq @@ -0,0 +1,11 @@ +#!/usr/bin/env zsh + +set -o pipefail + +default_shard=s0 +default_env=prod + +shard=${1:-$default_shard} +env=${2:-$default_env} + +mqr $shard $env | jq .results diff --git a/nu/bin/mqf b/nu/bin/mqf new file mode 100755 index 0000000..5639407 --- /dev/null +++ b/nu/bin/mqf @@ -0,0 +1,12 @@ +#!/usr/bin/env zsh + +set -o pipefail + +default_shard=s0 +default_env=prod + +filename=$1 +shard=${2:-$default_shard} +env=${3:-$default_env} + +mqrf $filename $shard $env | jq .results diff --git a/nu/bin/mqr b/nu/bin/mqr new file mode 100755 index 0000000..cd5d5f3 --- /dev/null +++ b/nu/bin/mqr @@ -0,0 +1,11 @@ +#!/usr/bin/env zsh + +set -o pipefail + +default_shard=s0 +default_env=prod + +shard=${1:-$default_shard} +env=${2:-$default_env} + +nu mordor query ${1:-$default_shard} --env ${2:-$default_env} - --accept application/json diff --git a/nu/bin/mqrf b/nu/bin/mqrf new file mode 100755 index 0000000..9d9fba4 --- /dev/null +++ b/nu/bin/mqrf @@ -0,0 +1,12 @@ +#!/usr/bin/env zsh + +set -o pipefail + +default_shard=s0 +default_env=prod + +filename=$1 +shard=${2:-$default_shard} +env=${3:-$default_env} + +cat $filename | mqr $shard $env diff --git a/nvim/init.vim b/nvim/init.vim index 8a54ab3..d13bd92 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -23,7 +23,6 @@ set title set showmatch set list set nobackup -set noswapfile set undofile set lazyredraw set wildmenu diff --git a/nvim/mappings.vim b/nvim/mappings.vim index cead842..d75f907 100644 --- a/nvim/mappings.vim +++ b/nvim/mappings.vim @@ -78,7 +78,7 @@ nnoremap c map M :TagbarToggle map a :Ag map A :Ag -map m :tabnew:tcd ../ +map m :tabnew:tcd $NU_HOME/ map , :tabedit $MYVIMRC map < :execute ':tabedit' fnamemodify(resolve(expand($MYVIMRC)), ':h') @@ -101,7 +101,7 @@ vnoremap a :Tab/\w:\zs/l0l1 xmap ga (EasyAlign) nmap ga (EasyAlign) -nnoremap :GitFiles --cached --other +nnoremap :Files nnoremap b :Buffers let g:acid_goto_shorthand_mapping = 'gd' diff --git a/nvim/plug.vim b/nvim/plug.vim index c1b0f72..052d583 100644 --- a/nvim/plug.vim +++ b/nvim/plug.vim @@ -36,7 +36,6 @@ Plug 'gregsexton/MatchTag' Plug 'AndrewRadev/splitjoin.vim' Plug 'nathanaelkane/vim-indent-guides' Plug 'junegunn/vim-easy-align' -Plug 'easymotion/vim-easymotion' Plug 'SirVer/ultisnips' Plug 'honza/vim-snippets' Plug 'vim-scripts/a.vim' diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 0301480..0a54a36 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -11,7 +11,6 @@ alias vhalt="vagrant halt" alias vssh="vagrant ssh" alias vup="vagrant up" alias vi="vim" -alias v="vim" alias vplug="vim +PlugInstall +qall" alias yt="youtube-dl -t" @@ -28,7 +27,8 @@ alias sd='fasd -sid' # interactive directory selection alias sf='fasd -sif' # interactive file selection alias z='fasd_cd -d' # cd, same functionality as j in autojump alias zz='fasd_cd -d -i' # cd with interactive selection -alias j='fasd_cd -d' +alias j="fasd_jump" +alias nv="fasd_edit" alias nude="nu utils docker-env" alias nusss="nu security scope show" @@ -36,4 +36,5 @@ alias nussa="nu security scope add" alias nussf="nu security scope find" alias numq="nu mordor query so - --accept application/json | jq ." alias nuclone="nu projects clone" -alias nuzag="nu inutils zagallo" +alias zagallo="nu inutils zagallo" +alias acq="$NU_HOME/playbook-acquisition/bin/console" diff --git a/zsh/fasd.zsh b/zsh/fasd.zsh new file mode 100644 index 0000000..3771857 --- /dev/null +++ b/zsh/fasd.zsh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +function fasd_jump { + [ $# -gt 0 ] && fasd_cd -d "$*" && return + local dir + dir="$(fasd -Rdl "$1" | fzf -1 -0 --no-sort +m)" && cd "${dir}" || return 1 +} + +function fasd_edit { + [ $# -gt 0 ] && fasd -f -e ${EDITOR} "$*" && return + local file + file="$(fasd -Rfl "$1" | fzf -1 -0 --no-sort +m)" && ${EDITOR} "${file}" || return 1 +} diff --git a/zsh/profile.zsh b/zsh/profile.zsh index 265bbe2..09f9e82 100644 --- a/zsh/profile.zsh +++ b/zsh/profile.zsh @@ -19,8 +19,8 @@ fi # Editors # -export EDITOR='vim' -export VISUAL='vim' +export EDITOR='nvim' +export VISUAL='nvim' export PAGER='less' # diff --git a/zsh/rc.zsh b/zsh/rc.zsh index 6dc765b..d6d0689 100644 --- a/zsh/rc.zsh +++ b/zsh/rc.zsh @@ -18,9 +18,10 @@ unsetopt correct setopt interactivecomments -source "${ZDOTDIR:-$HOME}/.zsh/aliases.zsh" +source "${ZDOTDIR:-$HOME}/.zsh/fasd.zsh" source "${ZDOTDIR:-$HOME}/.zsh/fzf.zsh" source "${ZDOTDIR:-$HOME}/.zsh/colors.zsh" +source "${ZDOTDIR:-$HOME}/.zsh/aliases.zsh" # source completions compctl -g "${HOME}/.teamocil/*(:t:r)" teamocil