diff --git a/dot-conf/.tmux.conf b/dot-conf/.tmux.conf index 2470547..c44c531 100644 --- a/dot-conf/.tmux.conf +++ b/dot-conf/.tmux.conf @@ -14,6 +14,12 @@ bind-key j select-pane -D bind-key k select-pane -U bind-key l select-pane -R +unbind C-h +unbind C-j +unbind C-k +unbind C-l + + # Start windows and panes at 1, not 0 set -g base-index 1 setw -g pane-base-index 1 diff --git a/dot-conf/.zshrc b/dot-conf/.zshrc index 191f067..ccc6955 100644 --- a/dot-conf/.zshrc +++ b/dot-conf/.zshrc @@ -5,11 +5,22 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" fi -source ~/powerlevel10k/powerlevel10k.zsh-theme +# End of lines added by compinstall +source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh +HISTFILE=~/.zsh_history +HISTSIZE=10000 +SAVEHIST=10000 +setopt appendhistory + +# asdf +. "$HOME/.asdf/asdf.sh" +fpath=(${ASDF_DIR}/completions $fpath) +autoload -Uz compinit && compinit + # bindkeys bindkey "^[[1;5C" forward-word bindkey "^[[1;5D" backward-word @@ -22,19 +33,28 @@ bindkey "^[[3~" delete-char autoload -U select-word-style select-word-style bash +# aliases alias ll="exa --icons -la" alias ls="ll" alias cat="bat --style=auto" - alias docs="cd /mnt/e/Windows/Documents" +alias rld="source ${HOME}/.zshrc" +alias zshrc="lvim ${HOME}/.zshrc && rld" -# asdf -. "$HOME/.asdf/asdf.sh" +# paths +export PATH=${PATH}:${HOME}/.local/bin +export PATH=${PATH}:${HOME}/repos/personal-devboot/my-scripts/shell -# append completions to fpath -fpath=(${ASDF_DIR}/completions $fpath) +# docker +DOCKER_DISTRO="Arch" +DOCKER_DIR=/mnt/wsl/shared-docker +DOCKER_SOCK="$DOCKER_DIR/docker.sock" +export DOCKER_HOST="unix://$DOCKER_SOCK" +if [ ! -S "$DOCKER_SOCK" ]; then + mkdir -pm o=,ug=rwx "$DOCKER_DIR" + chgrp docker "$DOCKER_DIR" + /mnt/c/Windows/System32/wsl.exe -d $DOCKER_DISTRO sh -c "nohup sudo -b dockerd < /dev/null > $DOCKER_DIR/dockerd.log 2>&1" +fi -# initialise completions with ZSH's compinit -fpath+=~/.zfunc - -autoload -Uz compinit && compinit +# end of file +eval "$(zoxide init zsh)"