adam
/
laughing-hipster
mirror of https://github.com/adamveld12/laughing-hipster
1
0
Fork 0
Code Issues Releases Wiki Activity

fix gitmodules finally, update configs

Browse Source
pull/5/head
Adam Veldhousen 5 years ago
parent 3b975fd51e
commit e45bc92d6b
Signed by: adam
GPG Key ID: 6DB29003C6DD1E4B
7 changed files with 115 additions and 115 deletions
Show Stats Download Patch File Download Diff File

5
src/.config/tmux/.tmux.conf
Unescape View File

@ -10,19 +10,18 @@
set -g default-command "/bin/bash --login"
set -g default-shell "/bin/bash"
source ~/projects/laughing-hipster/tools/powerline/powerline/powerline/bindings/tmux/powerline.conf
set -g default-terminal "screen-256color"
set -g default-terminal "xterm-256color"
# set esc-wait off, so vim works
set-option -sg escape-time 0
#set prefix to ctrl-a
unbind-key C-b
set-option -g prefix C-a
unbind-key C-a ; bind-key C-a send-prefix
# some nice ops
set-option -g bell-action any
set-option -g history-limit 10000

7
src/.config/vim/.vimrc
Unescape View File

@ -35,7 +35,7 @@ set backupcopy=yes
set autoread
set selection=exclusive
set ttimeoutlen=50
" set termguicolors
set termguicolors
" Use the OS clipboard by default (on versions compiled with `+clipboard`)
set clipboard=unnamedplus
" Enhance command-line completion
@ -155,7 +155,7 @@ nmap <leader>n :NERDTreeToggle %:p:h<CR>
nmap <leader>m :NERDTreeClose<CR>:NERDTreeFind<CR>
" strips whitespace
noremap <leader>ss :call StripWhitespace()<CR>
noremap <leader>ws :call StripWhitespace()<CR>
" Strip trailing whitespace (,ss)
function! StripWhitespace()
@ -217,7 +217,8 @@ let g:go_highlight_structs = 1
let g:go_highlight_operators = 1
let g:go_highlight_build_constraints = 1
let g:go_highlight_extra_types = 1
let g:go_fmt_command = "goreturns"
let g:go_fmt_command = "goimports"
let g:go_fmt_autosave = 1
" -b -w -p"
let g:syntastic_go_checkers = ['go', 'errcheck', 'gofmt', 'golint', 'govet']

214
src/.gitconfig
Unescape View File

