diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 4bf4085..3a6f2be 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -23,14 +23,18 @@ hi FoldColumn ctermbg=233 ctermfg=247 let mapleader = " " let maplocalleader = "," -nnoremap set etset ts=4set sw=4 -nnoremap set noet nnoremap ToggleDiagOff:Gdiffsplit +nnoremap %!sed 's/[ \t]*$//' +nnoremap %s/"/'/g nnoremap ToggleDiag nnoremap %!expand -t4%!sed 's/[ \t]*$//' nnoremap %!unexpand -t4%!sed 's/[ \t]*$//' nnoremap TagbarToggle +nnoremap %s/\([( -]\)0\.\(\d\)/\1.\2/gc +nnoremap set etset ts=4set sw=4 +nnoremap set noet nnoremap NERDTreeToggle +nnoremap let @+=expand("%")echo "Copied relative file path to clipboard." nnoremap ev tabnew $MYVIMRC nnoremap sv source $MYVIMRC diff --git a/home/aliases b/home/aliases index 6ae9f67..17bd8ae 100644 --- a/home/aliases +++ b/home/aliases @@ -1,4 +1,4 @@ -export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH" +export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$HOME/.config/composer/vendor/bin:$PATH" export EDITOR="/usr/local/bin/nvim" # vim @@ -13,13 +13,22 @@ alias ....="cd ../../.." alias .....="cd ../../../.." alias ......="cd ../../../../.." alias .......="cd ../../../../../.." +alias ........="cd ../../../../../../.." +alias .........="cd ../../../../../../../.." +alias ..........="cd ../../../../../../../../.." +alias ...........="cd ../../../../../../../../../.." +alias ............="cd ../../../../../../../../../../.." +alias .............="cd ../../../../../../../../../../../.." +alias ..............="cd ../../../../../../../../../../../../.." +alias ...............="cd ../../../../../../../../../../../../../.." +alias ................="cd ../../../../../../../../../../../../../../.." # improved reset and clear alias reset="tput reset" alias clear="tput reset" # better du -alias du="du -hd 1" +alias du="du -ha" # better feh alias feh="feh -." diff --git a/home/bashrc b/home/bashrc index edb6e24..4280f83 100644 --- a/home/bashrc +++ b/home/bashrc @@ -11,9 +11,6 @@ export PS1='\e[1m\e[38;5;63m[\e[38;5;68m\u@\H \e[38;5;15m\w\e[38;5;63m]$\e[m ' # aliases: source ~/.aliases -# reload with . -alias .="source ~/.bashrc" - if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then exec startx fi diff --git a/home/tmux.conf b/home/tmux.conf index 226e063..c21318c 100644 --- a/home/tmux.conf +++ b/home/tmux.conf @@ -1,4 +1,5 @@ -# FIXES +# enable mouse support +set -g mouse on #################### ### KEY BINDINGS ### @@ -57,18 +58,20 @@ set -g pane-active-border-style 'bg=colour0 fg=colour9' # statusbar set -g status-position bottom set -g status-justify left -set -g status-style 'bg=colour234 fg=colour255' -set -g status-left '#[fg=colour255,bg=colour234]  ' -set -g status-right '#[bg=colour234,fg=colour27]#[fg=colour255,bg=colour27]  %d/%m  %H:%M ' +set -g status-style 'bg=colour233 fg=colour255' +set -g status-left '#[fg=colour249,bg=colour237]  tmux #[bg=colour233,fg=colour237]' +set -g status-right '#[bg=colour233,fg=colour21]#[fg=colour255,bg=colour21]  %d/%m  %H:%M ' set -g status-right-length 50 set -g status-left-length 20 -setw -g window-status-current-format '#[fg=colour234,bg=colour27]#[bg=colour27,fg=colour184] #I#[fg=colour255]-#W #[bg=colour234,fg=colour27]' +setw -g window-status-current-format '#[fg=colour233,bg=colour21]#[bg=colour21,fg=colour184] #I#[fg=colour255]-#W #[bg=colour233,fg=colour21]' -setw -g window-status-format '#[fg=colour234,bg=colour237]#[bg=colour237,fg=colour184] #I#[fg=colour255]-#W #[bg=colour234,fg=colour237]' +setw -g window-status-format '#[fg=colour233,bg=colour237]#[bg=colour237,fg=colour184] #I#[fg=colour249]-#W #[bg=colour233,fg=colour237]' setw -g window-status-bell-style 'fg=colour255 bg=colour1 bold' +setw -g window-status-separator '' + # messages set -g message-style 'bg=colour27 fg=white' diff --git a/home/zshrc b/home/zshrc index 243974b..cd37dcb 100644 --- a/home/zshrc +++ b/home/zshrc @@ -30,9 +30,6 @@ export LS_COLORS='di=1;94:ex=4;92:ln=3;96' # aliases: source ~/.aliases -# reload with . -alias .="source ~/.zshrc" - if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then exec startx fi