new: run dotfiles container Make target and zi programs fixes

Signed-off-by: Vladislav Doster <mvdoster@gmail.com>
vladdoster · Mar 14, 2022 · d404275 · d404275
1 parent 3ec0936
commit d404275
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 48 deletions.
diff --git a/Makefile b/Makefile
@@ -124,3 +124,9 @@ build-container: ## Build containerized env and install dotfiles
 			--rm \
 			--tag df-ubuntu:latest \
 			$$PWD
+
+run-container: build-container ## Run containerized dockerfiles env
+		docker run \
+			--interactive \
+			--tty \
+			df-ubuntu:latest
diff --git a/zsh/.config/zsh/zi-programs.zsh b/zsh/.config/zsh/zi-programs.zsh
@@ -12,17 +12,7 @@ zi for \
 zi for \
     from'gh-r' \
     sbin'**/bat -> bat' \
-  @sharkdp/bat \
-sbin'**/f*g' chanzuckerberg/fogg \
-sbin'**/g*i'extrawurst/gitui \
-sbin'**/g*r' idc101/git-mkver \
-sbin'**/g*w' charmbracelet/glow \
-sbin'**/gh'  cli/cli \
-sbin'**/l*t' jesseduffield/lazygit \
-sbin'**/m*k' rust-lang/mdBook \
-sbin'**/p*s' dalance/procs         \
-sbin'**/t*i' XAMPPRocky/tokei  \
-sbin'g*r'    @github/git-sizer
+  @sharkdp/bat
 
 zi for \
     from'gh-r' \
@@ -56,7 +46,7 @@ zi for \
 zi for \
     from'gh-r'  \
     sbin'**/f*g' \
-  chanzuckerberg/fogg
+  @chanzuckerberg/fogg
 
 zi for \
     from'gh-r'  \
@@ -76,7 +66,7 @@ zi for \
 zi for \
     from'gh-r' \
     sbin'**/git-mkver' \
-  idc101/git-mkver
+  @idc101/git-mkver
 
 zi for \
     from'gh-r'      \
@@ -119,7 +109,7 @@ zi for \
       && ./configure --with-oniguruma=builtin \
       && make \
       && ln -sfv $PWD/jq.1 $ZPFX/man/man1" \
-    as'null' \
+    atpull'%atclone' \
     if"(( ${+commands[jq]} == 0 ))" \
     sbin'jq' \
   @stedolan/jq
@@ -132,7 +122,7 @@ zi for \
 zi for \
     from'gh-r' \
     sbin'**/lazygit' \
-  jesseduffield/lazygit
+  @jesseduffield/lazygit
 
 zi for \
     as'program' \
@@ -155,7 +145,7 @@ zi for \
 zi for \
     from'gh-r' \
     sbin'**/rg -> rg' \
-  BurntSushi/ripgrep
+  @BurntSushi/ripgrep
 
 zi for \
     from'gh-r' \
@@ -165,14 +155,14 @@ zi for \
 zi for \
     from'gh-r' \
     sbin'**/starship -> starship' \
-  starship/starship
+  @starship/starship
 
 zi for \
     as'program' \
-    atpull'%atclone' \
     atclone"
          autoreconf -iv \
       && ./configure --prefix=$ZPFX" \
+    atpull'%atclone' \
     make'bin/stow' \
     pick"$ZPFX/bin/stow" \
   @aspiers/stow
@@ -181,10 +171,11 @@ zi for \
     as"tmux=$ZPFX/tmux" \
     from'gh-r' \
     mv'tmux* -> tmux' \
+    make'-j' \
     pick'tmux' \
   @tmux/tmux
 
 zi for \
     from'gh-r' \
     sbin'**/t*i -> tokei' \
-  XAMPPRocky/tokei
+  @XAMPPRocky/tokei
diff --git a/zsh/.config/zsh/zinit.zsh b/zsh/.config/zsh/zinit.zsh
@@ -13,12 +13,12 @@
 function error() { print -P "%F{160}[ERROR] ---%f%b $1" >&2 && exit 1; }
 function info() { print -P "%F{34}[INFO] ---%f%b $1"; }
 #=== ZINIT ============================================
-typeset -gAH ZINIT;
-ZINIT[HOME_DIR]=$XDG_DATA_HOME/zsh/zinit  ZPFX=$ZINIT[HOME_DIR]/polaris
-ZINIT[BIN_DIR]=$ZINIT[HOME_DIR]/zinit.git ZINIT[OPTIMIZE_OUT_DISK_ACCESSES]=1
-ZINIT[COMPLETIONS_DIR]=$ZINIT[HOME_DIR]/completions ZINIT[SNIPPETS_DIR]=$ZINIT[HOME_DIR]/snippets
-ZINIT[ZCOMPDUMP_PATH]=$ZINIT[HOME_DIR]/zcompdump    ZINIT[PLUGINS_DIR]=$ZINIT[HOME_DIR]/plugins
-ZI_REPO='zdharma-continuum'; GH_RAW_URL='https://raw.githubusercontent.com'
+GH_RAW_URL='https://raw.githubusercontent.com'
+ZSH_CFG="$HOME/.config/zsh"; ZI_REPO='zdharma-continuum';
+typeset -gAH ZINIT; ZINIT[HOME_DIR]=${XDG_DATA_HOME:-$HOME/.local/share/zsh/zinit};
+ZINIT[BIN_DIR]=$ZINIT[HOME_DIR]/zinit.git;     ZINIT[COMPLETIONS_DIR]=$ZINIT[HOME_DIR]/completions
+ZINIT[PLUGINS_DIR]=$ZINIT[HOME_DIR]/plugins;   ZINIT[OPTIMIZE_OUT_DISK_ACCESSES]=1;
+ZINIT[SNIPPETS_DIR]=$ZINIT[HOME_DIR]/snippets; ZINIT[ZCOMPDUMP_PATH]=$ZINIT[HOME_DIR]/zcompdump;
 if [[ ! -e $ZINIT[BIN_DIR] ]]; then
   info 'Downloading Zinit' \
     && command git clone \
