andrew/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve tmux and zsh configuration

Browse source 
Utilize tpm to configure tmux plugins. Improve zshrc to work with
nerdfonts setup.
This commit is contained in:
Andrew Mulbrook 2023-08-23 02:44:20 -05:00
parent 395f26a37b
commit fbe276353f
No known key found for this signature in database
GPG key ID: ECCE9C873ECB5BF0
8 changed files with 43 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.gitmodules vendored
View file

@ -16,3 +16,12 @@
[submodule "zsh_files/powerlevel10k"] [submodule "zsh_files/powerlevel10k"]
path = zsh_files/powerlevel10k path = zsh_files/powerlevel10k
url = https://github.com/romkatv/powerlevel10k.git 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

1
dot.tmux/plugins/tmux-power Submodule

@ -0,0 +1 @@
Subproject commit 9dafd5b0504906421f904149b178c1ddb83a0580

1
dot.tmux/plugins/tmux-sensible Submodule

@ -0,0 +1 @@
Subproject commit 25cb91f42d020f675bb0a2ce3fbd3a5d96119efa

1
dot.tmux/plugins/tpm Submodule

@ -0,0 +1 @@
Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946

2
install.conf.yaml
View file

@ -22,6 +22,8 @@
~/.csirc: csirc ~/.csirc: csirc
~/.config/kitty/kitty.conf: kitty.conf ~/.config/kitty/kitty.conf: kitty.conf
~/.scripts: scripts ~/.scripts: scripts
~/.tmux.conf: tmux.conf
~/.tmux: dot.tmux
~/.fonts/: ~/.fonts/:
glob: true glob: true
path: resources/fonts/*.ttf path: resources/fonts/*.ttf

7
p10k.zsh
View file

@ -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. # 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. # Type `p10k configure` to generate another config.
# #
# Config file for Powerlevel10k with the style of Pure (https://github.com/sindresorhus/pure). # 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 # 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. # 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. # Magenta prompt symbol if the last command succeeded.
typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS}_FOREGROUND=$magenta typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS}_FOREGROUND=$magenta

12
tmux.conf Normal file
View file

@ -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'

13
zshrc
View file

@ -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" source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
fi fi
# ----------------------------------------------------------------------------
# Allow zsh to be setup again
# ----------------------------------------------------------------------------
# Lines configured by zsh-newuser-install # Lines configured by zsh-newuser-install
HISTFILE=~/.histfile HISTFILE=~/.histfile
HISTSIZE=5000 HISTSIZE=5000
@ -13,6 +16,7 @@ setopt nomatch
unsetopt beep unsetopt beep
bindkey -e bindkey -e
# End of lines configured by zsh-newuser-install # End of lines configured by zsh-newuser-install
# The following lines were added by compinstall # The following lines were added by compinstall
zstyle :compinstall filename '/home/amulbrook/.zshrc' zstyle :compinstall filename '/home/amulbrook/.zshrc'
@ -20,6 +24,9 @@ autoload -Uz compinit
compinit compinit
# End of lines added by compinstall # End of lines added by compinstall
# -----------------------------------------------------------------------------
# p10k setup
# -----------------------------------------------------------------------------
source ~/.zsh_files/powerlevel10k/powerlevel10k.zsh-theme source ~/.zsh_files/powerlevel10k/powerlevel10k.zsh-theme
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. # 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. # To customize prompt, run `p10k configure` or edit ~/projects/dotfiles/p10k.zsh.
[[ ! -f ~/projects/dotfiles/p10k.zsh ]] || source ~/projects/dotfiles/p10k.zsh [[ ! -f ~/projects/dotfiles/p10k.zsh ]] || source ~/projects/dotfiles/p10k.zsh
# -----------------------------------------------------------------------------
# My Actual Configuration Starts Here
# -----------------------------------------------------------------------------
export GPG_TTY=$TTY