diff --git a/.gitignore b/.gitignore index 250961a..8c0fae6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ xsrf/cache xsrf/certificates xsrf/cookies.txt rcmain +user-dirs.dirs diff --git a/dot/file/gitconfig b/dot/file/gitconfig index 03e1201..4196c53 100644 --- a/dot/file/gitconfig +++ b/dot/file/gitconfig @@ -1,6 +1,7 @@ -[user] - name = k1574 - email = k1574@yandex.ru +[include] + path = ~/lib/git/personal +[includeIf "gitdir:~/dev/latoken/"] + path = ~/lib/git/latoken [alias] co = checkout ci = commit diff --git a/dot/file/profile b/dot/file/profile index 0b2b7f0..70ba563 100755 --- a/dot/file/profile +++ b/dot/file/profile @@ -48,7 +48,7 @@ export_loop \ XCOMPOSEFILE '$HOME/lib/xcompose' \ ANDROID_NDK_HOME '$HOME/app/android/ndk' \ GIT 'https://github.com/$USER' \ - PATH '$HOME/exe:$PATH' \ + PATH '$HOME/exe:$HOME/.local/bin:$PATH' \ test -r $SETENV && . "$SETENV" && setenv profile diff --git a/dot/file/vimrc b/dot/file/vimrc index 06e1fcd..a57dfc8 100644 --- a/dot/file/vimrc +++ b/dot/file/vimrc @@ -44,6 +44,8 @@ " Syntax. syntax on " Maps. + " Folds. + noremap <2-LeftMouse> za " Nerd-Tree. nmap \nt :NERDTree . " Disable highlight. diff --git a/git/latoken b/git/latoken new file mode 100644 index 0000000..d50e4ef --- /dev/null +++ b/git/latoken @@ -0,0 +1,6 @@ +[user] + signingkey = 7E9C3DD82859D199 + email = andrey.parkhomenko@latoken.com + name = andrey.parkhomenko +[commit] + gpgsign = true diff --git a/git/personal b/git/personal new file mode 100644 index 0000000..52b585b --- /dev/null +++ b/git/personal @@ -0,0 +1,26 @@ +[user] + name = surdeus + email = surdeus@gmail.com +[alias] + co = checkout + ci = commit + cl = clone + clr = clone --recursive + st = status + ad = add + br = branch + df = diff + sm = submodule + rt = remote + rs = reset + sh = stash + ps = push + pl = pull + fc = fetch + lg = log + stsh = stash + type = cat-file -t + dump = cat-file -p +[core] + autocrlf = input +