modifications to obtain working environment
This commit is contained in:
12
.gitignore
vendored
12
.gitignore
vendored
@@ -1,10 +1,2 @@
|
||||
.netrwhist
|
||||
npm-debug.log
|
||||
|
||||
plug.vim.old
|
||||
|
||||
config/nvim/spell
|
||||
config/nvim/shada
|
||||
config/nvim/plugged
|
||||
vim/vim.symlink/spell/
|
||||
vim/vim.symlink/plugged/
|
||||
tmux/plugins/*
|
||||
config/vim/plugged/*
|
||||
|
||||
7
.gitmodules
vendored
7
.gitmodules
vendored
@@ -1,7 +0,0 @@
|
||||
[submodule ".config/base16-shell"]
|
||||
path = .config/base16-shell
|
||||
url = git@github.com:chriskempson/base16-shell.git
|
||||
|
||||
[submodule "tmux/plugins/tpm"]
|
||||
path = tmux/plugins/tpm
|
||||
url = git@github.com:tmux-plugins/tpm.git
|
||||
@@ -1,5 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
shell=$(basename "$SHELL")
|
||||
|
||||
# check if reattach-to-user-namespace is available
|
||||
|
||||
4
bin/tm
4
bin/tm
@@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
#!/bin/bash
|
||||
|
||||
# abort if we're already inside a TMUX session
|
||||
[ "$TMUX" == "" ] || exit 0
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
# present menu for user to choose which workspace to open
|
||||
PS3="Please choose your session: "
|
||||
options=($(tmux list-sessions -F "#S" 2>/dev/null) "New Session" "zsh")
|
||||
options=($(tmux list-sessions -F "#S" 2>/dev/null) "New Session")
|
||||
echo "Available sessions"
|
||||
echo "------------------"
|
||||
echo " "
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# gitconfig
|
||||
[user]
|
||||
name = Nick Nisi
|
||||
email = nick@nisi.org
|
||||
name = Rik Veenboer
|
||||
email = rik.veenboer@gmail.com
|
||||
[github]
|
||||
user = nicknisi
|
||||
user = Boukefalos
|
||||
[init]
|
||||
templatedir = ~/.dotfiles/git/templates
|
||||
[alias]
|
||||
@@ -143,13 +143,6 @@
|
||||
[grep]
|
||||
extendRegexp = true
|
||||
lineNumber = true
|
||||
[credential]
|
||||
helper = osxkeychain
|
||||
[difftool "Kaleidoscope"]
|
||||
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
||||
[mergetool "Kaleidoscope"]
|
||||
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
|
||||
trustexitcode = true
|
||||
[rebase]
|
||||
instructionFormat = "[%an - %ar] %s"
|
||||
[pager]
|
||||
|
||||
@@ -14,10 +14,4 @@ Icon
|
||||
.Trashes
|
||||
|
||||
# project-specific vim configurations
|
||||
.vimrc.local
|
||||
|
||||
# typescript command garbage
|
||||
tscommand*.txt
|
||||
|
||||
# nvm - the Node Version Manager
|
||||
.nvmrc
|
||||
.vimrc.local
|
||||
@@ -1,8 +0,0 @@
|
||||
source-file ~/.tmux.conf
|
||||
new-session -s dev -n ide
|
||||
split-window -v -p 10 -t dev
|
||||
select-pane -t 1
|
||||
split-window -h -p 30 -t dev
|
||||
new-window -n shell
|
||||
select-window -t dev:1
|
||||
select-pane -t 1
|
||||
@@ -18,7 +18,6 @@ set -g status-left-length 32
|
||||
set -g status-right-length 150
|
||||
set -g status-interval 5
|
||||
|
||||
|
||||
# default statusbar colors
|
||||
# set-option -g status-bg colour0
|
||||
set-option -g status-fg $tm_color_active
|
||||
@@ -45,14 +44,9 @@ set-option -g message-fg $tm_color_active
|
||||
set-option -g display-panes-active-colour $tm_color_active
|
||||
set-option -g display-panes-colour $tm_color_inactive
|
||||
|
||||
tm_spotify="#[fg=$tm_color_background,bg=$tm_color_music]#(osascript ~/.dotfiles/applescripts/spotify.scpt)"
|
||||
tm_itunes="#[fg=$tm_color_music,bg=$tm_color_background]$tm_right_separator_black#[fg=$tm_color_background,bg=$tm_color_music]#(osascript ~/.dotfiles/applescripts/itunes.scpt)"
|
||||
tm_rdio="#[fg=$tm_color_background,bg=$tm_color_music]#(osascript ~/.dotfiles/applescripts/rdio.scpt)"
|
||||
tm_battery="#[fg=colour255,bg=$tm_color_music]$tm_right_separator_black#[bg=colour255]#(~/.dotfiles/bin/battery_indicator.sh)"
|
||||
|
||||
tm_date="#[bg=colour255,fg=$tm_color_inactive]$tm_right_separator_black#[bg=$tm_color_inactive,fg=$tm_color_background] %R %d %b"
|
||||
tm_host="#[bg=$tm_color_inactive,fg=$tm_color_feature]$tm_right_separator_black#[bg=$tm_color_feature,fg=$tm_color_background,bold] #h "
|
||||
tm_session_name="#[bg=$tm_color_feature,fg=$tm_color_background,bold]$tm_icon #S #[fg=$tm_color_feature,bg=default,nobold]$tm_left_separator_black"
|
||||
|
||||
set -g status-left $tm_session_name
|
||||
set -g status-right $tm_itunes' '$tm_rdio' '$tm_battery' '$tm_date' '$tm_host
|
||||
set -g status-right $tm_date' '$tm_host
|
||||
|
||||
@@ -17,7 +17,6 @@ set -g status-left-length 32
|
||||
set -g status-right-length 150
|
||||
set -g status-interval 5
|
||||
|
||||
|
||||
# default statusbar colors
|
||||
# set-option -g status-bg colour0
|
||||
set-option -g status-fg $tm_color_active
|
||||
@@ -49,12 +48,9 @@ set-option -g display-panes-colour $tm_color_inactive
|
||||
# clock
|
||||
set-window-option -g clock-mode-colour $tm_color_active
|
||||
|
||||
tm_tunes="#[fg=$tm_color_music]#(osascript ~/.dotfiles/applescripts/tunes.scpt)"
|
||||
tm_battery="#(~/.dotfiles/bin/battery_indicator.sh)"
|
||||
|
||||
tm_date="#[fg=$tm_color_inactive] %R %d %b"
|
||||
tm_host="#[fg=$tm_color_feature,bold]#h"
|
||||
tm_session_name="#[fg=$tm_color_feature,bold]$tm_icon #S"
|
||||
|
||||
set -g status-left $tm_session_name' '
|
||||
set -g status-right $tm_tunes' '$tm_date' '$tm_host
|
||||
set -g status-right $tm_date' '$tm_host
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
set -g default-command "login-shell"
|
||||
# tmux display things in 256 colors
|
||||
set -g default-terminal "tmux-256color-italic"
|
||||
set -g status-utf8 on
|
||||
@@ -33,9 +32,9 @@ unbind =
|
||||
bind = select-layout tiled
|
||||
|
||||
# cycle through panes
|
||||
# unbind C-a
|
||||
# unbind o # this is the default key for cycling panes
|
||||
# bind ^A select-pane -t:.+
|
||||
unbind C-a
|
||||
unbind o # this is the default key for cycling panes
|
||||
bind ^A select-pane -t:.+
|
||||
|
||||
# make window/pane index start with 1
|
||||
set -g base-index 1
|
||||
@@ -77,19 +76,6 @@ bind -r J resize-pane -D 10
|
||||
bind -r K resize-pane -U 10
|
||||
bind -r L resize-pane -R 10
|
||||
|
||||
# enable mouse support for switching panes/windows
|
||||
setw -g mouse on
|
||||
# set-option -g -q mouse on
|
||||
|
||||
bind-key -T root PPage if-shell -F "#{alternate_on}" "send-keys PPage" "copy-mode -e; send-keys PPage"
|
||||
bind-key -t vi-copy PPage page-up
|
||||
bind-key -t vi-copy NPage page-down
|
||||
|
||||
bind -T root WheelUpPane if-shell -F -t = "#{alternate_on}" "select-pane -t =; send-keys -M" "select-pane -t =; copy-mode -e; send-keys -M"
|
||||
bind -T root WheelDownPane if-shell -F -t = "#{alternate_on}" "select-pane -t =; send-keys -M" "select-pane -t =; send-keys -M"
|
||||
bind-key -t vi-copy WheelUpPane halfpage-up
|
||||
bind-key -t vi-copy WheelDownPane halfpage-down
|
||||
|
||||
# maximizing and restoring windows
|
||||
unbind Up
|
||||
bind Up new-window -d -n fullscreen \; swap-pane -s fullscreen.1 \; select-window -t fullscreen
|
||||
@@ -101,17 +87,32 @@ setw -g mode-keys vi
|
||||
# more settings to make copy-mode more vim-like
|
||||
unbind [
|
||||
bind Escape copy-mode
|
||||
unbind p
|
||||
bind p paste-buffer
|
||||
# unbind p
|
||||
# bind p paste-buffer
|
||||
bind p previous-window
|
||||
bind -t vi-copy 'v' begin-selection
|
||||
bind -t vi-copy 'y' copy-selection
|
||||
|
||||
# Buffers to/from Mac clipboard, yay tmux book from pragprog
|
||||
bind C-c run "tmux save-buffer - | reattach-to-user-namespace pbcopy"
|
||||
bind C-v run "tmux set-buffer $(reattach-to-user-namespace pbpaste); tmux paste-buffer"
|
||||
|
||||
##############################
|
||||
### Color & Style Settings ###
|
||||
##############################
|
||||
|
||||
source ~/.dotfiles/tmux/theme.sh
|
||||
|
||||
|
||||
###############
|
||||
### Plugins ###
|
||||
###############
|
||||
|
||||
# List of plugins
|
||||
set -g @plugin 'tmux-plugins/tpm'
|
||||
set -g @plugin 'tmux-plugins/tmux-sensible'
|
||||
set -g @plugin 'Morantron/tmux-fingers'
|
||||
|
||||
# Other examples:
|
||||
# set -g @plugin 'github_username/plugin_name'
|
||||
# set -g @plugin 'git@github.com/user/plugin'
|
||||
# set -g @plugin 'git@bitbucket.com/user/plugin'
|
||||
|
||||
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
|
||||
run '~/.tmux/plugins/tpm/tpm'
|
||||
|
||||
@@ -8,8 +8,6 @@ else # OS X `ls`
|
||||
colorflag="-G"
|
||||
fi
|
||||
|
||||
alias vim="nvim"
|
||||
|
||||
# Filesystem aliases
|
||||
alias ..='cd ..'
|
||||
alias ...='cd ../..'
|
||||
@@ -27,9 +25,6 @@ alias grep='grep --color=auto'
|
||||
alias df='df -h' # disk free, in Gigabytes, not bytes
|
||||
alias du='du -h -c' # calculate disk usage for a folder
|
||||
|
||||
# Applications
|
||||
alias ios='open -a /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app'
|
||||
|
||||
# IP addresses
|
||||
alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
|
||||
alias localip="ipconfig getifaddr en1"
|
||||
@@ -65,14 +60,3 @@ alias showdesktop="defaults write com.apple.finder CreateDesktop -bool true && k
|
||||
for method in GET HEAD POST PUT DELETE TRACE OPTIONS; do
|
||||
alias "$method"="lwp-request -m '$method'"
|
||||
done
|
||||
|
||||
# Stuff I never really use but cannot delete either because of http://xkcd.com/530/
|
||||
alias stfu="osascript -e 'set volume output muted true'"
|
||||
alias pumpitup="osascript -e 'set volume 10'"
|
||||
|
||||
# Kill all the tabs in Chrome to free up memory
|
||||
# [C] explained: http://www.commandlinefu.com/commands/view/402/exclude-grep-from-your-grepped-output-of-ps-alias-included-in-description
|
||||
alias chromekill="ps ux | grep '[C]hrome Helper --type=renderer' | grep -v extension-process | tr -s ' ' | cut -d ' ' -f2 | xargs kill"
|
||||
|
||||
alias chrome="/Applications/Google\\ \\Chrome.app/Contents/MacOS/Google\\ \\Chrome"
|
||||
alias canary="/Applications/Google\\ Chrome\\ Canary.app/Contents/MacOS/Google\\ Chrome\\ Canary"
|
||||
|
||||
@@ -30,5 +30,9 @@ bindkey '^[[3~' delete-char
|
||||
bindkey '^[^N' newtab
|
||||
bindkey '^?' backward-delete-char
|
||||
|
||||
# remap reverse search
|
||||
bindkey -v
|
||||
bindkey '^R' history-incremental-search-backward
|
||||
|
||||
fpath=($ZSH/functions $fpath)
|
||||
autoload -U $ZSH/functions/*(:t)
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
#compdef c
|
||||
_files -W $CODE_DIR -/
|
||||
@@ -1 +0,0 @@
|
||||
cd $CODE_DIR/$1
|
||||
@@ -48,7 +48,6 @@ git_arrows() {
|
||||
echo $arrows
|
||||
}
|
||||
|
||||
|
||||
# indicate a job (for example, vim) has been backgrounded
|
||||
# If there is a job in the background, display a ✱
|
||||
suspended_jobs() {
|
||||
@@ -63,8 +62,8 @@ suspended_jobs() {
|
||||
|
||||
precmd() {
|
||||
vcs_info
|
||||
print -P '\n%F{205}%~'
|
||||
print -P '\n%F{145}%~'
|
||||
}
|
||||
|
||||
export PROMPT='%(?.%F{205}.%F{red})❯%f '
|
||||
export PROMPT='%(?.%F{145}.%F{red})❯%f '
|
||||
export RPROMPT='`git_dirty`%F{241}$vcs_info_msg_0_%f `git_arrows``suspended_jobs`'
|
||||
|
||||
0
zsh/spectrum.zsh
Normal file → Executable file
0
zsh/spectrum.zsh
Normal file → Executable file
@@ -13,7 +13,7 @@ if [[ -d ~/code ]]; then
|
||||
fi
|
||||
|
||||
# source all .zsh files inside of the zsh/ directory
|
||||
for config ($ZSH/**/*.zsh) source $config
|
||||
for config ($ZSH/*.zsh) source $config
|
||||
|
||||
if [[ -a ~/.localrc ]]; then
|
||||
source ~/.localrc
|
||||
|
||||
Reference in New Issue
Block a user