Add partial config for music streaming player (ncspot)

installs_and_builds/s14_audio_player

@@ -1,5 +1,9 @@
 #!/bin/zsh
 
-# possible mpd clients to consider: ncmpc, inori
+# local music
 ${=BOX_SETUP_INSTALL_COMMAND} mpd mpc ncmpcpp
-# TODO: ${=BOX_SETUP_INSTALL_COMMAND} <spotify stuff here>
+# possible mpd clients to consider: ncmpc, inori
+
+# spotify
+# TODO: decide if i want to use the package-manager install below, or build from source
+# ${=BOX_SETUP_INSTALL_COMMAND} ncspot

src_files/.config/git/config

@@ -1,3 +1,5 @@
+[init]
+	defaultBranch = master
 [user]
 	name = david
 	email = david@silverwolf.studio

src_files/.config/ncspot/config.toml

@@ -0,0 +1,57 @@
+# [theme] # from eltoncezar, similar to official spotify colors
+# background = "#191414"
+# primary = "#FFFFFF"
+# secondary = "light black"
+# title = "#1DB954"
+# playing = "#1DB954"
+# playing_selected = "#1ED760"
+# playing_bg = "#191414"
+# highlight = "#FFFFFF"
+# highlight_bg = "#484848"
+# error = "#FFFFFF"
+# error_bg = "red"
+# statusbar = "#191414"
+# statusbar_progress = "#1DB954"
+# statusbar_bg = "#1DB954"
+# cmdline = "#FFFFFF"
+# cmdline_bg = "#191414"
+# search_match = "light red"
+
+[theme] # from wojciech-zurek, tokyonight
+background = "#1a1b26"
+primary = "#9aa5ce"
+secondary = "#414868"
+title = "#9ece6a"
+playing = "#7aa2f7"
+playing_selected = "#bb9af7"
+playing_bg = "#24283b"
+highlight = "#c0caf5"
+highlight_bg = "#24283b"
+error = "#414868"
+error_bg = "#f7768e"
+statusbar = "#ff9e64"
+statusbar_progress = "#7aa2f7"
+statusbar_bg = "#1a1b26"
+cmdline = "#c0caf5"
+cmdline_bg = "#24283b"
+search_match = "#f7768e"
+
+# [theme] # from clooles, uses defaults/primary, supports transparency, for dynamic themes
+# background = "default"
+# primary = "foreground"
+# secondary = "light black"
+# title = "primary"
+# playing = "primary"
+# playing_selected = "primary"
+# playing_bg = "primary"
+# highlight = "#FFFFFF"
+# highlight_bg = "#484848"
+# error = "#FF0000"
+# error_bg = "red"
+# statusbar = "primary"
+# statusbar_progress = "primary"
+# statusbar_bg = "primary"
+# cmdline = "default"
+# cmdline_bg = "primary"
+# search_match = "light red"
+

src_files/.config/tmux/tmux.conf

@@ -5,13 +5,12 @@ unbind C-b
 set-option -g prefix C-a
 bind-key C-a send-prefix
 set -g status-style 'bg=#111111 fg=#22cc00'
-set -g base-index 1
+set -g base-index 0
 
 # vim-like movement stuff
 set-window-option -g mode-keys vi
 bind -T copy-mode-vi v send-keys -X begin-selection
 bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
-bind -r ^ last-window
 bind -r k select-pane -U
 bind -r j select-pane -D
 bind -r h select-pane -L
@@ -21,15 +20,18 @@ bind -r l select-pane -R
 bind r source-file "~/.config/tmux/tmux.conf" \; display-message "tmux.conf reloaded"
 
 # kill the current session
+# TODO: would it clash with other bindings to change these to C-q and C-w ?
 bind-key Q rename-session zzzz-temp-kill\; switch-client -p\; kill-session -t zzzz-temp-kill
-bind-key W kill-session # TODO: if i can combine this into the above when only 1 session remains, do so
+# TODO: if i can combine this into the above when only 1 session remains, do so
+bind-key W kill-session
 
-# custom find and switching for sessions using tmux-sessionizer
+# find and switching for sessions, include using tmux-sessionizer
 unbind-key f
-bind-key f run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer"
+bind-key C-f run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer"
-bind-key C-f run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer existing"
+bind-key C-s run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer existing"
 bind-key C-h run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer hub"
 bind-key C-l switch-client -l
+bind -r C-o last-window
 bind-key C-n next-window
 bind-key C-p previous-window
 

src_files/.config/zsh/.zshenv

@@ -1,5 +1,6 @@
 # default programs
-export EDITOR='vim' # TODO: update to nvim once configured
+export BROWSER='brave'
+export EDITOR='nvim'
 
 # env vars used for my organization structure
 export DIR_HOME_BOX="$HOME/dbox"
@@ -26,6 +27,12 @@ export ZDOTDIR="$XDG_CONFIG_HOME/zsh" # may already be set, set anyway
 # git
 export GIT_EDITOR="$EDITOR"
 
