mirror of
https://github.com/GeorgeSG/dotfiles.git
synced 2026-11-05 11:18:45 +00:00
Remove obsolete configs
This commit is contained in:
@@ -1,74 +0,0 @@
|
|||||||
#!/usr/bin/env python
|
|
||||||
# -*- coding: UTF-8 -*-
|
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
# change those symbols to whatever you prefer
|
|
||||||
symbols = {'ahead of': '↑', 'behind': '↓', 'prehash':':'}
|
|
||||||
|
|
||||||
from subprocess import Popen, PIPE
|
|
||||||
|
|
||||||
import sys
|
|
||||||
gitsym = Popen(['git', 'symbolic-ref', 'HEAD'], stdout=PIPE, stderr=PIPE)
|
|
||||||
branch, error = gitsym.communicate()
|
|
||||||
|
|
||||||
error_string = error.decode('utf-8')
|
|
||||||
|
|
||||||
if 'fatal: Not a git repository' in error_string:
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
branch = branch.strip()[11:]
|
|
||||||
|
|
||||||
res, err = Popen(['git','diff','--name-status'], stdout=PIPE, stderr=PIPE).communicate()
|
|
||||||
err_string = err.decode('utf-8')
|
|
||||||
if 'fatal' in err_string:
|
|
||||||
sys.exit(0)
|
|
||||||
changed_files = [namestat[0] for namestat in res.splitlines()]
|
|
||||||
staged_files = [namestat[0] for namestat in Popen(['git','diff', '--staged','--name-status'], stdout=PIPE).communicate()[0].splitlines()]
|
|
||||||
nb_changed = len(changed_files) - changed_files.count('U')
|
|
||||||
nb_U = staged_files.count('U')
|
|
||||||
nb_staged = len(staged_files) - nb_U
|
|
||||||
staged = str(nb_staged)
|
|
||||||
conflicts = str(nb_U)
|
|
||||||
changed = str(nb_changed)
|
|
||||||
nb_untracked = len(Popen(['git','ls-files','--others','--exclude-standard'],stdout=PIPE).communicate()[0].splitlines())
|
|
||||||
untracked = str(nb_untracked)
|
|
||||||
if not nb_changed and not nb_staged and not nb_U and not nb_untracked:
|
|
||||||
clean = '1'
|
|
||||||
else:
|
|
||||||
clean = '0'
|
|
||||||
|
|
||||||
remote = ''
|
|
||||||
|
|
||||||
if not branch: # not on any branch
|
|
||||||
branch = symbols['prehash']+ Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0][:-1]
|
|
||||||
else:
|
|
||||||
remote_name = Popen(['git','config','branch.%s.remote' % branch], stdout=PIPE).communicate()[0].strip()
|
|
||||||
if remote_name:
|
|
||||||
merge_name = Popen(['git','config','branch.%s.merge' % branch], stdout=PIPE).communicate()[0].strip()
|
|
||||||
if remote_name == '.': # local
|
|
||||||
remote_ref = merge_name
|
|
||||||
else:
|
|
||||||
remote_ref = 'refs/remotes/%s/%s' % (remote_name, merge_name[11:])
|
|
||||||
revgit = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % remote_ref],stdout=PIPE, stderr=PIPE)
|
|
||||||
revlist = revgit.communicate()[0]
|
|
||||||
if revgit.poll(): # fallback to local
|
|
||||||
revlist = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % merge_name],stdout=PIPE, stderr=PIPE).communicate()[0]
|
|
||||||
behead = revlist.splitlines()
|
|
||||||
ahead = len([x for x in behead if x[0]=='>'])
|
|
||||||
behind = len(behead) - ahead
|
|
||||||
if behind:
|
|
||||||
remote += '%s%s' % (symbols['behind'], behind)
|
|
||||||
if ahead:
|
|
||||||
remote += '%s%s' % (symbols['ahead of'], ahead)
|
|
||||||
|
|
||||||
out = '\n'.join([
|
|
||||||
str(branch),
|
|
||||||
remote,
|
|
||||||
staged,
|
|
||||||
conflicts,
|
|
||||||
changed,
|
|
||||||
untracked,
|
|
||||||
clean])
|
|
||||||
print(out)
|
|
||||||
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
# To install source this file from your .zshrc file
|
|
||||||
|
|
||||||
# Change this to reflect your installation directory
|
|
||||||
export __GIT_PROMPT_DIR=~/.zsh/git-prompt
|
|
||||||
# Initialize colors.
|
|
||||||
autoload -U colors
|
|
||||||
colors
|
|
||||||
|
|
||||||
# Allow for functions in the prompt.
|
|
||||||
setopt PROMPT_SUBST
|
|
||||||
|
|
||||||
autoload -U add-zsh-hook
|
|
||||||
|
|
||||||
add-zsh-hook chpwd chpwd_update_git_vars
|
|
||||||
add-zsh-hook preexec preexec_update_git_vars
|
|
||||||
add-zsh-hook precmd precmd_update_git_vars
|
|
||||||
|
|
||||||
## Function definitions
|
|
||||||
function preexec_update_git_vars() {
|
|
||||||
case "$2" in
|
|
||||||
git*|hub*|gh*|stg*)
|
|
||||||
__EXECUTED_GIT_COMMAND=1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
function precmd_update_git_vars() {
|
|
||||||
if [ -n "$__EXECUTED_GIT_COMMAND" ] || [ -n "$ZSH_THEME_GIT_PROMPT_NOCACHE" ]; then
|
|
||||||
update_current_git_vars
|
|
||||||
unset __EXECUTED_GIT_COMMAND
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
function chpwd_update_git_vars() {
|
|
||||||
update_current_git_vars
|
|
||||||
}
|
|
||||||
|
|
||||||
function update_current_git_vars() {
|
|
||||||
unset __CURRENT_GIT_STATUS
|
|
||||||
|
|
||||||
local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
|
|
||||||
_GIT_STATUS=`python ${gitstatus}`
|
|
||||||
__CURRENT_GIT_STATUS=("${(@f)_GIT_STATUS}")
|
|
||||||
GIT_BRANCH=$__CURRENT_GIT_STATUS[1]
|
|
||||||
GIT_REMOTE=$__CURRENT_GIT_STATUS[2]
|
|
||||||
GIT_STAGED=$__CURRENT_GIT_STATUS[3]
|
|
||||||
GIT_CONFLICTS=$__CURRENT_GIT_STATUS[4]
|
|
||||||
GIT_CHANGED=$__CURRENT_GIT_STATUS[5]
|
|
||||||
GIT_UNTRACKED=$__CURRENT_GIT_STATUS[6]
|
|
||||||
GIT_CLEAN=$__CURRENT_GIT_STATUS[7]
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
git_super_status() {
|
|
||||||
precmd_update_git_vars
|
|
||||||
if [ -n "$__CURRENT_GIT_STATUS" ]; then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH%{${reset_color}%}"
|
|
||||||
if [ -n "$GIT_REMOTE" ]; then
|
|
||||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_REMOTE$GIT_REMOTE%{${reset_color}%}"
|
|
||||||
fi
|
|
||||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR"
|
|
||||||
if [ "$GIT_STAGED" -ne "0" ]; then
|
|
||||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED%{${reset_color}%}"
|
|
||||||
fi
|
|
||||||
if [ "$GIT_CONFLICTS" -ne "0" ]; then
|
|
||||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CONFLICTS$GIT_CONFLICTS%{${reset_color}%}"
|
|
||||||
fi
|
|
||||||
if [ "$GIT_CHANGED" -ne "0" ]; then
|
|
||||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}"
|
|
||||||
fi
|
|
||||||
if [ "$GIT_UNTRACKED" -ne "0" ]; then
|
|
||||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED%{${reset_color}%}"
|
|
||||||
fi
|
|
||||||
if [ "$GIT_CLEAN" -eq "1" ]; then
|
|
||||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
|
|
||||||
fi
|
|
||||||
STATUS="$STATUS%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
|
|
||||||
echo "$STATUS"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Default values for the appearance of the prompt. Configure at will.
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="("
|
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX=")"
|
|
||||||
ZSH_THEME_GIT_PROMPT_SEPARATOR="|"
|
|
||||||
ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[magenta]%}"
|
|
||||||
ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[red]%}●"
|
|
||||||
ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}✖"
|
|
||||||
ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}✚"
|
|
||||||
ZSH_THEME_GIT_PROMPT_REMOTE=""
|
|
||||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="…"
|
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}✔"
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
[
|
|
||||||
{ "keys": ["alt+super+up"], "command": "swap_line_up" },
|
|
||||||
{ "keys": ["alt+super+down"], "command": "swap_line_down" },
|
|
||||||
{ "keys": ["ctrl+d", "ctrl+d"], "command": "run_macro_file", "args": {"file": "res://Packages/Default/Delete Line.sublime-macro"} },
|
|
||||||
{ "keys": ["ctrl+d", "ctrl+shift+d"], "command": "run_macro_file", "args": {"file": "res://Packages/Default/Delete to Hard EOL.sublime-macro"} },
|
|
||||||
{ "keys": ["ctrl+d", "ctrl+backspace"], "command": "run_macro_file", "args": {"file": "res://Packages/Default/Delete to Hard BOL.sublime-macro"} },
|
|
||||||
{ "keys": ["ctrl+d", "ctrl+c"], "command": "show_at_center" },
|
|
||||||
|
|
||||||
{ "keys": ["ctrl+shift+k"], "command": "find_under_expand" },
|
|
||||||
{ "keys": ["ctrl+shift+a"], "command": "find_all_under" },
|
|
||||||
{ "keys": ["ctrl+tab"], "command": "next_view" },
|
|
||||||
{ "keys": ["ctrl+shift+tab"], "command": "prev_view" },
|
|
||||||
{ "keys": ["alt+super+left"], "command": "jump_back" },
|
|
||||||
{ "keys": ["alt+super+right"], "command": "jump_forward" },
|
|
||||||
|
|
||||||
{ "keys": ["ctrl+a", "s"], "command": "new_pane" },
|
|
||||||
{ "keys": ["ctrl+a", "x"], "command": "close_pane" },
|
|
||||||
{ "keys": ["ctrl+a", "h"], "command": "focus_neighboring_group", "args": {"forward": false} },
|
|
||||||
{ "keys": ["ctrl+a", "l"], "command": "focus_neighboring_group" },
|
|
||||||
{ "keys": ["ctrl+a", "ctrl+h"], "command": "move_to_neighboring_group", "args": {"forward": false} },
|
|
||||||
{ "keys": ["ctrl+a", "ctrl+l"], "command": "move_to_neighboring_group" },
|
|
||||||
|
|
||||||
]
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
{
|
|
||||||
"bold_folder_labels": true,
|
|
||||||
"ensure_newline_at_eof_on_save": true,
|
|
||||||
"file_exclude_patterns":
|
|
||||||
[
|
|
||||||
"*.map",
|
|
||||||
"*.pyc",
|
|
||||||
"*.pyo",
|
|
||||||
"*.exe",
|
|
||||||
"*.dll",
|
|
||||||
"*.obj",
|
|
||||||
"*.o",
|
|
||||||
"*.a",
|
|
||||||
"*.lib",
|
|
||||||
"*.so",
|
|
||||||
"*.dylib",
|
|
||||||
"*.ncb",
|
|
||||||
"*.sdf",
|
|
||||||
"*.suo",
|
|
||||||
"*.pdb",
|
|
||||||
"*.idb",
|
|
||||||
".DS_Store",
|
|
||||||
"*.class",
|
|
||||||
"*.psd",
|
|
||||||
"*.db",
|
|
||||||
"*.sublime-workspace",
|
|
||||||
"*ng-all.min.js",
|
|
||||||
"*lpall.js",
|
|
||||||
"*.min.js"
|
|
||||||
],
|
|
||||||
"folder_exclude_patterns":
|
|
||||||
[
|
|
||||||
"generated/",
|
|
||||||
"*landing*",
|
|
||||||
".svn",
|
|
||||||
".git",
|
|
||||||
".hg",
|
|
||||||
"CVS"
|
|
||||||
],
|
|
||||||
"font_face": "Monaco",
|
|
||||||
"font_size": 13,
|
|
||||||
"highlight_line": true,
|
|
||||||
"highlight_modified_tabs": true,
|
|
||||||
"ignored_packages":
|
|
||||||
[
|
|
||||||
"Vintage"
|
|
||||||
],
|
|
||||||
"rulers":
|
|
||||||
[
|
|
||||||
100
|
|
||||||
],
|
|
||||||
"scroll_past_end": true,
|
|
||||||
"shift_tab_unindent": true,
|
|
||||||
"tab_size": 2,
|
|
||||||
"translate_tabs_to_spaces": true,
|
|
||||||
"trim_trailing_white_space_on_save": true
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user