diff options
| author | navewindre <boneyaard@gmail.com> | 2024-11-06 19:02:31 +0100 |
|---|---|---|
| committer | navewindre <boneyaard@gmail.com> | 2024-11-06 19:02:31 +0100 |
| commit | 1b6952841af6ca706f3bf7b3596c3ea9a5531a47 (patch) | |
| tree | 04030aeff98141e4c82282e65b83162760ce74f5 | |
| parent | 1cf1bc505396777fbe9ac2ee7755c54f9bbcca63 (diff) | |
a
| -rw-r--r-- | config/openbox/rc-templ.xml | 3 | ||||
| -rw-r--r-- | vimrc | 5 | ||||
| -rw-r--r-- | zshrc | 27 |
3 files changed, 34 insertions, 1 deletions
diff --git a/config/openbox/rc-templ.xml b/config/openbox/rc-templ.xml index 65e5a74..abfb4ee 100644 --- a/config/openbox/rc-templ.xml +++ b/config/openbox/rc-templ.xml @@ -139,6 +139,9 @@ <keybind key="W-C-q"> <action name="Close"/> </keybind> + <keybind key="W-h"> + <action name="Iconify"/> + </keybind> <keybind key="A-F4"> <action name="Close"/> </keybind> @@ -581,6 +581,11 @@ function! GFLine() endif endfunction +nnoremap <leader>c "+yy +vnoremap <leader>c "+y +nnoremap <leader>p "+gP +vnoremap <leader>p "+P + nnoremap gf :call GFLine()<CR> vnoremap <leader>ap :call AddSpacesToParentheses()<CR> @@ -1,3 +1,5 @@ +source ~/.lscolors +source ~/.profile export PATH=$HOME/bin:/usr/local/bin:$HOME/.cargo/bin:$PATH export ZSH="$HOME/.oh-my-zsh" @@ -13,10 +15,31 @@ plugins=( git zsh-syntax-highlighting zsh-autosuggestions - zsh-colorls ) +git_prompt() { + if git rev-parse --git-dir > /dev/null 2>&1; then + local branch=$(git symbolic-ref --short HEAD 2>/dev/null) + + if [ -z "$branch" ]; then + branch=$(git rev-parse --short HEAD 2>/dev/null) + if [[ ! -z "$branch" ]]; then + echo "@${branch} (detached)" + fi + else + if [[ "$branch" == "main" ]]; then + echo '' + else + echo "%F{#FFFFFF}@%b%F{#505050}${branch}%F{#FFFFFF}" + fi + fi + fi +} + +setopt PROMPT_SUBST + source $ZSH/oh-my-zsh.sh +export PS1=$'%m :: %2~$(git_prompt) %B»%b ' # User configuration @@ -27,6 +50,7 @@ alias vi=nvim alias mpa="mpv --no-video" alias l='ls' +alias ll='ls -lahG' alias lg='lazygit' export ANDROID_HOME=/media/aurelia/data/android-projects @@ -50,3 +74,4 @@ if [ -f '/home/aurelia/google-cloud-sdk/completion.zsh.inc' ]; then . '/home/aur zstyle ':completion:*' menu select fpath+=~/.zfunc + |