Skip to content

Commit

Permalink
Refactor config to remove unused parts
Browse files Browse the repository at this point in the history
  • Loading branch information
Roshanjossey committed Jan 3, 2021
1 parent 67fce12 commit 4f08891
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 33 deletions.
15 changes: 4 additions & 11 deletions .tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ set -g default-terminal "screen-256color"
# set scrollback history to 10000 (10k)
set -g history-limit 10000

# make paste in vim use default clipboard
set-option -g default-command "reattach-to-user-namespace -l zsh"

# set Ctrl-a as the default prefix key combination
# and unbind C-b to free it up
set -g prefix C-a
Expand All @@ -23,7 +20,7 @@ unbind C-b
bind C-a send-prefix

# use PREFIX | to split window horizontally and PREFIX - to split vertically
bind \ split-window -h
bind / split-window -h
bind - split-window -v

# map Vi movement keys as pane movement keys
Expand All @@ -42,11 +39,6 @@ bind J resize-pane -D 5
bind K resize-pane -U 5
bind L resize-pane -R 5

# Plugins
# ressurect plugin

set -g @plugin 'tmux-plugins/tmux-resurrect'

# status bar stuff
# colors
set -g status-bg black
Expand All @@ -64,5 +56,6 @@ setw -g automatic-rename on
set-window-option -g window-status-format '#[dim]#I:#[default]#W#[fg=grey,dim]'
set-window-option -g window-status-current-format '#[fg=cyan,bold]#I#[fg=blue]:#[fg=cyan]#W#[fg=dim]'

# spot at right
set -g status-right '#[fg=green][#[fg=cyan]%Y-%m-%d#[fg=green]]'
# git details on right
set -g status-right '#(node --version) #(gitmux "#{pane_current_path}")'

28 changes: 6 additions & 22 deletions .zshrc
Original file line number Diff line number Diff line change
@@ -1,25 +1,9 @@
# Path to your oh-my-zsh installation.
export ZSH=/Users/rjossey/.oh-my-zsh
PROMPT=" %F{033}❯%f "
RPROMPT="%~"

ZSH_THEME="powerlevel9k/powerlevel9k"
# soure aliases
source ~/zsh/aliases.sh

plugins=(git vi-mode)

source $ZSH/oh-my-zsh.sh

# souce my famous aliases
source $ZSH/aliases.sh
source $ZSH/themes.sh

# You may need to manually set your language environment
export LANG=en_US.UTF-8

# Preferred editor for local and remote sessions
export EDITOR='vim'

export JAVA_HOME=$(/usr/libexec/java_home)

export NVM_DIR="/Users/rjossey/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
eval "$(rbenv init -)"
export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nv
8 changes: 8 additions & 0 deletions zsh/aliases.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
alias g='git'
alias gs='git status'
alias gst='git stash'
alias gap='git add -p'
alias gup='git pull'
alias gco='git checkout'
alias gp='git push'
alias gd='git diff'

0 comments on commit 4f08891

Please sign in to comment.