Skip to content

Commit

Permalink
Updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
TomLingham committed Dec 28, 2019
1 parent 1a66331 commit 6bcc0d4
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 37 deletions.
7 changes: 7 additions & 0 deletions dots/.aliases
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,10 @@ proxy_all() {
no_proxy= $@
}

vdiff() {
diff -r \
--exclude="node_modules" \
--exclude=".git" \
--exclude=".DS_Store" \
$@
}
36 changes: 18 additions & 18 deletions dots/.tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@ set -g status-bg "$TMUX_COLOR_BG"
set -g status-fg "$TMUX_COLOR_FG"

# Left side of status bar
set -g status-left-bg "$TMUX_COLOR_ACCENT_BG"
set -g status-left-fg "$TMUX_COLOR_ACCENT_FG"
set -g status-left-style bg="$TMUX_COLOR_ACCENT_BG"
set -g status-left-style fg="$TMUX_COLOR_ACCENT_FG"
set -g status-left-length 40
set -g status-left " #S #[bg=$TMUX_COLOR_BG] "

# Right side of status bar
set -g status-right-bg "$TMUX_COLOR_ACCENT_BG"
set -g status-right-fg "$TMUX_COLOR_ACCENT_FG"
set -g status-right-style bg="$TMUX_COLOR_ACCENT_BG"
set -g status-right-style fg="$TMUX_COLOR_ACCENT_FG"
set -g status-right-length 40
set -g status-right ' #H '

# Window status - not the current window
set -g window-status-bg "$TMUX_COLOR_ACCENT_BG"
set -g window-status-fg "$TMUX_COLOR_ACCENT_FG"
set -g window-status-attr none
set -g window-status-style bg="$TMUX_COLOR_ACCENT_BG"
set -g window-status-style fg="$TMUX_COLOR_ACCENT_FG"
set -g window-status-style "none"
set -g window-status-format "#[fg=$TMUX_COLOR_ACCENT_IDLE_FG,bg=$TMUX_COLOR_ACCENT_IDLE_BG] #I #[fg=$TMUX_COLOR_HIGHLIGHT_IDLE_FG,bg=$TMUX_COLOR_HIGHLIGHT_IDLE_BG] #W #[default]"

# Window status - current window
set -g window-status-current-attr none
set -g window-status-current-style "none"
set -g window-status-current-format "#[fg=$TMUX_COLOR_ACCENT_FG,bg=$TMUX_COLOR_ACCENT_BG] #I #[fg=$TMUX_COLOR_HIGHLIGHT_FG,bg=$TMUX_COLOR_HIGHLIGHT_BG] #W #[default]"

# Window separator
Expand All @@ -46,28 +46,28 @@ set -g window-status-separator ''
# set -g status-justify centre

# Pane border
set -g pane-border-bg default
set -g pane-border-fg default
set -g pane-border-style bg=default
set -g pane-border-style fg=default

# Active pane border
set -g pane-active-border-bg default
set -g pane-active-border-fg green
set -g pane-active-border-style bg=default
set -g pane-active-border-style fg=green

# Pane number indicator
set -g display-panes-colour default
set -g display-panes-active-colour default

# Message
set -g message-bg default
set -g message-fg default
set -g message-style bg=default
set -g message-style fg=default

# Command message
set -g message-command-bg default
set -g message-command-fg default
set -g message-command-style bg=default
set -g message-command-style fg=default

# Mode
set -g mode-bg red
set -g mode-fg default
set -g mode-style bg=red
set -g mode-style fg=default

# List of plugins
set -g @plugin 'tmux-plugins/tpm'
Expand Down
23 changes: 14 additions & 9 deletions dots/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ eval "$(rbenv init -)"

