Merge branch 'master' of git.yorune.pl:y0rune/myhome

This commit is contained in:
Marcin Woźniak 2021-10-01 16:20:00 +02:00
commit f8383f13a3
7 changed files with 48 additions and 6 deletions

View File

@ -11,7 +11,7 @@ font:
normal: normal:
family: Terminus (TTF) family: Terminus (TTF)
style: Bold style: Bold
size: 16 size: 18
key_bindings: key_bindings:
- { key: Return, mods: Control|Shift, action: SpawnNewInstance } - { key: Return, mods: Control|Shift, action: SpawnNewInstance }

View File

@ -22,5 +22,5 @@ color listfocus_unread yellow default bold
color info red black bold color info red black bold
color article white default bold color article white default bold
browser "/home/yorune/.local/bin/browser-x -new-tab %u" browser "$HOME/.local/bin/browser-x -new-tab %u"
player mpv player mpv

View File

@ -7,7 +7,8 @@
"python", "python",
"css", "css",
"markdown", "markdown",
"ruby" "ruby",
"go"
], ],
"diagnostic.virtualText": true, "diagnostic.virtualText": true,
"diagnostic.virtualTextCurrentLineOnly": false, "diagnostic.virtualTextCurrentLineOnly": false,

View File

@ -8,6 +8,8 @@ endif
let mapleader = "\<Space>" let mapleader = "\<Space>"
let g:python3_host_prog = expand('/usr/src/python') let g:python3_host_prog = expand('/usr/src/python')
set laststatus=2 set laststatus=2
set autoindent
set noexpandtab
set shiftwidth=4 set shiftwidth=4
set softtabstop=4 set softtabstop=4
set tabstop=4 set tabstop=4
@ -138,7 +140,6 @@ set title
" indent " indent
set backspace=indent,eol,start set backspace=indent,eol,start
set shiftwidth=4 set shiftwidth=4
set expandtab
set list listchars=nbsp,tab:»·,trail,extends:> set list listchars=nbsp,tab:»·,trail,extends:>
" editing " editing

34
.local/bin/backupSynologyMac Executable file
View File

@ -0,0 +1,34 @@
#!/bin/bash
MEGA_VOLUME="/Volumes/Mega"
MEGA="$HOME/MEGA"
STARTED="$HOME/.config/backup-started-$(date +%d-%m)"
function main(){
if [[ ! -e "$STARTED" ]]
then
touch "$STARTED" && echo -e "[LOG] $(date) Created the file $STARTED"
echo -e "[LOG] $(date) Started $HOME/.ssh/ -> $MEGA/ssh"
rsync --bwlimit=1024 --update --progress -r "$HOME/.ssh/" "$MEGA/ssh/"
echo -e "[LOG] $(date) Finished $HOME/.ssh/ -> $MEGA/ssh"
echo -e "[LOG] $(date) Started $HOME/.gnupg/ -> $MEGA/gnupg"
rsync --bwlimit=1024 --update --progress -r "$HOME/.gnupg/" "$MEGA/gnupg/"
echo -e "[LOG] $(date) Finished $HOME/.gnupg/ -> $MEGA/gnupg"
if [[ -e "$MEGA_VOLUME" ]]
then
echo -e "[LOG] $(date) Started $MEGA -> $MEGA_VOLUME"
rsync --bwlimit=1024 --update --progress -r "$MEGA/" "$MEGA_VOLUME/"
else
echo -e "[ERROR] The folder $MEGA_VOLUME does NOT exist"
fi
echo -e "[LOG] $(date) Removed the files $STARTED and $STARTED *"
rm -rf "$STARTED"
rm -rf "$HOME/.config/backup-started-*"
fi
}
main > "$HOME/.config/backup.log"

View File

@ -6,6 +6,7 @@ export QT_IM_MODULE=ibus
KERNEL=$(uname -sr) KERNEL=$(uname -sr)
[[ $KERNEL =~ "icrosoft" ]] && "/mnt/c/Program Files/Mozilla Firefox/firefox.exe" "$@" [[ $KERNEL =~ "icrosoft" ]] && "/mnt/c/Program Files/Mozilla Firefox/firefox.exe" "$@"
[[ $KERNEL =~ "gentoo" ]] && GDK_DPI_SCALE="1.2" firefox "$@" [[ $KERNEL =~ "gentoo" ]] && GDK_DPI_SCALE="1.2" firefox "$@"
[[ $KERNEL =~ "Darwin" ]] && open -a Opera -n "$2"
#[[ $KERNEL =~ "gentoo" ]] && __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 __GLX_VENDOR_LIBRARY_NAME=nvidia __GL_SYNC_TO_VBLANK=0 GDK_DPI_SCALE="1.2" firefox "$@" #[[ $KERNEL =~ "gentoo" ]] && __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 __GLX_VENDOR_LIBRARY_NAME=nvidia __GL_SYNC_TO_VBLANK=0 GDK_DPI_SCALE="1.2" firefox "$@"
# Firefox # Firefox

9
.zshrc
View File

@ -64,7 +64,7 @@ alias emerge="sudo emerge"
alias channel-check='sudo iwlist wlan0 scan | egrep -i "essid|frequency"' alias channel-check='sudo iwlist wlan0 scan | egrep -i "essid|frequency"'
alias grep="grep --color=always" alias grep="grep --color=always"
alias egrep="egrep --color=always" alias egrep="egrep --color=always"
[[ "$(uname)" == "Darwin" ]] && alias ls="ls -h" || alias ls="ls -h --color=auto" [[ "$(uname)" == "Darwin" ]] && alias ls="ls -Gh" || alias ls="ls -h --color=auto"
alias ll='ls -lha' alias ll='ls -lha'
alias cp='cp -v' alias cp='cp -v'
alias mv='mv -v' alias mv='mv -v'
@ -102,7 +102,8 @@ alias denpl="trans en:pl"
alias dplen="trans pl:en" alias dplen="trans pl:en"
alias notes="nvim $HOME/git/notes/index.md" alias notes="nvim $HOME/git/notes/index.md"
alias mgr="cd $HOME/Documents/Mega-Documents/Magisterka-Marcin/Semestr1/" alias mgr="cd $HOME/Documents/Mega-Documents/Magisterka-Marcin/Semestr1/"
alias mpv="__NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 __GLX_VENDOR_LIBRARY_NAME=nvidia __GL_SYNC_TO_VBLANK=0 mpv --vo=x11 --hwdec=no --ytdl-raw-options="yes-playlist=" --no-resume-playback --ytdl-format='bestvideo[height<=?1080]+bestaudio/best'" [[ "$(uname)" == "Darwin" ]] || alias mpv="__NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 __GLX_VENDOR_LIBRARY_NAME=nvidia __GL_SYNC_TO_VBLANK=0 mpv --vo=x11 --hwdec=no --ytdl-raw-options="yes-playlist=" --no-resume-playback --ytdl-format='bestvideo[height<=?1080]+bestaudio/best'"
[[ "$(uname)" == "Darwin" ]] && alias lsblk="diskutil list"
alias aria2c="aria2c --seed-time=0 --disable-ipv6 --max-upload-limit=1k" alias aria2c="aria2c --seed-time=0 --disable-ipv6 --max-upload-limit=1k"
alias lg="lazygit" alias lg="lazygit"
alias update-brew="brew upgrade --cask" alias update-brew="brew upgrade --cask"
@ -110,5 +111,9 @@ alias update-brew="brew upgrade --cask"
# Cleaning-up # Cleaning-up
export PATH=$HOME/.local/bin:$PATH export PATH=$HOME/.local/bin:$PATH
export PATH=/sbin:$PATH export PATH=/sbin:$PATH
export GOPATH=$HOME/golang
export GOROOT=/usr/local/opt/go/libexec
export PATH=$PATH:$GOPATH/bin
export PATH=$PATH:$GOROOT/bin
[ -d $HOME/repo/fortigate/bin ] && export PATH=$HOME/repo/fortigate/bin:$PATH [ -d $HOME/repo/fortigate/bin ] && export PATH=$HOME/repo/fortigate/bin:$PATH
export HISTTIMEFORMAT="%F %T " export HISTTIMEFORMAT="%F %T "