added link vimdiff

This commit is contained in:
piccihud 2023-05-25 16:28:29 +02:00
parent 665b46d5a4
commit 5836f405d8
5 changed files with 208 additions and 12 deletions

190
linux/bash/bashrc Normal file
View File

@ -0,0 +1,190 @@
# ~/.bashrc: executed by bash(1) for non-login shells.
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
# for examples
# If not running interactively, don't do anything
case $- in
*i*) ;;
*) return;;
esac
# don't put duplicate lines or lines starting with space in the history.
# See bash(1) for more options
HISTCONTROL=ignoreboth
# append to the history file, don't overwrite it
shopt -s histappend
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
HISTSIZE=-1
HISTFILESIZE=-1
# check the window size after each command and, if necessary,
# update the values of LINES and COLUMNS.
shopt -s checkwinsize
# If set, the pattern "**" used in a pathname expansion context will
# match all files and zero or more directories and subdirectories.
#shopt -s globstar
# make less more friendly for non-text input files, see lesspipe(1)
#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
# set variable identifying the chroot you work in (used in the prompt below)
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
debian_chroot=$(cat /etc/debian_chroot)
fi
# set a fancy prompt (non-color, unless we know we "want" color)
case "$TERM" in
xterm-color|*-256color) color_prompt=yes;;
esac
# uncomment for a colored prompt, if the terminal has the capability; turned
# off by default to not distract the user: the focus in a terminal window
# should be on the output of commands, not on the prompt
#force_color_prompt=yes
if [ -n "$force_color_prompt" ]; then
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
# We have color support; assume it's compliant with Ecma-48
# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
# a case would tend to support setf rather than setaf.)
color_prompt=yes
else
color_prompt=
fi
fi
if [ "$color_prompt" = yes ]; then
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
else
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
fi
unset color_prompt force_color_prompt
# If this is an xterm set the title to user@host:dir
case "$TERM" in
xterm*|rxvt*)
PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
;;
*)
;;
esac
# enable color support of ls and also add handy aliases
if [ -x /usr/bin/dircolors ]; then
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
alias ls='ls --color=auto'
#alias dir='dir --color=auto'
#alias vdir='vdir --color=auto'
alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto'
fi
# colored GCC warnings and errors
#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
# some more ls aliases
#alias ll='ls -l'
#alias la='ls -A'
#alias l='ls -CF'
# Alias definitions.
# You may want to put all your additions into a separate file like
# ~/.bash_aliases, instead of adding them here directly.
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
if [ -f ~/.bash_aliases ]; then
. ~/.bash_aliases
fi
# enable programmable completion features (you don't need to enable
# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
# sources /etc/bash.bashrc).
#if ! shopt -oq posix; then
# if [ -f /usr/share/bash-completion/bash_completion ]; then
# . /usr/share/bash-completion/bash_completion
# elif [ -f /etc/bash_completion ]; then
# . /etc/bash_completion
# fi
#fi
# Use bash-completion, if available
[[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \
. /usr/share/bash-completion/bash_completion
# To get first completion and a listing you can add the following to bashrc
bind 'set show-all-if-ambiguous on'
bind 'TAB:menu-complete'
export PATH="$PATH:$HOME/.cargo/bin:$HOME/.local/bin:$HOME/bin:$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin"
# alias
alias hh="hstr"
alias update="sudo nala update ; sudo nala upgrade -y ; sudo nala autoremove -y ; flatpak upgrade -y ; flatpak uninstall --unused -y"
alias ll='exa -lh --icons'
alias install="sudo nala install -y"
alias purge="sudo nala purge -y"
alias autoremove="sudo nala autoremove -y"
alias v="vim 2> /dev/null"
alias sv="sudo vim 2> /dev/null"
alias ga="git add ."
alias push="git push -u origin master"
alias pull="git pull"
alias gs="git status"
alias gm="git commit -m"
# alias rr="rnr 2> /dev/null"
alias rr="source ranger 2> /dev/null"
alias ..="cd .."
alias ....="cd ../.."
alias ipc="ip --color a"
alias ss="scrcpy -S"
alias weather="curl https://wttr.in/Sacile"
alias nn="ncdu --color dark"
alias pd="pandoc -f markdown -t pdf --pdf-engine=xelatex -V lang=it -V colorlinks=true -V linkcolor=teal -V urlcolor=teal -V toccolor=gray --template eisvogel --listings -V table-use-row-colors=true"
alias fh="feh"
alias fhm="feh -m"
# RNR
source ~/.local/share/rnr/rnr.sh
stty -ixon
# PS1
DEFAULT="\[\033[0m\]"
RED="\[\033[1;31m\]"
GREEN="\[\033[0;32m\]"
BLUE="\[\033[1;34m\]"
EBLACK="\[\033[1;30m\]"
PURPLE="\[\033[35m\]"
YELLOW="\[\033[1;33m\]"
CYAN="\[\033[1;36m\]"
parse_git_branch() {
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
}
export PS1="$GREEN[\A \d]$CYAN\u$BLUE@\h $DEFAULT(\!):$YELLOW\w $PURPLE\n\$(parse_git_branch)$DEFAULT > "
# HSTR configuration - add this to ~/.bashrc
export HSTR_CONFIG=monochromatic # get more colors
shopt -s histappend # append new history items to .bash_history
export HISTCONTROL=ignorespace # leading space hides commands from history
export HISTSIZE=${HISTFILESIZE} # increase history size (default is 500)
# ensure synchronization between bash memory and history file
export PROMPT_COMMAND="history -a; history -n; ${PROMPT_COMMAND}"
# if this is interactive shell, then bind hstr to Ctrl-r (for Vi mode check doc)
if [[ $- =~ .*i.* ]]; then bind '"\C-r": "\C-a hstr -- \C-j"'; fi
# if this is interactive shell, then bind 'kill last command' to Ctrl-x k
if [[ $- =~ .*i.* ]]; then bind '"\C-xk": "\C-a hstr -k \C-j"'; fi
# Editor
export EDITOR='vim'
export VISUAL='vim'

4
linux/bash/inputrc Normal file
View File

@ -0,0 +1,4 @@
"\e[5~": history-search-backward
"\e[6~": history-search-forward

View File

@ -91,9 +91,10 @@ Solo in dir1: file1
## Vimdiff ## Vimdiff
Per chi utilizza vim, esiste `vimdiff` Per chi utilizza vim, esiste `vimdiff`.
## Collegamenti ## Collegamenti
- [https://www.howtogeek.com/410532/how-to-compare-two-text-files-in-the-linux-terminal/](https://www.howtogeek.com/410532/how-to-compare-two-text-files-in-the-linux-terminal/) - [https://www.howtogeek.com/410532/how-to-compare-two-text-files-in-the-linux-terminal/](https://www.howtogeek.com/410532/how-to-compare-two-text-files-in-the-linux-terminal/)
- [https://linuxhandbook.com/compare-directories/](https://linuxhandbook.com/compare-directories/) - [https://linuxhandbook.com/compare-directories/](https://linuxhandbook.com/compare-directories/)
- [https://youtu.be/Eb8S_KkmLS8](https://youtu.be/Eb8S_KkmLS8)

View File

@ -1,4 +1,4 @@
ext css|md|conf|txt|sh = vim "$@" ext css|.|md|conf|txt|sh = vim "$@"
ext ogv|mp4|avi|mkv|ogg = mpv "$@" ext ogv|mp4|avi|mkv|ogg = mpv "$@"
ext pdf = okular "$@" ext pdf = okular "$@"
ext png|jpg = feh "$@" ext png|jpg = feh "$@"

View File

@ -9,13 +9,14 @@
0 21,22 * * * pg_dump cinema > ~/Databases/filmdb.sql 0 21,22 * * * pg_dump cinema > ~/Databases/filmdb.sql
#0 9,20 * * * nice -n 19 clamscan -ir $HOME --log=clamavlog.txt --move=$HOME/quarantine/ 2>&1 #0 9,20 * * * nice -n 19 clamscan -ir $HOME --log=clamavlog.txt --move=$HOME/quarantine/ 2>&1
0 22 * * * davide /usr/bin/rsync -az --delete --exclude=Nextcloud ~/ /media/davide/Backup/Desktop/ && date >> ~/backup.log 0 22 * * * /usr/bin/rsync -az --delete --exclude=Nextcloud ~/ /media/davide/Backup/Desktop/ && date >> ~/backup.log
0 9,20 * * * davide rsync -aPz ~/.bashrc ~/Documenti/repos/mywiki/linux/bash/bashrc 54 9,15,20 * * * rsync -aPz ~/.bashrc ~/Documenti/repos/mywiki/linux/bash/bashrc
0 9,20 * * * davide rsync -aPz ~/.inputrc ~/Documenti/repos/mywiki/linux/bash/inputrc 54 9,15,20 * * * rsync -aPz ~/.inputrc ~/Documenti/repos/mywiki/linux/bash/inputrc
0 9,20 * * * davide rsync -aPz ~/.config/alacritty/alacritty.yml ~/Documenti/repos/mywiki/linux/alacritty/alacritty.yml 54 9,15,20 * * * rsync -aPz ~/.config/alacritty/alacritty.yml ~/Documenti/repos/mywiki/linux/alacritty/alacritty.yml
0 9,20 * * * davide rsync -aPz ~/..config/feh/ ~/Documenti/repos/mywiki/linux/feh/ 54 9,15,20 * * * rsync -aPz ~/.config/feh/ ~/Documenti/repos/mywiki/linux/feh/
0 9,20 * * * davide rsync -aPz ~/.config/neofetch/ ~/Documenti/repos/mywiki/linux/neofetch/ 54 9,15,20 * * * rsync -aPz ~/.config/neofetch/ ~/Documenti/repos/mywiki/linux/neofetch/
0 9,20 * * * davide rsync -aPz ~/.config/ranger/ ~/Documenti/repos/mywiki/linux/ranger/ 54 9,15,20 * * * rsync -aPz ~/.config/ranger/ ~/Documenti/repos/mywiki/linux/ranger/
0 9,20 * * * davide rsync -aPz ~/.config/rnr/ ~/Documenti/repos/mywiki/linux/rnr/ 54 9,15,20 * * * rsync -aPz ~/.config/rnr/ ~/Documenti/repos/mywiki/linux/rnr/
0 9,20 * * * davide rsync -aPz ~/.xbindkeysrc /home/davide/Documenti/repos/mywiki/linux/xbindkeys/xbindkeysrc 54 9,15,20 * * * rsync -aPz ~/.vimrc ~/Documenti/repos/mywiki/linux/vim/vimrc
0 9,20 * * * davide crontab -l > ~/Documenti/repos/mywiki/linux/script/crontab 54 9,15,20 * * * rsync -aPz ~/.xbindkeysrc /home/davide/Documenti/repos/mywiki/linux/xbindkeys/xbindkeysrc
54 9,15,20 * * * crontab -l > ~/Documenti/repos/mywiki/linux/script/crontab