diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..075673d
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,49 @@
+[core]
+    excludesfile = ~/.gitignore
+    editor = nvim
+    autocrlf = true
+
+[init]
+    defaultBranch = master    
+
+[push]
+    default = simple
+
+[color]
+    status = auto
+    diff = auto
+    branch = auto
+    interactive = auto
+    grep = auto
+    ui = auto
+
+[alias]
+    a = "!git status --short | peco | awk '{print $2}' | xargs git add"
+    d = diff
+    co = checkout
+    ci = commit
+    ca = commit -a
+    ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)"
+    pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)"
+    st = status
+    br = branch
+    ba = branch -a
+    bm = branch --merged
+    bn = branch --no-merged
+    df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}"
+    hist = log --pretty=format:\"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --all
+    llog = log --graph --name-status --pretty=format:\"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset\" --date=relative
+    open = "!hub browse"
+    type = cat-file -t
+    dump = cat-file -p
+    find = "!f() { git log --pretty=format:\"%h %cd [%cn] %s%d\" --date=relative -S'pretty' -S\"$@\" | peco | awk '{print $1}' | xargs -I {} git diff {}^ {}; }; f"
+
+    # edit conflicted file on merge
+    edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"
+
+    # add conflicted file on merge
+    add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
+
+[github]
+    user = "TheK4n"
+    email = "djvlad967891@gmail.com"
diff --git a/.swp b/.swp
new file mode 100644
index 0000000..aaf95bd
Binary files /dev/null and b/.swp differ
diff --git a/.vim/.vimrc b/.vim/.vimrc
index 1cb8806..02207eb 100644
--- a/.vim/.vimrc
+++ b/.vim/.vimrc
@@ -10,7 +10,8 @@ let g:airline_powerline_fonts = 1 "Включить поддержку Powerline
 let g:airline#extensions#keymap#enabled = 0 "Не показывать текущий маппинг
 let g:airline_section_z = "\ue0a1:%l/%L Col:%c" "Кастомная графа положения курсора
 let g:Powerline_symbols='unicode' "Поддержка unicode
-let g:airline#extensions#xkblayout#enabled = 0 
+let g:airline#extensions#xkblayout#enabled = 0
+let g:airline#extensions#branch#enabled=1
 
 set ttimeoutlen=10 "Понижаем задержку ввода escape последовательностей
 let &t_SI.="\e[5 q" "SI = режим вставки
diff --git a/Makefile b/Makefile
index 129be46..9d11f17 100644
--- a/Makefile
+++ b/Makefile
@@ -28,9 +28,3 @@ ssh:
 	echo -e "\n" >> ~/.ssh/config
 	cat .ssh/config >> ~/.ssh/config
 
-git:
-	git config --global user.email "djvlad967891@gmail.com"
-	git config --global user.name "TheK4n"
-	git config --global core.editor vim
-	git config --global init.defaultBranch main
-	git config --global core.autocrlf true