dolysis
/
psoxizsh
3
1
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

ci: merge new lua config

This commit is contained in:
pSox 2022-08-02 10:21:42 +01:00
parent e2df4d1e48
commit b1ea115f31
4 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tmux/fragment/ctrl-alt-movement.conf
View File

@ -13,21 +13,6 @@
# Integration with vim-tmux-navigator & fzf
is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
<<<<<<< HEAD
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
is_fzf="ps -o state= -o comm= -t '#{pane_tty}' \
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?fzf$'"
bind -n C-M-Left run "($is_vim && tmux send-keys C-M-Left) \
|| tmux select-pane -L"
bind -n C-M-Down run "($is_vim && tmux send-keys C-M-Down) \
|| ($is_fzf && tmux send-keys C-M-Down) \
|| tmux select-pane -D"
bind -n C-M-Up run "($is_vim && tmux send-keys C-M-Up) \
|| ($is_fzf && tmux send-keys C-M-Up) \
|| tmux select-pane -U"
bind -n C-M-Right run "($is_vim && tmux send-keys C-M-Right) \
|| tmux select-pane -R"
=======
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
is_fzf="ps -o state= -o comm= -t '#{pane_tty}' \
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?fzf$'"
@ -41,7 +26,6 @@ bind -n C-M-Up run "($is_vim && tmux send-keys C-k) \
|| tmux select-pane -U"
bind -n C-M-Right run "($is_vim && tmux send-keys C-l) \
|| tmux select-pane -R"
>>>>>>> origin/develop
bind-key -T copy-mode-vi 'C-M-Left' select-pane -L
bind-key -T copy-mode-vi 'C-M-Down' select-pane -D
bind-key -T copy-mode-vi 'C-M-Up' select-pane -U

3
tmux/tmux.conf
View File

@ -7,13 +7,10 @@ if "test -f ~/.config/tmux/plugins.conf" {
if "test -f ~/.config/tmux/early.conf" {
source-file ~/.config/tmux/early.conf
}
<<<<<<< HEAD
if "test -f ~/.config/tmux/keys.conf" {
source-file ~/.config/tmux/keys.conf
}
=======
>>>>>>> origin/develop
set-option -g prefix C-a
set-option -g set-titles on

4
vimrc
View File

@ -378,11 +378,7 @@ if has_key(plugs, 'fzf.vim')
nnoremap <silent> <A-S-f> :Files<CR>
nnoremap <silent> <leader><A-S-f> :Files!<CR>
<<<<<<< HEAD
nnoremap <A-b> :Buffers
=======
nnoremap <A-b> :Buffers
>>>>>>> origin/develop
nnoremap <leader><A-b> :Buffers!
nnoremap <silent> <A-S-b> :Buffers<CR>
nnoremap <silent> <leader><A-S-b> :Buffers!<CR>

20
zshrc
View File

@ -108,11 +108,7 @@ plugins=(
( [[ -e /etc/debian-release ]] ) && plugins+=( debian )
( [[ -e /etc/suse-release ]] ) && plugins+=( suse )
( [[ "$(uname)" == "Darwin" ]] ) && plugins+=( macos )
<<<<<<< HEAD
( which vim &>/dev/null ) && plugins+=( vim-interaction )
=======
#( which vim &>/dev/null ) && plugins+=( vim-interaction )
>>>>>>> origin/develop
( which ssh &>/dev/null ) && [[ -d ~/.ssh ]] && plugins+=( ssh-agent )
plugins+=(
zsh-completions
@ -174,29 +170,18 @@ then
[ -z "$TMUX_PATH" ] && TMUX_PATH=~/.config/tmux
# Bootstrap the user's plugin directory, if required
<<<<<<< HEAD
[ -d "$TMUX_PATH/plugins" ] || {
cp -r "$PSOXIZSH/tmux/plugins" "$TMUX_PATH"
}
=======
[ -d "$TMUX_PATH/plugins" ] || { mkdir -vp "$TMUX_PATH/plugins" && cp -r "$PSOXIZSH/tmux/plugins" "$TMUX_PATH/plugins" }
>>>>>>> origin/develop
# Both tmux and TPM are very opininated about where configs must live,
# and TPM will only expand one layer of source-file directives, so we
# symlink the base config to the user local config file, if it doesn't
# exist.
<<<<<<< HEAD
[[ ! -f $TMUX_PATH/tmux.conf ]] && cp -r "$PSOXIZSH/tmux/tmux.conf" "$TMUX_PATH/tmux.conf"
[[ ! -f ~/.tmux.conf ]] && ln -s $PSOXIZSH/tmux/tmux.conf ~/.tmux.conf
[[ ! -f "$TMUX_PATH/plugins.conf" ]] && ln -vs "$PSOXIZSH/tmux/fragment/plugins.conf" "$TMUX_PATH/plugins.conf"
[[ "$USER" == "astemmet" ]] && [[ ! -f $TMUX_PATH/keys.conf ]] && {
cp -v "$PSOXIZSH/tmux/fragment/ctrl-alt-movement.conf" "$TMUX_PATH/keys.conf"
}
=======
[ ! -f ~/.tmux.conf ] && ln -s $PSOXIZSH/tmux/tmux.conf ~/.tmux.conf
[ ! -f "$TMUX_PATH/plugins.conf" ] && ln -s "$PSOXIZSH/tmux/fragment/plugins.conf" "$TMUX_PATH/plugins.conf"
>>>>>>> origin/develop
export TMUX_PATH=$TMUX_PATH TMUX_PLUGINS="$TMUX_PATH/plugins" TMUX_CONFIG=~/.tmux.conf
fi
@ -214,12 +199,9 @@ alias curlj="curl -H 'Content-Type: application/json' "
which nvim >/dev/null 2>&1 && alias vim="$(which nvim)"
alias v=vim
[[ -x /usr/bin/yay ]] && [[ "$(whoami)" != "pacman" ]] && alias yay='sudo -iupacman /usr/bin/yay'
<<<<<<< HEAD
[[ -x /usr/bin/paru ]] && [[ "$(whoami)" != "pacman" ]] && alias yay='sudo -iupacman /usr/bin/paru'
[[ -x /usr/bin/paru ]] && [[ "$(whoami)" != "pacman" ]] && alias paru='sudo -iupacman /usr/bin/paru'
[[ -x /usr/bin/bat ]] && export MANPAGER="sh -c 'col -bx | bat -l man -p'"
=======
[[ -x /usr/bin/paru ]] && [[ "$(whoami)" != "pacman" ]] && alias yay='sudo -iupacman /usr/bin/paru'
>>>>>>> origin/develop
typeset -A key