mirror of
https://github.com/tiyn/dotfiles.git
synced 2025-04-20 00:37:44 +02:00
Compare commits
No commits in common. "02f6077bab0dd8f176f5a326756148fd1319446b" and "3a8523c9c74b67879d40fd15d855a9cdb44fe88b" have entirely different histories.
02f6077bab
...
3a8523c9c7
@ -1,8 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
# starting commands in background
|
||||
background() { for ((i=2;i<=$#;i++)); do; ${@[1]} ${@[$i]} &> /dev/null &| ; done }
|
||||
|
||||
# bash
|
||||
alias ":wq"="exit"
|
||||
alias ":q"="exit"
|
||||
@ -13,7 +10,6 @@ alias "..."="cd ../.."
|
||||
alias "...."="cd ../../.."
|
||||
alias "....."="cd ../../../.."
|
||||
alias "dockervol"="cd /var/lib/docker/volumes"
|
||||
alias previous='cd ../"$(ls -F .. | grep '/' | grep -B1 -xF "${PWD##*/}/" | head -n 1)"'
|
||||
alias prev='cd ../"$(ls -F .. | grep '/' | grep -B1 -xF "${PWD##*/}/" | head -n 1)"'
|
||||
alias next='cd ../"$(ls -F .. | grep '/' | grep -A1 -xF "${PWD##*/}/" | tail -n 1)"'
|
||||
|
||||
|
||||
@ -21,4 +21,3 @@ application/x-extension-xht=browser.desktop
|
||||
x-scheme-handler/mailto=mail.desktop
|
||||
x-scheme-handler/mid=mail.desktop
|
||||
message/rfc822=mail.desktop
|
||||
x-scheme-handler/msteams=teams.desktop
|
||||
|
||||
@ -29,16 +29,16 @@
|
||||
"nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
|
||||
"nvim-colorizer.lua": { "branch": "master", "commit": "0b3950aed7bc35b78200bc292156aa77d2a4d342" },
|
||||
"nvim-hlslens": { "branch": "main", "commit": "8ffc64bb6b624612cf762982b92633f283f7a715" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "f12f1b9e877b1e6e2ef7eae1a524d8253af4243d" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "0a1a2aa549da0d2294e072e2d725f02cca32f64e" },
|
||||
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
|
||||
"nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
|
||||
"nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" },
|
||||
"nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "841dde702ce2e58ffc3724808f3dbea2edee57d5" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "5973b617a9a48212e40c5c0a0727ad7c91b27484" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
|
||||
"nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" },
|
||||
"nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "7f30f2da3c3641841ceb0e2c150281f624445e8f" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" },
|
||||
"nvim-yarp": { "branch": "master", "commit": "bb5f5e038bfe119d3b777845a76b0b919b35ebc8" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
|
||||
"popup-menu.nvim": { "branch": "master", "commit": "b618bd0c824a20417d845fa0022327228e6988a2" },
|
||||
@ -46,7 +46,7 @@
|
||||
"renamer.nvim": { "branch": "develop", "commit": "1614d466df53899f11dd5395eaac3c09a275c384" },
|
||||
"spelunker.vim": { "branch": "master", "commit": "a0bc530f62798bbe053905555a4aa9ed713485eb" },
|
||||
"tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
|
||||
"tccs.nvim": { "branch": "master", "commit": "b0e36734b8e4c8e1e56533218076fe574c7a9d75" },
|
||||
"tccs.nvim": { "branch": "master", "commit": "3b3a1859ccaec19b0b5b91dab1144184dd3896b7" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
|
||||
"tidy.nvim": { "branch": "triggerable-tidy", "commit": "1cbed7676273057c8af22438deaae73cd5cb96b5" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
|
||||
|
||||
@ -1,26 +1,78 @@
|
||||
####################
|
||||
# HELPER FUNCTIONS #
|
||||
####################
|
||||
# Disable ctrl-s and ctrl-q.
|
||||
stty -ixon
|
||||
|
||||
setopt autocd autopushd
|
||||
|
||||
# Enable autosuggestions
|
||||
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||
bindkey '^ ' autosuggest-accept
|
||||
|
||||
# Enable colors and change prompt
|
||||
autoload -U colors && colors
|
||||
autoload -Uz vcs_info
|
||||
precmd_vcs_info() { vcs_info }
|
||||
|
||||
precmd_functions+=( precmd_vcs_info )
|
||||
|
||||
zle-line-init() {
|
||||
zle -K viins
|
||||
echo -ne "\e[5 q"
|
||||
zstyle ':vcs_info:*' enable git
|
||||
zstyle ':vcs_info:git*:*' get-revision true
|
||||
zstyle ':vcs_info:git*:*' check-for-changes true
|
||||
zstyle ':vcs_info:git*' formats "(%s) %c%u %b%m"
|
||||
zstyle ':vcs_info:git*' actionformats "(%s|%a) %12.12i %c%u %b%m"
|
||||
setopt prompt_subst
|
||||
# Show remote ref name and number of commits ahead-of or behind
|
||||
function +vi-git-st() {
|
||||
local ahead behind remote
|
||||
local -a gitstatus
|
||||
# Are we on a remote-tracking branch?
|
||||
remote=${$(git rev-parse --verify ${hook_com[branch]}@{upstream} \
|
||||
--symbolic-full-name 2>/dev/null)/refs\/remotes\/}
|
||||
if [[ -n ${remote} ]] ; then
|
||||
# for git prior to 1.7
|
||||
# ahead=$(git rev-list origin/${hook_com[branch]}..HEAD | wc -l)
|
||||
ahead=$(git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
|
||||
(( $ahead )) && gitstatus+=( " ${c3}+${ahead}${c2}" )
|
||||
# for git prior to 1.7
|
||||
# behind=$(git rev-list HEAD..origin/${hook_com[branch]} | wc -l)
|
||||
behind=$(git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
|
||||
(( $behind )) && gitstatus+=( "${c4}-${behind}${c2}" )
|
||||
hook_com[branch]="${hook_com[branch]} [${remote}${(j:/:)gitstatus}]"
|
||||
fi
|
||||
}
|
||||
# Show count of stashed changes
|
||||
function +vi-git-stash() {
|
||||
local -a stashes
|
||||
if [[ -s ${hook_com[base]}/.git/refs/stash ]] ; then
|
||||
stashes=$(git stash list 2>/dev/null | wc -l)
|
||||
hook_com[misc]+=" (${stashes} stashed)"
|
||||
fi
|
||||
}
|
||||
zstyle ':vcs_info:git*+set-message:*' hooks git-st git-stash
|
||||
PS1='%B%{$fg[blue]%}[%{$fg[blue]%}%n%{$fg[blue]%}@%{$fg[blue]%}%M %{$fg[blue]%}%~%{$fg[blue]%}]%{$reset_color%}\$%b '
|
||||
RPROMPT='%B%{$fg[blue]%}$vcs_info_msg_0_%{$reset_color%}%b'
|
||||
|
||||
preexec() { echo -ne '\e[5 q' ;}
|
||||
|
||||
local copy_widgets=(
|
||||
vi-yank vi-yank-eol vi-delete vi-backward-kill-word vi-change-whole-line
|
||||
)
|
||||
|
||||
local paste_widgets=(
|
||||
vi-put-{before,after}
|
||||
)
|
||||
source /usr/share/zsh/plugins/zsh-autocomplete/zsh-autocomplete.plugin.zsh
|
||||
bindkey '\t' menu-select "$terminfo[kcbt]" menu-select
|
||||
bindkey -M menuselect '\t' menu-complete "$terminfo[kcbt]" reverse-menu-complete
|
||||
bindkey -M menuselect '^ ' autosuggest-accept
|
||||
zstyle ':autocomplete:*' list-lines 100
|
||||
zstyle ':autocomplete:*' widget-style menu-select
|
||||
zle -A {.,}history-incremental-search-forward
|
||||
zle -A {.,}history-incremental-search-backward
|
||||
zstyle ':autocomplete:*' fzf-completion yes
|
||||
zstyle ':autocomplete:*' recent-dirs zsh-z
|
||||
zstyle ':autocomplete:*' menu select
|
||||
zstyle ':autocomplete:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' # Case insensitive completion
|
||||
zstyle ':autocomplete:*' insert-unambiguous yes
|
||||
|
||||
# Enable vi mode
|
||||
bindkey -v
|
||||
export KEYTIMEOUT=1
|
||||
# Vim bindings in tab mode
|
||||
bindkey -M menuselect 'h' vi-backward-char
|
||||
bindkey -M menuselect 'k' vi-up-line-or-history
|
||||
bindkey -M menuselect 'l' vi-forward-char
|
||||
bindkey -M menuselect 'j' vi-down-line-or-history
|
||||
bindkey -v '^?' backward-delete-char
|
||||
# Vim Cursor shape
|
||||
function zle-keymap-select {
|
||||
if [[ ${KEYMAP} == vicmd ]] ||
|
||||
[[ $1 = 'block' ]]; then
|
||||
@ -31,7 +83,16 @@ function zle-keymap-select {
|
||||
echo -ne '\e[5 q'
|
||||
fi
|
||||
}
|
||||
zle -N zle-keymap-select
|
||||
zle-line-init() {
|
||||
zle -K viins
|
||||
echo -ne "\e[5 q"
|
||||
}
|
||||
zle -N zle-line-init
|
||||
echo -ne '\e[5 q'
|
||||
preexec() { echo -ne '\e[5 q' ;}
|
||||
|
||||
# Vim copy and paste fix in terminal
|
||||
function x11-clip-wrap-widgets() {
|
||||
local copy_or_paste=$1
|
||||
shift
|
||||
@ -55,141 +116,43 @@ function x11-clip-wrap-widgets() {
|
||||
done
|
||||
}
|
||||
|
||||
function +vi-git-st() {
|
||||
local ahead behind remote
|
||||
local -a gitstatus
|
||||
remote=${$(git rev-parse --verify ${hook_com[branch]}@{upstream} \
|
||||
--symbolic-full-name 2>/dev/null)/refs\/remotes\/}
|
||||
if [[ -n ${remote} ]] ; then
|
||||
# for git prior to 1.7
|
||||
# ahead=$(git rev-list origin/${hook_com[branch]}..HEAD | wc -l)
|
||||
ahead=$(git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
|
||||
(( $ahead )) && gitstatus+=( " ${c3}+${ahead}${c2}" )
|
||||
# for git prior to 1.7
|
||||
# behind=$(git rev-list HEAD..origin/${hook_com[branch]} | wc -l)
|
||||
behind=$(git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
|
||||
(( $behind )) && gitstatus+=( "${c4}-${behind}${c2}" )
|
||||
hook_com[branch]="${hook_com[branch]} [${remote}${(j:/:)gitstatus}]"
|
||||
fi
|
||||
}
|
||||
|
||||
function +vi-git-stash() {
|
||||
local -a stashes
|
||||
if [[ -s ${hook_com[base]}/.git/refs/stash ]] ; then
|
||||
stashes=$(git stash list 2>/dev/null | wc -l)
|
||||
hook_com[misc]+=" (${stashes} stashed)"
|
||||
fi
|
||||
}
|
||||
local copy_widgets=(
|
||||
vi-yank vi-yank-eol vi-delete vi-backward-kill-word vi-change-whole-line
|
||||
)
|
||||
local paste_widgets=(
|
||||
vi-put-{before,after}
|
||||
)
|
||||
|
||||
#########
|
||||
# STYLE #
|
||||
#########
|
||||
|
||||
# Set style for version control
|
||||
zstyle ':vcs_info:*' enable git
|
||||
zstyle ':vcs_info:git*:*' get-revision true
|
||||
zstyle ':vcs_info:git*:*' check-for-changes true
|
||||
zstyle ':vcs_info:git*' formats "(%s) %c%u %b%m"
|
||||
zstyle ':vcs_info:git*' actionformats "(%s|%a) %12.12i %c%u %b%m"
|
||||
# Show remote ref name and number of commits ahead-of or behind
|
||||
# Show count of stashed changes
|
||||
zstyle ':vcs_info:git*+set-message:*' hooks git-st git-stash
|
||||
|
||||
# Set style for completion options
|
||||
zstyle ':completion:*' menu select
|
||||
zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' # Case insensitive completion
|
||||
zmodload zsh/complist
|
||||
_comp_options+=(globdots)
|
||||
|
||||
# Disable sort when completing `git checkout`
|
||||
zstyle ':completion:*:git-checkout:*' sort false
|
||||
# Set descriptions format to enable group support
|
||||
zstyle ':completion:*:descriptions' format '[%d]'
|
||||
# Set list-colors to enable filename colorizing
|
||||
zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
|
||||
# Preview directory's content with eza when completing cd
|
||||
zstyle ':fzf-tab:complete:cd:*' fzf-preview 'eza -1 --color=always $realpath'
|
||||
# Switch group using `,` and `.`
|
||||
zstyle ':fzf-tab:*' switch-group ',' '.'
|
||||
|
||||
# Set default Vim Cursor shape
|
||||
zle -N zle-keymap-select
|
||||
zle -N zle-line-init
|
||||
echo -ne '\e[5 q'
|
||||
|
||||
# Set default prompt
|
||||
PS1='%B%{$fg[blue]%}[%{$fg[blue]%}%n%{$fg[blue]%}@%{$fg[blue]%}%M %{$fg[blue]%}%~%{$fg[blue]%}]%{$reset_color%}\$%b '
|
||||
RPROMPT='%B%{$fg[blue]%}$vcs_info_msg_0_%{$reset_color%}%b'
|
||||
setopt prompt_subst
|
||||
|
||||
# Copy to x11 clipboard
|
||||
# NB: can atm. only wrap native widgets
|
||||
x11-clip-wrap-widgets copy $copy_widgets
|
||||
x11-clip-wrap-widgets paste $paste_widgets
|
||||
|
||||
# Enable colors
|
||||
autoload -U colors && colors
|
||||
# starts one or multiple args in background
|
||||
background() {
|
||||
for ((i=2;i<=$#;i++)); do
|
||||
${@[1]} ${@[$i]} &> /dev/null &|
|
||||
done
|
||||
}
|
||||
|
||||
# Enable git info in prompt
|
||||
autoload -Uz vcs_info
|
||||
|
||||
###############
|
||||
# KEYBINDINGS #
|
||||
###############
|
||||
|
||||
# Enable vi mode
|
||||
bindkey -v
|
||||
export KEYTIMEOUT=1
|
||||
|
||||
# Vim bindings in tab mode
|
||||
bindkey -M menuselect 'h' vi-backward-char
|
||||
bindkey -M menuselect 'k' vi-up-line-or-history
|
||||
bindkey -M menuselect 'l' vi-forward-char
|
||||
bindkey -M menuselect 'j' vi-down-line-or-history
|
||||
bindkey -v '^?' backward-delete-char
|
||||
|
||||
#######################
|
||||
# ADDITIONAL FEATURES #
|
||||
#######################
|
||||
|
||||
# Load alias
|
||||
[ -f "$HOME/.config/aliasrc" ] && source "$HOME/.config/aliasrc" # Load aliases
|
||||
|
||||
# Disable ctrl-s and ctrl-q.
|
||||
stty -ixon
|
||||
|
||||
# Automatically cd if given a directory
|
||||
setopt autocd autopushd
|
||||
|
||||
# Enable compinit
|
||||
autoload -Uz compinit && compinit
|
||||
|
||||
# Plugin: command not found notice
|
||||
# Load command-not-found-handler
|
||||
source /usr/share/doc/pkgfile/command-not-found.zsh
|
||||
|
||||
# Plugin: fuzzy completion
|
||||
source /usr/share/zsh/plugins/fzf-tab-git/fzf-tab.plugin.zsh
|
||||
|
||||
# Plugin: autosuggestions
|
||||
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||
bindkey '^ ' autosuggest-accept
|
||||
|
||||
# Plugin: syntax highlighting
|
||||
# Load fast-syntax-highlighting; should be last.
|
||||
source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
|
||||
|
||||
# Open shell with tmux always
|
||||
if [[ -n "$PS1" ]] && [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then
|
||||
tmux attack-session -t $USER || tmux new-session -s $USER
|
||||
fi
|
||||
|
||||
# set up thefuck
|
||||
eval $(thefuck --alias)
|
||||
|
||||
# python
|
||||
#eval "$(pyenv init -)"
|
||||
|
||||
##########################
|
||||
# COMMANDS BEFORE PROMPT #
|
||||
##########################
|
||||
# set up thefuck
|
||||
eval $(thefuck --alias)
|
||||
|
||||
# Display pfetch when starting zsh
|
||||
pfetch
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user