diff --git a/.gitmodules b/.gitmodules index a4256c7..f91e601 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,12 @@ [submodule "zsh_files/powerlevel10k"] path = zsh_files/powerlevel10k url = https://github.com/romkatv/powerlevel10k.git +[submodule "tpm"] + path = dot.tmux/plugins/tpm + url = https://github.com/tmux-plugins/tpm.git +[submodule "dot.tmux/plugins/tmux-power"] + path = dot.tmux/plugins/tmux-power + url = https://git::@github.com/wfxr/tmux-power +[submodule "dot.tmux/plugins/tmux-sensible"] + path = dot.tmux/plugins/tmux-sensible + url = https://git::@github.com/tmux-plugins/tmux-sensible diff --git a/dot.tmux/plugins/tmux-power b/dot.tmux/plugins/tmux-power new file mode 160000 index 0000000..9dafd5b --- /dev/null +++ b/dot.tmux/plugins/tmux-power @@ -0,0 +1 @@ +Subproject commit 9dafd5b0504906421f904149b178c1ddb83a0580 diff --git a/dot.tmux/plugins/tmux-sensible b/dot.tmux/plugins/tmux-sensible new file mode 160000 index 0000000..25cb91f --- /dev/null +++ b/dot.tmux/plugins/tmux-sensible @@ -0,0 +1 @@ +Subproject commit 25cb91f42d020f675bb0a2ce3fbd3a5d96119efa diff --git a/dot.tmux/plugins/tpm b/dot.tmux/plugins/tpm new file mode 160000 index 0000000..99469c4 --- /dev/null +++ b/dot.tmux/plugins/tpm @@ -0,0 +1 @@ +Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 diff --git a/install.conf.yaml b/install.conf.yaml index f83cb96..86b8056 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -22,6 +22,8 @@ ~/.csirc: csirc ~/.config/kitty/kitty.conf: kitty.conf ~/.scripts: scripts + ~/.tmux.conf: tmux.conf + ~/.tmux: dot.tmux ~/.fonts/: glob: true path: resources/fonts/*.ttf diff --git a/p10k.zsh b/p10k.zsh index b7cd6ad..9da6606 100644 --- a/p10k.zsh +++ b/p10k.zsh @@ -1,6 +1,7 @@ -# Generated by Powerlevel10k configuration wizard on 2023-08-21 at 07:10 CDT. +# Generated by Powerlevel10k configuration wizard on 2023-08-23 at 01:43 CDT. # Based on romkatv/powerlevel10k/config/p10k-pure.zsh, checksum 35142. -# Wizard options: powerline, pure, 1 line, sparse, instant_prompt=verbose. +# Wizard options: nerdfont-complete + powerline, large icons, pure, 1 line, compact, +# instant_prompt=verbose. # Type `p10k configure` to generate another config. # # Config file for Powerlevel10k with the style of Pure (https://github.com/sindresorhus/pure). @@ -72,7 +73,7 @@ # Add an empty line before each prompt except the first. This doesn't emulate the bug # in Pure that makes prompt drift down whenever you use the Alt-C binding from fzf or similar. - typeset -g POWERLEVEL9K_PROMPT_ADD_NEWLINE=true + typeset -g POWERLEVEL9K_PROMPT_ADD_NEWLINE=false # Magenta prompt symbol if the last command succeeded. typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS}_FOREGROUND=$magenta diff --git a/tmux.conf b/tmux.conf new file mode 100644 index 0000000..9df036a --- /dev/null +++ b/tmux.conf @@ -0,0 +1,12 @@ +# My options +set -sg escape-time 1 # WSL fix, see https://github.com/microsoft/WSL/issues/5931 + +# List of plugins +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-sensible' +set -g @plugin 'wfxr/tmux-power' + +set -g mouse on + +run '~/.tmux/plugins/tpm/tpm' + diff --git a/zshrc b/zshrc index 548f973..624fe5e 100644 --- a/zshrc +++ b/zshrc @@ -5,6 +5,9 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" fi +# ---------------------------------------------------------------------------- +# Allow zsh to be setup again +# ---------------------------------------------------------------------------- # Lines configured by zsh-newuser-install HISTFILE=~/.histfile HISTSIZE=5000 @@ -13,6 +16,7 @@ setopt nomatch unsetopt beep bindkey -e # End of lines configured by zsh-newuser-install + # The following lines were added by compinstall zstyle :compinstall filename '/home/amulbrook/.zshrc' @@ -20,6 +24,9 @@ autoload -Uz compinit compinit # End of lines added by compinstall +# ----------------------------------------------------------------------------- +# p10k setup +# ----------------------------------------------------------------------------- source ~/.zsh_files/powerlevel10k/powerlevel10k.zsh-theme # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. @@ -29,3 +36,9 @@ alias ls='ls --color=auto' # To customize prompt, run `p10k configure` or edit ~/projects/dotfiles/p10k.zsh. [[ ! -f ~/projects/dotfiles/p10k.zsh ]] || source ~/projects/dotfiles/p10k.zsh + +# ----------------------------------------------------------------------------- +# My Actual Configuration Starts Here +# ----------------------------------------------------------------------------- +export GPG_TTY=$TTY +