@ -1,167 +1,171 @@
[alias]
# View abbreviated SHA, description, and history graph of the latest 20 commits
lo = log --oneline -n 40 --graph
l = log --oneline -n 40 --graph --show-signature
# View abbreviated SHA, description, and history graph of the latest 20 commits
lo = log --oneline -n 40 --graph
l = log --oneline -n 40 --graph --show-signature
# View the current working tree status using the short format
s = status -s
# View the current working tree status using the short format
s = status -s
# Show the diff between the latest commit and the current state
d = !"git diff --color --patch-with-stat"
dc = !"git diff --cached --color --patch-with-stat"
# Show the diff between the latest commit and the current state
d = !"git diff --color --patch-with-stat"
dc = !"git diff --cached --color --patch-with-stat"
# `git di $number` shows the diff between the state `$number` revisions ago and the current state
di = !"d() { git diff --color --patch-with-stat HEAD~$1 | diff-so-fancy; }; git diff-index --color --quiet HEAD --; d"
# `git di $number` shows the diff between the state `$number` revisions ago and the current state
di = !"d() { git diff --color --patch-with-stat HEAD~$1 | diff-so-fancy; }; git diff-index --color --quiet HEAD --; d"
# Pull in remote changes for the current repository and all its submodules
p = !"git pull; git submodule foreach git pull origin master"
# Pull in remote changes for the current repository and all its submodules
p = !"git pull; git submodule foreach git pull origin master"
# Clone a repository including all submodules
c = clone --recursive
# Clone a repository including all submodules
c = clone --recursive
# Commit all changes
ca = !git add -A && git commit -av -S
# Commit all changes
ca = !git add -A && git commit -av -S
# commits with gpgsign flag
cs = commit -S
# commits with gpgsign flag
cs = commit -S
# commits with gpgsign and inline message flag
csm = commit -S -m
# commits with gpgsign and inline message flag
csm = commit -S -m
# Switch to a branch, creating it if necessary
go = checkout -B
# Switch to a branch, creating it if necessary
go = checkout -B
# pull rebase
pr = pull --rebase
# pull rebase
pr = pull --rebase
# Show verbose output about tags, branches or remotes
tags = tag -l
branches = branch -a
remotes = remote -v
# Show verbose output about tags, branches or remotes
tags = tag -l
branches = branch -a
remotes = remote -v
# Credit an author on the latest commit
credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
# Credit an author on the latest commit
credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
# Interactive rebase with the given number of latest commits
reb = "!r() { git rebase -i HEAD~$1; }; r"
# Interactive rebase with the given number of latest commits
reb = "!r() { git rebase -i HEAD~$1; }; r"
# Find branches containing commit
fb = "!f() { git branch -a --contains $1; }; f"
# Find branches containing commit
fb = "!f() { git branch -a --contains $1; }; f"
# Find tags containing commit
ft = "!f() { git describe --always --contains $1; }; f"
# Find tags containing commit
ft = "!f() { git describe --always --contains $1; }; f"
# Find commits by source code
fc = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short -S$1; }; f"
# Find commits by source code
fc = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short -S$1; }; f"
# Find commits by commit message
fm = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"
# Find commits by commit message
fm = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"
# Remove branches that have already been merged with master
dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches
[diff]
# Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
# instead of a/b/c/d as prefixes for patches
mnemonicprefix = true
tool = vimdiff
# Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
# instead of a/b/c/d as prefixes for patches
mnemonicprefix = true
tool = vimdiff
[merge]
tool = vimdiff
conflictstyle = diff3
tool = vimdiff
conflictstyle = diff3
[mergetool]
prompt = false
trustExitCode = false
prompt = false
trustExitCode = false
[advice]
statusHints = false
statusHints = false
[apply]
# Detect whitespace errors when applying a patch
whitespace = fix
# Detect whitespace errors when applying a patch
whitespace = fix
[gc]
auto=1
auto=1
[core]
# Use custom `.gitignore` and `.gitattributes`
excludesfile = /Users/Adam/.gitignore
attributesfile = ~/.gitattributes
# Treat spaces before tabs and all kinds of trailing whitespace as an error.
# [default] trailing-space: looks for spaces at the end of a line
# [default] space-before-tab: looks for spaces before tabs at the beginning of
# a line
whitespace = space-before-tab,-indent-with-non-tab,trailing-space
# Make `git rebase` safer on OS X
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
trustctime = false
autocrlf = false
eol = 'lf'
editor = $EDITOR
hooksPath = /home/adam/.githooks/
# Use custom `.gitignore` and `.gitattributes`
excludesfile = /Users/Adam/.gitignore
attributesfile = ~/.gitattributes
# Treat spaces before tabs and all kinds of trailing whitespace as an error.
# [default] trailing-space: looks for spaces at the end of a line
# [default] space-before-tab: looks for spaces before tabs at the beginning of
# a line
whitespace = space-before-tab,-indent-with-non-tab,trailing-space
# Make `git rebase` safer on OS X
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
trustctime = false
autocrlf = false
eol = 'lf'
editor = $EDITOR
hooksPath = /home/adam/.githooks/
[color]
# Use colors in Git commands that are capable of colored output when
# outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.)
ui = auto
# Use colors in Git commands that are capable of colored output when
# outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.)
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
added = yellow
changed = green
untracked = cyan
[merge]
# Include summaries of merged commits in newly created merge commit messages
log = true
# better merge messages
summary=true
# Include summaries of merged commits in newly created merge commit messages
log = true
# better merge messages
summary=true
# URL shorthands
[url "git@github.com:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
insteadOf = https://github.com/
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
insteadOf = "github:"
insteadOf = "github:"
[url "git@gist.github.com:"]
insteadOf = "gst:"
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
insteadOf = "gst:"
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"]
insteadOf = "gist:"
insteadOf = "gist:"
[push]
default = current
default = current
[pull]
default = current
default = current
[user]
email = adam.veldhousen@liveauctioneers.com
name = Adam Veldhousen
signingkey = 415C0B9C
email = adam.veldhousen@liveauctioneers.com
name = Adam Veldhousen
signingkey = 4FA79E5B6598505C8DFA30A7A466CEE1415C0B9C
[commit]
gpgsign = true
template = /home/adam/.gitmessage
gpgsign = true
template = /home/adam/.gitmessage
[help]
autocorrect=20
autocorrect=20
[credential]
# for OSX
#helper = osxkeychain
# for Linux
helper = store --file ~/.git-credentials
# for OSX
#helper = osxkeychain
# for Linux
helper = store --file ~/.git-credentials

1
tools/modules/iTerm2-Color-Schemes

@ -1 +0,0 @@
Subproject commit 20a54b079c8be65db941776f0b824054bb297b31

1
tools/modules/powerline

@ -1 +0,0 @@
Subproject commit d77cc30a3be26cf34411af70c5e2b595eef2d46d

1
tools/modules/powerline-fonts

@ -1 +0,0 @@
Subproject commit 99be8480bb39f2b9daa52f03a22941a45cd1b8cf

1
tools/modules/tmux-MacOSX-pasteboard

@ -1 +0,0 @@
Subproject commit 98f32381182c5850a40ed60abec0c1320b7be270
Write Preview
Loading…
Cancel
Save