# Load NVM (Node Version Manager)
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
export NVM_LIB=$(realpath $NVM_BIN/../lib)
[ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion

# Load SDK Man
export SDKMAN_DIR="$HOME/.sdkman"
[ -s "$SDKMAN_DIR/bin/sdkman-init.sh" ] && source "$SDKMAN_DIR/bin/sdkman-init.sh"

# FZF
[ -s "$HOME/.fzf.zsh" ] && source $HOME/.fzf.zsh
[ -s "$HOME/.fzf.zsh" ] && source "$HOME/.fzf.zsh"

#============================================
# Path
Expand Down Expand Up @@ -86,12 +86,7 @@ prompt pure
# Autocompletions
#============================================
source <(go env)
source <(npm completion)

# Serverless
[[ -f $NVM_LIB/node_modules/serverless/node_modules/tabtab/.completions/serverless.zsh ]] && . $NVM_LIB/node_modules/serverless/node_modules/tabtab/.completions/serverless.zsh
[[ -f $NVM_LIB/node_modules/serverless/node_modules/tabtab/.completions/sls.zsh ]] && . $NVM_LIB/node_modules/serverless/node_modules/tabtab/.completions/sls.zsh
[[ -f $NVM_LIB/node_modules/serverless/node_modules/tabtab/.completions/slss.zsh ]] && . $NVM_LIB/node_modules/serverless/node_modules/tabtab/.completions/slss.zsh
#source <(npm completion)


#============================================
Expand All @@ -116,3 +111,13 @@ source $HOME/.dotfiles/themes/dracula.sh
#source $HOME/.dotfiles/themes/solarized.sh
#source $HOME/.dotfiles/themes/molokai.sh
#

# tabtab source for serverless package
# uninstall by removing these lines or running `tabtab uninstall serverless`
[[ -f /Users/tom/Code/jobish/jobish-api/node_modules/tabtab/.completions/serverless.zsh ]] && . /Users/tom/Code/jobish/jobish-api/node_modules/tabtab/.completions/serverless.zsh
# tabtab source for sls package
# uninstall by removing these lines or running `tabtab uninstall sls`
[[ -f /Users/tom/Code/jobish/jobish-api/node_modules/tabtab/.completions/sls.zsh ]] && . /Users/tom/Code/jobish/jobish-api/node_modules/tabtab/.completions/sls.zsh
# tabtab source for slss package
# uninstall by removing these lines or running `tabtab uninstall slss`
[[ -f /Users/tom/Code/jobish/jobish-api/node_modules/tabtab/.completions/slss.zsh ]] && . /Users/tom/Code/jobish/jobish-api/node_modules/tabtab/.completions/slss.zsh
1 change: 1 addition & 0 deletions setup/brew.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ casks=(
postman
slack
visual-studio-code
keeweb
)

if ! program_exists brew; then
Expand Down
53 changes: 43 additions & 10 deletions vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"window.zoomLevel": 0,
"workbench.activityBar.visible": false,
"workbench.colorTheme": "Dracula",
"workbench.iconTheme": "vscode-icons",
"workbench.startupEditor": "newUntitledFile",
"workbench.statusBar.visible": true,
"vim.leader": "<space>",
Expand Down Expand Up @@ -58,14 +57,6 @@
"Jenkinsfile*": "groovy",
"Dockerfile*": "dockerfile"
},
"vsicons.associations.files": [
{
"icon": "webpack",
"extensions": ["webpack.config.node.ts"],
"filename": true,
"format": "svg"
}
],
"editor.renderWhitespace": "all",
"explorer.confirmDragAndDrop": false,
"cSpell.enabledLanguageIds": [
Expand Down Expand Up @@ -94,11 +85,53 @@
"text",
"typescript",
"typescriptreact",
"yaml",
"yml"
],
"shellformat.flag": "-i 2",
"gitlens.mode.active": "zen",
"[groovy]": {
"editor.tabSize": 4
}
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"breadcrumbs.enabled": false,
"workbench.iconTheme": "vscode-icons",
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[markdown]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"cSpell.userWords": [
"Architected",
"Authorisation",
"Kubernetes",
"Subnet",
"beuracrecies",
"centralised",
"codegen",
"customised",
"optimisations",
"organisation",
"organisational",
"organising",
"templating",
"utilising"
],
"terminal.integrated.scrollback": 6000,
"cSpell.language": "en-GB"
}

0 comments on commit 6bcc0d4

Please sign in to comment.