diff --git a/config/scwrypts/vundle.zsh b/config/scwrypts/vundle.zsh index 3f45591..c1fd018 100644 --- a/config/scwrypts/vundle.zsh +++ b/config/scwrypts/vundle.zsh @@ -10,6 +10,10 @@ VUNDLE__BUILD__nerdtree() { # ... build steps from /home/w0ryn/.vim/nerdtree } +VUNDLE__BUILD__unicode.vim() { + # ... build steps from /home/w0ryn/.vim/unicode.vim +} + VUNDLE__BUILD__vim-dim() { # ... build steps from /home/w0ryn/.vim/vim-dim } diff --git a/setup/cleanup.zsh b/setup/cleanup.zsh deleted file mode 100644 index d75e05e..0000000 --- a/setup/cleanup.zsh +++ /dev/null @@ -1,11 +0,0 @@ -yN 'keep logfile?' || { - rm "$LOGFILE" \ - || ERROR "unable to remote '$LOGFILE'" \ - ; -} - -SUCCESS ' - .wryn setup complete; have a nice day :) - ' - -exit 0 diff --git a/setup/config.zsh b/setup/config.zsh index 2590d1d..8bd787f 100644 --- a/setup/config.zsh +++ b/setup/config.zsh @@ -36,8 +36,6 @@ CONFIG__VIM() { CONFIG__ENV vim || return 1 CONFIG__RC vim || return 2 - [ $COMPILE_VIM ] && [[ $COMPILE_VIM -eq 1 ]] && return 0 - STATUS 'starting vim setup' SCWRYPTS --name system/vim/vundle/install --group scwrypts --type zsh || return 1 } @@ -49,11 +47,15 @@ CONFIG__ENV() { local LOCAL_CONFIG="$HOME/.config/wryn/env.$1" [ -f $LOCAL_CONFIG ] && { - WARNING "local $1 configuration exists ($LOCAL_CONFIG)" - yN 'overwrite this configuration?' || return 0 + case $OVERWRITE_EXISTING in + 0 ) return 0 ;; + 1 ) + WARNING "local $1 configuration exists ($LOCAL_CONFIG)" + yN 'overwrite this configuration?' || return 0 - mv "$LOCAL_CONFIG" "$LOCAL_CONFIG.bak" >/dev/null 2>&1 \ - && INFO "created backup of local configuration ($LOCAL_CONFIG.bak)" + mv "$LOCAL_CONFIG" "$LOCAL_CONFIG.bak" >/dev/null 2>&1 \ + && INFO "created backup of local configuration ($LOCAL_CONFIG.bak)" + esac } STATUS "setting up $1 configuration ($LOCAL_CONFIG)" @@ -72,7 +74,7 @@ CONFIG__ENV() { || FAIL 1 "unable to create $1 configuration" \ ; - EDIT "$LOCAL_CONFIG" + EDITOR=vim VISUAL=vim EDIT "$LOCAL_CONFIG" } diff --git a/setup/os-dependencies/arch.min.txt b/setup/os-dependencies/arch.min.txt index 8dea324..e58e3e0 100644 --- a/setup/os-dependencies/arch.min.txt +++ b/setup/os-dependencies/arch.min.txt @@ -6,6 +6,7 @@ cowsay figlet fzf htop +jq lolcat ncurses python diff --git a/setup/os-dependencies/arch.txt b/setup/os-dependencies/arch.txt index abffe70..ec446d1 100644 --- a/setup/os-dependencies/arch.txt +++ b/setup/os-dependencies/arch.txt @@ -14,6 +14,7 @@ i3-wm i3lock-color i3status jdk-openjdk +jq lolcat monaspace-font mono diff --git a/setup/run b/setup/run index b287175..712cf64 100755 --- a/setup/run +++ b/setup/run @@ -1,17 +1,18 @@ #!/bin/zsh cd "${0:a:h}" +OVERWRITE_EXISTING=0 while [[ $# -gt 0 ]] do case $1 in --force-root ) FORCE_ROOT=1 ;; --ci ) export CI=1 ;; + --overwrite ) OVERWRITE_EXISTING=1 ;; + --no-compile-dmenu ) COMPILE_DMENU=0 ;; - --no-compile-vim ) COMPILE_VIM=0 ;; --min ) MIN=1 - COMPILE_VIM=0 COMPILE_DMENU=0 ;; esac @@ -32,4 +33,7 @@ INFO "installation start : $(date)" 2>> "$LOGFILE" INFO "installation complete: $(date)" 2>> "$LOGFILE" ################################################################################ -source "$DOTWRYN_PATH/setup/cleanup.zsh" +yN 'keep logfile?' \ + || { rm "$LOGFILE" || ERROR "unable to remove '$LOGFILE'" } + +SUCCESS "\n.wryn setup complete; have a nice day :)\n"