Compare commits
5 Commits
ea61bde858
...
generic-gi
| Author | SHA1 | Date | |
|---|---|---|---|
| 9618713542 | |||
| 5a33d2b5ac | |||
| c691d335c0 | |||
| 715014ed3d | |||
| efcea9e8a5 |
@@ -17,6 +17,7 @@ _autoenv() {
|
|||||||
edit:'edit .enter and .exit scripts in current directory'
|
edit:'edit .enter and .exit scripts in current directory'
|
||||||
deinit:'remove .enter and .exit scripts in current directory'
|
deinit:'remove .enter and .exit scripts in current directory'
|
||||||
reload:'reload the current environment'
|
reload:'reload the current environment'
|
||||||
|
add=local:'add .local/bin to PATH'
|
||||||
add=py:'add Python virtualenv to the autoenv'
|
add=py:'add Python virtualenv to the autoenv'
|
||||||
)
|
)
|
||||||
_describe -t commands command commands && ret=0 ;;
|
_describe -t commands command commands && ret=0 ;;
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ commands:
|
|||||||
edit edit .enter and .exit scripts in current directory
|
edit edit .enter and .exit scripts in current directory
|
||||||
deinit remove .enter and .exit scripts in current directory
|
deinit remove .enter and .exit scripts in current directory
|
||||||
reload reload the current environment
|
reload reload the current environment
|
||||||
|
add=local add .local/bin to PATH
|
||||||
add=py add Python virtualenv to the autoenv"
|
add=py add Python virtualenv to the autoenv"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@@ -92,6 +93,27 @@ commands:
|
|||||||
_autoenv_enter $PWD
|
_autoenv_enter $PWD
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
add=local) # Add .local/bin to PATH
|
||||||
|
if ! [ -f $PWD/.enter ] || ! [ -f $PWD/.exit ]; then
|
||||||
|
echo '.enter or .exit not found'; return 1
|
||||||
|
fi
|
||||||
|
_autoenv_exit $PWD
|
||||||
|
# Create .local/bin if not present
|
||||||
|
if ! [ -d $PWD/.local/bin ]; then
|
||||||
|
mkdir -p $PWD/.local/bin
|
||||||
|
fi
|
||||||
|
# On enter: store PATH and insert .local/bin
|
||||||
|
echo 'OLDPATH=$PATH' >> .enter
|
||||||
|
echo 'PATH=$PWD/.local/bin:$PATH' >> .enter
|
||||||
|
# On exit: reset PATH
|
||||||
|
echo 'PATH=$OLDPATH' >> .exit
|
||||||
|
echo 'unset OLDPATH' >> .exit
|
||||||
|
# Authorize modified autoenv
|
||||||
|
_autoenv_authorized $PWD/.enter yes
|
||||||
|
_autoenv_authorized $PWD/.exit yes
|
||||||
|
_autoenv_enter $PWD
|
||||||
|
;;
|
||||||
|
|
||||||
add=py) # Add Python virtualenv to the sandbox
|
add=py) # Add Python virtualenv to the sandbox
|
||||||
if ! [ -f $PWD/.enter ] || ! [ -f $PWD/.exit ]; then
|
if ! [ -f $PWD/.enter ] || ! [ -f $PWD/.exit ]; then
|
||||||
echo '.enter or .exit not found'; return 1
|
echo '.enter or .exit not found'; return 1
|
||||||
|
|||||||
19
git-prompt.c
19
git-prompt.c
@@ -21,6 +21,11 @@
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define color8(CODE) "\e[3" #CODE "m"
|
||||||
|
#define color256(CODE) "\e[38;5;" #CODE "m"
|
||||||
|
#define bold "\e[1m"
|
||||||
|
#define reset "\e[0m"
|
||||||
|
|
||||||
typedef struct process {
|
typedef struct process {
|
||||||
pid_t pid;
|
pid_t pid;
|
||||||
FILE* out;
|
FILE* out;
|
||||||
@@ -104,7 +109,7 @@ int main() {
|
|||||||
}
|
}
|
||||||
char* branch = trim(branch_buf);
|
char* branch = trim(branch_buf);
|
||||||
char prompt[1024] = {};
|
char prompt[1024] = {};
|
||||||
append(prompt, 3, " %{%F{66}%}", branch, "%{%f%}");
|
append(prompt, 3, " " color256(66), branch, reset);
|
||||||
|
|
||||||
// get the upstream remote if one exists
|
// get the upstream remote if one exists
|
||||||
char command[1024] = {};
|
char command[1024] = {};
|
||||||
@@ -178,22 +183,22 @@ int main() {
|
|||||||
if (indexed || modified || deleted || unmerged || untracked) { // modified
|
if (indexed || modified || deleted || unmerged || untracked) { // modified
|
||||||
char int_buf[32];
|
char int_buf[32];
|
||||||
if (indexed) {
|
if (indexed) {
|
||||||
append(prompt, 3, "%{%F{2}%}*", inttostr(int_buf, indexed), "%{%f%}");
|
append(prompt, 3, color8(2) "*", inttostr(int_buf, indexed), reset);
|
||||||
}
|
}
|
||||||
if (modified) {
|
if (modified) {
|
||||||
append(prompt, 3, "%{%F{1}%}+", inttostr(int_buf, modified), "%{%f%}");
|
append(prompt, 3, color8(1) "+", inttostr(int_buf, modified), reset);
|
||||||
}
|
}
|
||||||
if (deleted) {
|
if (deleted) {
|
||||||
append(prompt, 3, "%{%F{1}%}-", inttostr(int_buf, deleted), "%{%f%}");
|
append(prompt, 3, color8(1) "-", inttostr(int_buf, deleted), reset);
|
||||||
}
|
}
|
||||||
if (unmerged) {
|
if (unmerged) {
|
||||||
append(prompt, 3, "%{%B%F{1}%}×", inttostr(int_buf, unmerged), "%{%f%b%}");
|
append(prompt, 3, bold color8(1) "×", inttostr(int_buf, unmerged), reset);
|
||||||
}
|
}
|
||||||
if (untracked) {
|
if (untracked) {
|
||||||
append(prompt, 1, "%{%F{1}%}…%{%f%}");
|
append(prompt, 1, color8(1) "…" reset);
|
||||||
}
|
}
|
||||||
} else { // clean
|
} else { // clean
|
||||||
append(prompt, 1, "%{%B%F{2}%}✓%{%f%b%}");
|
append(prompt, 1, bold color8(2) "✓" reset);
|
||||||
}
|
}
|
||||||
|
|
||||||
// print the prompt
|
// print the prompt
|
||||||
|
|||||||
5
zshenv
5
zshenv
@@ -98,9 +98,8 @@ command -v docker &> /dev/null && \
|
|||||||
export DOCKER_CONFIG=$HOME/.local/share/docker
|
export DOCKER_CONFIG=$HOME/.local/share/docker
|
||||||
export GTK_RC_FILES=$HOME/.config/gtk/gtkrc
|
export GTK_RC_FILES=$HOME/.config/gtk/gtkrc
|
||||||
export GTK2_RC_FILES=$HOME/.config/gtk-2.0/gtkrc
|
export GTK2_RC_FILES=$HOME/.config/gtk-2.0/gtkrc
|
||||||
|
export PYLINTHOME=$HOME/.cache/pylint
|
||||||
command -v rustup &> /dev/null && \
|
command -v rustup &> /dev/null && \
|
||||||
export RUSTUP_HOME=$HOME/.local/share/rustup
|
export RUSTUP_HOME=$HOME/.local/share/rustup
|
||||||
export PYLINTHOME=$HOME/.cache/pylint
|
export WGETRC=$HOME/.config/wget/rc
|
||||||
# TODO: terminfo
|
# TODO: terminfo
|
||||||
[ -f $HOME/.config/wgetrc ] &&
|
|
||||||
export WGETRC=$HOME/.config/wgetrc
|
|
||||||
|
|||||||
4
zshrc
4
zshrc
@@ -17,6 +17,8 @@ ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(end-of-line vi-end-of-line)
|
|||||||
|
|
||||||
# Search history with a command substring
|
# Search history with a command substring
|
||||||
source-plugin zsh-history-substring-search
|
source-plugin zsh-history-substring-search
|
||||||
|
HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND=
|
||||||
|
HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND=
|
||||||
|
|
||||||
# Command syntax highlighting
|
# Command syntax highlighting
|
||||||
source-plugin zsh-syntax-highlighting
|
source-plugin zsh-syntax-highlighting
|
||||||
@@ -65,7 +67,7 @@ setopt completeinword
|
|||||||
|
|
||||||
# Initialize completions
|
# Initialize completions
|
||||||
autoload -U compinit
|
autoload -U compinit
|
||||||
compinit
|
compinit -d ~/.cache/zsh/compdump
|
||||||
|
|
||||||
# Add pip to the old completion engine if present
|
# Add pip to the old completion engine if present
|
||||||
if command -v pip &> /dev/null; then
|
if command -v pip &> /dev/null; then
|
||||||
|
|||||||
Reference in New Issue
Block a user