Compare commits

..

No commits in common. "ecbb01d00244119760fa0e9dba5eb1555783cec8" and "2d515358c59642bbb7fd13863a79a30f05e2e87c" have entirely different histories.

4 changed files with 5 additions and 12 deletions

3
.gitignore vendored
View File

@ -1,4 +1,3 @@
.DS_Store .DS_Store
zsh/history zsh/history
this-machine/zsh zsh/device-specific
this-machine/tmux.conf

View File

@ -7,9 +7,7 @@ fi
rm ~/.zshrc rm ~/.zshrc
ln -s ~/.dotfiles/zshrc ~/.zshrc ln -s ~/.dotfiles/zshrc ~/.zshrc
ln -s ~/.dotfiles/tmux/tmux.conf ~/.tmux.conf ln -s ~/.dotfiles/tmux/tmux.conf ~/.tmux.conf
mkdir ~/.dotfiles/this-machine touch ~/.dotfiles/zsh/device-specific
touch ~/.dotfiles/this-machine/zsh
touch ~/.dotfiles/this-machine/tmux.conf
sudo chsh -s $(which zsh) $USER sudo chsh -s $(which zsh) $USER
# If private repo is available, add ssh config + hosts # If private repo is available, add ssh config + hosts

View File

@ -37,12 +37,8 @@ set-window-option -g window-active-style fg=white,bg=colour235
set-window-option -g message-style fg=#111111,bold,bg=#eeeeee set-window-option -g message-style fg=#111111,bold,bg=#eeeeee
# Status Bar # Status Bar
set-option -g status-style fg=white,bg=#B7650E set-option -g status-style fg=white,bg=#8317dd
set-window-option -g window-status-separator | set-window-option -g window-status-separator |
# Set Terminal type # Set Terminal type
set -g default-terminal "xterm-256color" set -g default-terminal "xterm-256color"
# ------
# Load local settings
source ~/.dotfiles/this-machine/tmux.conf

4
zshrc
View File

@ -7,7 +7,7 @@ autoload -U compinit && compinit
# Prompt color # Prompt color
prompt_color1="#ffaf00" prompt_color1="#ffaf00"
prompt_color2="#000000" primpt_color2="#000000"
# Load zsh settings # Load zsh settings
source $HOME/.dotfiles/zsh/settings source $HOME/.dotfiles/zsh/settings
@ -46,7 +46,7 @@ source $HOME/.dotfiles/zsh/alias
source $HOME/.dotfiles/zsh/bindings source $HOME/.dotfiles/zsh/bindings
source $HOME/.dotfiles/zsh/scripts source $HOME/.dotfiles/zsh/scripts
source $HOME/.dotfiles/zsh/ffmpeg source $HOME/.dotfiles/zsh/ffmpeg
source $HOME/.dotfiles/this-machine/zsh source $HOME/.dotfiles/zsh/device-specific
# Prompt design # Prompt design
prompt="%F{$prompt_color2}%K{$prompt_color1} ▓▒░%F%B%n@%m%b%F{$prompt_color1}%K{$prompt_color2}█▓▒░%F{#ffffff}%K{$prompt_color2}%B %D{%Y-%m-%d} %D{%k:%M:%S} prompt="%F{$prompt_color2}%K{$prompt_color1} ▓▒░%F%B%n@%m%b%F{$prompt_color1}%K{$prompt_color2}█▓▒░%F{#ffffff}%K{$prompt_color2}%B %D{%Y-%m-%d} %D{%k:%M:%S}