@@ -37,23 +37,24 @@ source $ZINIT[BIN_DIR]/zinit.zsh \
   && (( ${+_comps} )) \
   && _comps[zinit]=_zinit
 #=== PROMPT & THEME ===================================
+zi is-snippet for OMZL::{'functions','history','git','theme-and-appearance'}.zsh
 zi light-mode for \
-    compile'(pure|async).zsh' multisrc'(pure|async).zsh' atinit"
-        PURE_GIT_DOWN_ARROW='↓'; PURE_GIT_UP_ARROW='↑'
-        PURE_PROMPT_SYMBOL='ᐳ'; PURE_PROMPT_VICMD_SYMBOL='ᐸ'
-        zstyle ':prompt:pure:git:action' color 'yellow'
-        zstyle ':prompt:pure:git:branch' color 'blue'
-        zstyle ':prompt:pure:git:dirty' color 'red'
-        zstyle ':prompt:pure:path' color 'cyan'
-        zstyle ':prompt:pure:prompt:success' color 'green'" \
-    sindresorhus/pure \
     "$ZI_REPO"/zinit-annex-{'bin-gem-node','patch-dl','rust','submods'}
+    # compile'(pure|async).zsh' multisrc'(pure|async).zsh' atinit"
+    #     PURE_GIT_DOWN_ARROW='↓'; PURE_GIT_UP_ARROW='↑'
+    #     PURE_PROMPT_SYMBOL='ᐳ'; PURE_PROMPT_VICMD_SYMBOL='ᐸ'
+    #     zstyle ':prompt:pure:git:action' color 'yellow'
+    #     zstyle ':prompt:pure:git:branch' color 'blue'
+    #     zstyle ':prompt:pure:git:dirty' color 'red'
+    #     zstyle ':prompt:pure:path' color 'cyan'
+    #     zstyle ':prompt:pure:prompt:success' color 'green'" \
+    # sindresorhus/pure \
     # as'completion' vladdoster/gitfast-zsh-plugin
-zinit snippet OMZL::functions.zsh
-zinit snippet OMZL::history.zsh
-zinit snippet OMZL::git.zsh
-zinit snippet OMZL::theme-and-appearance.zsh
 #=== GITHUB BINARIES ==================================
+zinit ice as"command" from"gh-r" \
+  atclone"./starship init zsh > init.zsh; ./starship completions zsh > _starship" \
+  atpull"%atclone" src"init.zsh"
+zinit light starship/starship
 zi from'gh-r' nocompile for \
     sbin'**/d*a'   dandavison/delta \
     sbin'**/d*h'   Phantas0s/devdash \
@@ -71,16 +72,11 @@ zi from'gh-r' nocompile for \
         alias ll='exa -al'; alias tree='exa --tree'
         alias ls='exa --git --group-directories-first'" \
     ogham/exa
+ #. "$ZSH_CFG"/zi-programs.zsh
 #=== COMPLETION =======================================
-zi for \
-  is-snippet OMZL::key-bindings.zsh \
-  is-snippet OMZL::completion.zsh \
-  is-snippet OMZL::correction.zsh \
-  is-snippet OMZL::directories.zsh \
-  is-snippet OMZP::colored-man-pages
-#zinit for \
-#	OMZL::{'clipboard','compfix','completion','directories','git','grep','key-bindings','termsupport'}.zsh \
-#  PZT::modules/{'history','rsync'}
+zinit for \
+    OMZL::{'clipboard','compfix','completion','directories','git','grep','key-bindings','termsupport'}.zsh \
+    PZT::modules/{'history','rsync'}
 zi as'completion' is-snippet for \
     OMZP::{'git','golang/_golang','pip/_pip','terraform/_terraform','npm'} \
     $GH_RAW_URL/Homebrew/brew/master/completions/zsh/_brew \
@@ -116,7 +112,6 @@ zi light-mode for \
         zsh-users/zsh-autosuggestions \
     atinit" typeset -gA FAST_HIGHLIGHT; FAST_HIGHLIGHT[git-cmsg-len]=100; zpcompinit; zpcdreplay;" $ZI_REPO/fast-syntax-highlighting
 #=== PIP COMPLETION ===================================
-#=== PIP COMPLETION ===================================
 # function _pip_completion {
 #   local words cword && read -Ac words && read -cn cword
 #   reply=(