+# language support/tools
+export ASDF_DIR="$XDG_CONFIG_HOME/asdf"
+export ASDF_CONFIG_FILE="$ASDF_DIR/.asdfrc"
+export ASDF_DATA_DIR="$DIR_LOCAL/.asdf"
+export ASDF_TOOL_VERSIONS_FILENAME=".asdf_tool_versions"
+
 # clean-up of home dir
 export __CF_USER_TEXT_ENCODING="0x0:0x0"
 

src_files/.config/zsh/.zshrc

@@ -10,28 +10,28 @@ alias 3e='echo;echo;echo'
 alias 12e='3e;3e;3e;3e'
 alias cl='clear; '
 alias cls='clear;ls'
+
+# shortcuts for executables
+alias nv='nvim'
+alias n='nvim'
 alias tms='tmux-sessionizer'
 
 # executable name overrides
 alias ls='ls -F'
 alias youtube-dl='youtube-dl --write-info-json'
 
-# git stuff
-alias gfo='git fetch origin'
-alias gpo='git pull origin'
-alias gfpo='git fetch origin; git pull origin'
-
 # misc commands
-alias pdt='ping -c 4 drinkingtea.net'
+alias pdt='ping -c 2 drinkingtea.net'
+alias ppw='ping -c 2 pinewoods.xyz'
 alias weather='curl wttr.in'
 alias shrug='echo "¯\\_(ツ)_/¯"'
+alias journal="cd $DIR_HOME_BOX; $EDITOR .current-journal"
 
 # source extensions and system-specific files
 [[ -e "$HOME/.profile" ]] && source "$HOME/.profile" # TODO: do i want to source .profile?
+[[ -a "$ZDOTDIR/zsh-general-dev" ]] && source "$ZDOTDIR/zsh-general-dev"
 [[ -a "$ZDOTDIR/zsh-life-system" ]] && source "$ZDOTDIR/zsh-life-system"
-[[ -a "$ZDOTDIR/zsh-job-rs" ]] && source "$ZDOTDIR/zsh-job-rs"
 
 # TODO: refactor the below; simplify or at least move elsewhere
-alias lintjs='npx prettier --write'
 export DEVKITARM=/opt/devkitpro/devkitARM
-. /opt/homebrew/opt/asdf/libexec/asdf.sh # TODO: ensure not duplicated asdf logic
+. $(brew --prefix asdf)/libexec/asdf.sh

src_files/.config/zsh/zsh-general-dev

@@ -0,0 +1,21 @@
+# set env vars, path updates, etc
+[[ -a $HOME/.local-box-vars ]] && source $HOME/.local-box-vars
+
+# login shortcuts
+alias assume="source assume"
+alias login-aws='aws sso login --profile'
+alias login-aws-id-list="grep sso_account_id $HOME/.aws/config"
+
+# git stuff
+alias gfo='git fetch origin'
+alias git-push-to-temp='git branch -D temp; git checkout -b temp; git push origin temp -uf; git checkout -'
+alias gpdev='git-push-to-temp'
+alias gpo='git pull origin'
+
+# code/test/linter run and build commands
+alias bel='bundle exec standardrb'
+alias bet='bundle exec rspec'
+alias lintjs='npx prettier --write'
+alias prl='poetry run black'
+alias prt='poetry run pytest'
+

src_files/.config/zsh/zsh-job-rs

@@ -1,27 +0,0 @@
-# TODO: refactor this file; separate general dev from rs specific
-# set env vars, path updates, etc
-[[ -a $HOME/.rs-vars ]] \
-  && source $HOME/.rs-vars \
-  && export PATH=$PATH:$HOME/.rd/bin \
-  && . /usr/local/opt/asdf/libexec/asdf.sh
-
-# login shortcuts
-alias assume="source assume"
-alias login-bunk='aws sso login --profile'
-alias login-bunk-id-list="grep sso_account_id $HOME/.aws/config"
-alias login-pulumi-bunk='pulumi login '$PULUMI_LOGIN_TARGET'$(aws sts get-caller-identity --query Account --output text)'
-
-# git stuff
-alias git-push-to-develop='git branch -D develop; git checkout -b develop; git push origin develop -uf; git checkout -'
-alias gpdev='git-push-to-develop'
-
-# misc shortcuts
-alias journal="cd $DIR_HOME_BOX; $EDITOR .current-journal"
-alias kra="cd $DIR_HOME_BOX/process/kra; open .current_kra"
-alias gll="cd $DIR_DEV/git/lampo/gitlab"
-alias bet='bundle exec rspec'
-alias bel='bundle exec standardrb'
-alias belr='bundle exec rubocop'
-alias prt='poetry run pytest'
-alias prl='poetry run black'
-

z_temp_post_copy_fix_vim

@@ -0,0 +1,4 @@
+#!/bin/zsh
+
+cd "$XDG_CONFIG_HOME/vim/pack/plugins/start"
+sh .plugin-git-clone-script