Various fixes
parent
1374da92d7
commit
989a6215c8
4
.aliases
4
.aliases
|
@ -3,3 +3,7 @@ alias ap='ansible-playbook'
|
||||||
alias yey='yay -Syu --noconfirm'
|
alias yey='yay -Syu --noconfirm'
|
||||||
# Avoid losing stuff
|
# Avoid losing stuff
|
||||||
alias rm='rmtrash'
|
alias rm='rmtrash'
|
||||||
|
# cp is rsync
|
||||||
|
alias cp='cpv'
|
||||||
|
# ls sorted by modification time
|
||||||
|
alias lt='ls -lath'
|
||||||
|
|
4
.vimrc
4
.vimrc
|
@ -1,4 +1,6 @@
|
||||||
vmap <C-c> :<Esc>`>a<CR><Esc>mx`<i<CR><Esc>my'xk$v'y!xclip -selection c<CR>u
|
vmap <C-c> :<Esc>`>a<CR><Esc>mx`<i<CR><Esc>my'xk$v'y!xclip -selection c<CR>u
|
||||||
map <Insert> :set paste<CR>i<CR><CR><Esc>k:.!xclip -o<CR>JxkJx:set nopaste<CR>
|
map <Insert> :set paste<CR>i<CR><CR><Esc>k:.!xclip -o<CR>JxkJx:set nopaste<CR>
|
||||||
" Reopen the last edited position in files
|
" Reopen the last edited position in files
|
||||||
au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
|
au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
|
||||||
|
syntax on
|
||||||
|
filetype on
|
||||||
|
|
12
.zshrc
12
.zshrc
|
@ -24,8 +24,6 @@ HISTFILE=~/.zsh_history
|
||||||
HISTSIZE=10000
|
HISTSIZE=10000
|
||||||
SAVEHIST=10000
|
SAVEHIST=10000
|
||||||
|
|
||||||
[[ -s /home/.autojump/etc/profile.d/autojump.sh ]] && source /home/.autojump/etc/profile.d/autojump.sh
|
|
||||||
autoload -U compinit && compinit -u
|
|
||||||
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
|
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
|
||||||
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
|
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
|
||||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||||
|
@ -64,21 +62,21 @@ zstyle ':completion:*:*:docker-*:*' option-stacking yes
|
||||||
# Load ZSH
|
# Load ZSH
|
||||||
source $ZSH/oh-my-zsh.sh
|
source $ZSH/oh-my-zsh.sh
|
||||||
|
|
||||||
|
# Use Catppuccin prompt theme made for Oh My Posh, in zsh
|
||||||
|
eval "$(oh-my-posh init zsh --config https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/quick-term.omp.json)"
|
||||||
|
|
||||||
# Preferred editor for local and remote sessions
|
# Preferred editor for local and remote sessions
|
||||||
export EDITOR=vim
|
export EDITOR=vim
|
||||||
|
|
||||||
# Do not print user@hostname if user is myself
|
# Do not print user@hostname if user is myself
|
||||||
DEFAULT_USER=`whoami`
|
DEFAULT_USER=`whoami`
|
||||||
|
|
||||||
# Aliases
|
|
||||||
alias cp="cpv"
|
|
||||||
alias lt='ls -lath'
|
|
||||||
|
|
||||||
# To use when .cfg contains a bare git repo.
|
# To use when .cfg contains a bare git repo.
|
||||||
# See this https://developer.atlassian.com/blog/2016/02/best-way-to-store-dotfiles-git-bare-repo/
|
# See this https://developer.atlassian.com/blog/2016/02/best-way-to-store-dotfiles-git-bare-repo/
|
||||||
alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME'
|
alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME'
|
||||||
config config --local status.showUntrackedFiles no
|
config config --local status.showUntrackedFiles no
|
||||||
|
|
||||||
|
# Use GPG key for SSH authentication
|
||||||
unset SSH_AGENT_PID
|
unset SSH_AGENT_PID
|
||||||
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
|
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
|
||||||
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
|
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
|
||||||
|
@ -86,10 +84,12 @@ fi
|
||||||
export GPG_TTY="$(tty)"
|
export GPG_TTY="$(tty)"
|
||||||
gpg-connect-agent updatestartuptty /bye >/dev/null
|
gpg-connect-agent updatestartuptty /bye >/dev/null
|
||||||
|
|
||||||
|
# Source aliases
|
||||||
if [ -f ~/.aliases ]; then
|
if [ -f ~/.aliases ]; then
|
||||||
. ~/.aliases
|
. ~/.aliases
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Source environment variables
|
||||||
if [ -f ~/.env ]; then
|
if [ -f ~/.env ]; then
|
||||||
. ~/.env
|
. ~/.env
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue