From 1d1405c77d226a4d04cba29ae1e9dcc63cef95b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Wed, 15 Sep 2021 20:12:28 +0200 Subject: [PATCH 1/8] Changed -h to -Gh due to mac os --- .zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index 3a16a5c..493a52b 100644 --- a/.zshrc +++ b/.zshrc @@ -64,7 +64,7 @@ alias emerge="sudo emerge" alias channel-check='sudo iwlist wlan0 scan | egrep -i "essid|frequency"' alias grep="grep --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 cp='cp -v' alias mv='mv -v' From f02162aabd6601a67177c7665dbf48d05a6a8f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Tue, 21 Sep 2021 11:02:08 +0200 Subject: [PATCH 2/8] Changed /home/yorune -> $HOME --- .config/newsboat/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/newsboat/config b/.config/newsboat/config index 5b0fed3..a37f6ca 100644 --- a/.config/newsboat/config +++ b/.config/newsboat/config @@ -22,5 +22,5 @@ color listfocus_unread yellow default bold color info red black 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 From 6580df172e5a105cc9b59221f61199670e73e08a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Tue, 21 Sep 2021 11:02:32 +0200 Subject: [PATCH 3/8] Added Darwin into browser-x --- .local/bin/browser-x | 1 + 1 file changed, 1 insertion(+) diff --git a/.local/bin/browser-x b/.local/bin/browser-x index 648922f..ee9e718 100755 --- a/.local/bin/browser-x +++ b/.local/bin/browser-x @@ -6,6 +6,7 @@ export QT_IM_MODULE=ibus KERNEL=$(uname -sr) [[ $KERNEL =~ "icrosoft" ]] && "/mnt/c/Program Files/Mozilla Firefox/firefox.exe" "$@" [[ $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 "$@" # Firefox From b0d7717c4e21ece826497a74eba07999031b8e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Tue, 21 Sep 2021 11:02:54 +0200 Subject: [PATCH 4/8] Added alias for mpv for Darwin --- .zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index 493a52b..673d3a8 100644 --- a/.zshrc +++ b/.zshrc @@ -102,7 +102,7 @@ alias denpl="trans en:pl" alias dplen="trans pl:en" alias notes="nvim $HOME/git/notes/index.md" 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'" alias aria2c="aria2c --seed-time=0 --disable-ipv6 --max-upload-limit=1k" alias lg="lazygit" alias update-brew="brew upgrade --cask" From 3a14cd8b4da545879dc8ae92079679839f4f2d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Wed, 29 Sep 2021 20:17:26 +0200 Subject: [PATCH 5/8] Added golang --- .config/nvim/coc-settings.json | 3 ++- .config/nvim/init.vim | 3 ++- .zshrc | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json index 74b8ba8..2627c70 100644 --- a/.config/nvim/coc-settings.json +++ b/.config/nvim/coc-settings.json @@ -7,7 +7,8 @@ "python", "css", "markdown", - "ruby" + "ruby", + "go" ], "diagnostic.virtualText": true, "diagnostic.virtualTextCurrentLineOnly": false, diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 75d47ea..78c2753 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -8,6 +8,8 @@ endif let mapleader = "\" let g:python3_host_prog = expand('/usr/src/python') set laststatus=2 +set autoindent +set noexpandtab set shiftwidth=4 set softtabstop=4 set tabstop=4 @@ -138,7 +140,6 @@ set title " indent set backspace=indent,eol,start set shiftwidth=4 -set expandtab set list listchars=nbsp:¬,tab:»·,trail:·,extends:> " editing diff --git a/.zshrc b/.zshrc index 673d3a8..2ec96b9 100644 --- a/.zshrc +++ b/.zshrc @@ -110,5 +110,9 @@ alias update-brew="brew upgrade --cask" # Cleaning-up export PATH=$HOME/.local/bin:$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 export HISTTIMEFORMAT="%F %T " From 60b7c9efd80cdded7319397db7fda1e6e8a53cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Wed, 29 Sep 2021 20:17:39 +0200 Subject: [PATCH 6/8] Added lsblk in MaC --- .zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.zshrc b/.zshrc index 2ec96b9..29f286e 100644 --- a/.zshrc +++ b/.zshrc @@ -103,6 +103,7 @@ alias dplen="trans pl:en" alias notes="nvim $HOME/git/notes/index.md" alias mgr="cd $HOME/Documents/Mega-Documents/Magisterka-Marcin/Semestr1/" [[ "$(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 lg="lazygit" alias update-brew="brew upgrade --cask" From 0453fcb73c836b7bbce8b0a2cee7ed18b1678afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Thu, 30 Sep 2021 12:48:51 +0200 Subject: [PATCH 7/8] Added new backups in Mac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Woźniak --- .local/bin/backupSynologyMac | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 .local/bin/backupSynologyMac diff --git a/.local/bin/backupSynologyMac b/.local/bin/backupSynologyMac new file mode 100755 index 0000000..f9817f5 --- /dev/null +++ b/.local/bin/backupSynologyMac @@ -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" From 76f02447fcd8d2169e6c826bbddb7759a50dc4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Thu, 30 Sep 2021 15:07:02 +0200 Subject: [PATCH 8/8] Changed size from 16 to 18 --- .alacritty.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.alacritty.yml b/.alacritty.yml index 25fefea..30e1935 100644 --- a/.alacritty.yml +++ b/.alacritty.yml @@ -11,7 +11,7 @@ font: normal: family: Terminus (TTF) style: Bold - size: 16 + size: 18 key_bindings: - { key: Return, mods: Control|Shift, action: SpawnNewInstance }