Compare commits
3 Commits
fd64b7c1bc
...
ea8a1cee3a
| Author | SHA1 | Date |
|---|---|---|
 Marcin Woźniak
|
ea8a1cee3a
|
|
|
Marcin Woźniak
|
39a7bb5233
|
|
|
Marcin Woźniak
|
8f48990287
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"timeStamp": 1672829298245,
|
||||
"version": "1.44.2",
|
||||
"timeStamp": 1704543685914,
|
||||
"version": "1.54.0",
|
||||
"userSettings": {
|
||||
"externalLists": "https://alleblock.pl/alleblock/alleblock.txt\nhttps://curben.gitlab.io/malware-filter/phishing-filter-hosts.txt\nhttps://curben.gitlab.io/malware-filter/urlhaus-filter-hosts-online.txt\nhttps://hole.cert.pl/domains/domains_adblock.txt\nhttps://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate versions Anti-Malware List/AntiMalwareHosts.txt\nhttps://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion Sprout's Anti-Malware List.txt\nhttps://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts\nhttps://raw.githubusercontent.com/FiltersHeroes/KAD/master/KAD.txt\nhttps://raw.githubusercontent.com/FiltersHeroes/KADhosts/master/KADhole.txt\nhttps://raw.githubusercontent.com/FiltersHeroes/KADhosts/master/KADhosts.txt\nhttps://raw.githubusercontent.com/FiltersHeroes/PolishAnnoyanceFilters/master/PAF_supp.txt\nhttps://raw.githubusercontent.com/FiltersHeroes/PolishAntiAnnoyingSpecialSupplement/master/polish_rss_filters.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/adblock_social_filters/adblock_social_list.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/adblock_social_filters/social_filters_uB_AG.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/cookies_filters/cookies_uB_AG.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_adguard.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_test.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_ublock.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-mikrotik-filters/forti_list.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/adservers.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile_regex.txt\nhttps://raw.githubusercontent.com/gioxx/xfiles/master/filtri.txt\nhttps://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt\nhttps://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/nocoin.txt\nhttps://raw.githubusercontent.com/mmotti/pihole-regex/master/regex.list\nhttps://raw.githubusercontent.com/olegwukr/polish-privacy-filters/master/adblock.txt\nhttps://raw.githubusercontent.com/yourduskquibbles/webannoyances/master/ultralist.txt\nhttps://winhelp2002.mvps.org/hosts.txt\nhttps://www.i-dont-care-about-cookies.eu/abp/",
|
||||
"ignoreGenericCosmeticFilters": true,
|
||||
|
|
@ -43,7 +43,6 @@
|
|||
"ublock-badware",
|
||||
"ublock-privacy",
|
||||
"ublock-quick-fixes",
|
||||
"ublock-abuse",
|
||||
"ublock-unbreak",
|
||||
"adguard-generic",
|
||||
"adguard-mobile",
|
||||
|
|
@ -51,26 +50,38 @@
|
|||
"adguard-spyware",
|
||||
"easyprivacy",
|
||||
"urlhaus-1",
|
||||
"adguard-annoyance",
|
||||
"adguard-social",
|
||||
"fanboy-annoyance",
|
||||
"fanboy-social",
|
||||
"dpollock-0",
|
||||
"plowe-0",
|
||||
"ara-0",
|
||||
"adguard-mobile-app-banners",
|
||||
"adguard-other-annoyances",
|
||||
"adguard-popup-overlays",
|
||||
"adguard-social",
|
||||
"adguard-widgets",
|
||||
"adguard-cookies",
|
||||
"ublock-cookies-adguard",
|
||||
"easylist-chat",
|
||||
"easylist-newsletters",
|
||||
"easylist-notifications",
|
||||
"easylist-annoyances",
|
||||
"fanboy-social",
|
||||
"fanboy-cookiemonster",
|
||||
"ublock-cookies-easylist",
|
||||
"BGR-0",
|
||||
"CHN-0",
|
||||
"CZE-0",
|
||||
"DEU-0",
|
||||
"EST-0",
|
||||
"ara-0",
|
||||
"spa-1",
|
||||
"spa-0",
|
||||
"FIN-0",
|
||||
"FRA-0",
|
||||
"GRC-0",
|
||||
"HUN-0",
|
||||
"IDN-0",
|
||||
"ISR-0",
|
||||
"IRN-0",
|
||||
"ISL-0",
|
||||
"ISR-0",
|
||||
"ITA-0",
|
||||
"JPN-1",
|
||||
"KOR-1",
|
||||
|
|
@ -82,42 +93,40 @@
|
|||
"POL-2",
|
||||
"ROU-1",
|
||||
"RUS-0",
|
||||
"spa-1",
|
||||
"spa-0",
|
||||
"SVN-0",
|
||||
"SWE-1",
|
||||
"SVN-0",
|
||||
"THA-0",
|
||||
"TUR-0",
|
||||
"VIE-1",
|
||||
"https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts",
|
||||
"https://raw.githubusercontent.com/FiltersHeroes/PolishAnnoyanceFilters/master/PAF_supp.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/adblock_social_filters/social_filters_uB_AG.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/cookies_filters/cookies_uB_AG.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-mikrotik-filters/forti_list.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile_regex.txt",
|
||||
"https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt",
|
||||
"https://raw.githubusercontent.com/mmotti/pihole-regex/master/regex.list",
|
||||
"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion Sprout's Anti-Malware List.txt",
|
||||
"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate versions Anti-Malware List/AntiMalwareHosts.txt",
|
||||
"https://raw.githubusercontent.com/gioxx/xfiles/master/filtri.txt",
|
||||
"https://raw.githubusercontent.com/FiltersHeroes/KAD/master/KAD.txt",
|
||||
"https://raw.githubusercontent.com/FiltersHeroes/PolishAntiAnnoyingSpecialSupplement/master/polish_rss_filters.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/adblock_social_filters/adblock_social_list.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_test.txt",
|
||||
"https://alleblock.pl/alleblock/alleblock.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/adservers.txt",
|
||||
"https://hole.cert.pl/domains/domains_adblock.txt",
|
||||
"https://curben.gitlab.io/malware-filter/phishing-filter-hosts.txt",
|
||||
"https://curben.gitlab.io/malware-filter/urlhaus-filter-hosts-online.txt",
|
||||
"https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts",
|
||||
"https://raw.githubusercontent.com/FiltersHeroes/PolishAnnoyanceFilters/master/PAF_supp.txt",
|
||||
"https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/adblock_social_filters/social_filters_uB_AG.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/cookies_filters/cookies_uB_AG.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-mikrotik-filters/forti_list.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile_regex.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile.txt",
|
||||
"https://raw.githubusercontent.com/mmotti/pihole-regex/master/regex.list",
|
||||
"https://winhelp2002.mvps.org/hosts.txt",
|
||||
"https://www.i-dont-care-about-cookies.eu/abp/",
|
||||
"https://raw.githubusercontent.com/FiltersHeroes/KAD/master/KAD.txt",
|
||||
"https://raw.githubusercontent.com/FiltersHeroes/KADhosts/master/KADhole.txt",
|
||||
"https://raw.githubusercontent.com/FiltersHeroes/KADhosts/master/KADhosts.txt",
|
||||
"https://winhelp2002.mvps.org/hosts.txt",
|
||||
"https://raw.githubusercontent.com/gioxx/xfiles/master/filtri.txt",
|
||||
"https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/nocoin.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_adguard.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_ublock.txt",
|
||||
"https://curben.gitlab.io/malware-filter/urlhaus-filter-hosts-online.txt",
|
||||
"https://curben.gitlab.io/malware-filter/phishing-filter-hosts.txt",
|
||||
"https://raw.githubusercontent.com/olegwukr/polish-privacy-filters/master/adblock.txt",
|
||||
"https://raw.githubusercontent.com/FiltersHeroes/PolishAntiAnnoyingSpecialSupplement/master/polish_rss_filters.txt",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/adblock_social_filters/adblock_social_list.txt",
|
||||
"https://raw.githubusercontent.com/yourduskquibbles/webannoyances/master/ultralist.txt"
|
||||
],
|
||||
"hiddenSettings": {},
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
#!/bin/bash
|
||||
# shellcheck disable=2045,2086
|
||||
# shellcheck disable=2010,2045,2086,2155
|
||||
|
||||
# Path to the zsh folder
|
||||
ZSHFOLDER=$HOME/.config/zsh
|
||||
CONFIG="$HOME/.config"
|
||||
|
||||
|
|
@ -9,8 +10,23 @@ RED='\033[0;31m'
|
|||
GREEN='\033[0;0;32m'
|
||||
NC='\033[0m'
|
||||
|
||||
PIPEXT="--user --force --quiet --break-system-packages"
|
||||
# Stable version
|
||||
TERRAFORM_VERSION="1.5.7"
|
||||
|
||||
# Python
|
||||
export PYTHONVERSION=$(ls -la /opt/homebrew/opt/ |
|
||||
grep -iEo 'python@.* ->' |
|
||||
sed 's/ ->//g' |
|
||||
sort |
|
||||
tail -n1 |
|
||||
sed 's/python@//g')
|
||||
python="/opt/homebrew/bin/python$PYTHONVERSION"
|
||||
pip="/opt/homebrew/bin/pip$PYTHONVERSION"
|
||||
|
||||
PIPEXT="--user --force --quiet --break-system-packages --no-warn-script-location"
|
||||
PIPEXTPRE="--pre $PIPEXT"
|
||||
|
||||
# Gentoo release
|
||||
GENTOO="/etc/gentoo-release"
|
||||
|
||||
# if [[ "$(uname -r)" =~ "gentoo" || "$(uname -r)" =~ "WSL2" ]]; then
|
||||
|
|
@ -38,7 +54,7 @@ function command_start() {
|
|||
function update_pip() {
|
||||
# Update the pip
|
||||
if [[ "$(uname)" == "Darwin" ]]; then
|
||||
python3 -m pip install --upgrade pip --user
|
||||
$python -m pip install --upgrade pip --user --break-system-packages
|
||||
elif [[ -f $GENTOO ]]; then
|
||||
sudo emerge dev-python/pip
|
||||
fi
|
||||
|
|
@ -46,12 +62,13 @@ function update_pip() {
|
|||
|
||||
function install_neovim_module_for_python() {
|
||||
# Python module in neovim
|
||||
pip3 install pynvim neovim imps $PIPEXTPRE
|
||||
$pip install pynvim neovim imps $PIPEXTPRE
|
||||
}
|
||||
|
||||
function install_pyright() {
|
||||
# Install pyright
|
||||
sudo npm -s -g i pyright --force
|
||||
$pip install black $PIPEXTPRE
|
||||
}
|
||||
|
||||
function install_bash-language-server() {
|
||||
|
|
@ -82,10 +99,10 @@ function install_terraform_stable() {
|
|||
if [[ "$(uname)" == "Darwin" ]]; then
|
||||
brew install tflint -q
|
||||
brew install tfenv -q
|
||||
TFENV_ARCH=amd64 tfenv install 1.5.7
|
||||
tfenv use 1.5.7
|
||||
TFENV_ARCH=amd64 tfenv install "$TERRAFORM_VERSION"
|
||||
tfenv use "$TERRAFORM_VERSION"
|
||||
else
|
||||
GO111MODULE=on go install github.com/hashicorp/terraform@v1.5.7
|
||||
GO111MODULE=on go install github.com/hashicorp/terraform@v"$TERRAFORM_VERSION"
|
||||
curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
|
||||
fi
|
||||
}
|
||||
|
|
@ -97,7 +114,7 @@ function install_terraform() {
|
|||
brew install tflint -q
|
||||
brew install tfenv -q
|
||||
TFENV_ARCH=amd64 tfenv install latest
|
||||
TFENV_VER_ARRAY=($(tfenv list | grep -ioE ' [0-9.]+' | sed -e '1,1d'))
|
||||
mapfile -t TFENV_VER_ARRAY < <(tfenv list | grep -ioE ' [0-9.]+' | sed -e '1,1d')
|
||||
if [ "${#TFENV_VER_ARRAY[@]}" -gt "2" ]; then
|
||||
for i in "${TFENV_VER_ARRAY[@]}"; do
|
||||
tfenv uninstall "$i" && timestamp "Removed - terraform '$i' version"
|
||||
|
|
@ -154,13 +171,13 @@ function install_gopls() {
|
|||
|
||||
function install_black() {
|
||||
# Install black
|
||||
pip3 install black $PIPEXTPRE
|
||||
$pip install black $PIPEXTPRE
|
||||
}
|
||||
|
||||
function install_ansible() {
|
||||
# Install Ansible
|
||||
pip3 install ansible ansible-lint ansible-core $PIPEXTPRE
|
||||
pip3 install ansible-parallel $PIPEXTPRE
|
||||
$pip install ansible ansible-lint ansible-core $PIPEXTPRE
|
||||
$pip install ansible-parallel $PIPEXTPRE
|
||||
}
|
||||
|
||||
function install_ansible-language-server() {
|
||||
|
|
@ -172,32 +189,32 @@ function install_ansible-language-server() {
|
|||
function install_meraki_ansible() {
|
||||
# Install python, ansible module for meraki
|
||||
ansible-galaxy collection install cisco.meraki --force
|
||||
pip3 install meraki $PIPEXT
|
||||
$pip install meraki $PIPEXT
|
||||
}
|
||||
|
||||
function install_azure_cli() {
|
||||
# Install azure_cli
|
||||
pip3 install azure-cli $PIPEXTPRE
|
||||
$pip install azure-cli $PIPEXTPRE
|
||||
}
|
||||
|
||||
function install_awscli() {
|
||||
# Install awscli
|
||||
pip3 install awscli $PIPEXTPRE
|
||||
$pip install awscli $PIPEXTPRE
|
||||
}
|
||||
|
||||
function install_aws_adfs() {
|
||||
# Install aws-adfs
|
||||
pip3 install aws-adfs $PIPEXTPRE
|
||||
$pip install aws-adfs $PIPEXTPRE
|
||||
}
|
||||
|
||||
function install_ytdlp() {
|
||||
# Install yt-dlp
|
||||
pip3 install yt-dlp $PIPEXTPRE
|
||||
$pip install yt-dlp $PIPEXTPRE
|
||||
}
|
||||
|
||||
function install_spotifydl() {
|
||||
# Install spotify_dl
|
||||
pip3 install spotify_dl $PIPEXTPRE
|
||||
$pip install spotify_dl $PIPEXTPRE
|
||||
}
|
||||
|
||||
function update() {
|
||||
|
|
@ -245,7 +262,7 @@ function update() {
|
|||
|
||||
function install_speedtest() {
|
||||
# Install speedtest-cli
|
||||
pip3 install speedtest-cli $PIPEXTPRE
|
||||
$pip install speedtest-cli $PIPEXTPRE
|
||||
}
|
||||
|
||||
function install_gh_cli() {
|
||||
|
|
|
|||
30
.zshrc
30
.zshrc
|
|
@ -4,11 +4,11 @@ CONFIG=$HOME/.config
|
|||
|
||||
parse_git_branch() {
|
||||
command=$(git branch \
|
||||
2> /dev/null \
|
||||
| sed -n -e 's/^\* \(.*\)/\1/p' \
|
||||
| awk 'NF{print $NF}' \
|
||||
| sed 's/)//g' \
|
||||
2> /dev/null)
|
||||
2>/dev/null |
|
||||
sed -n -e 's/^\* \(.*\)/\1/p' |
|
||||
awk 'NF{print $NF}' |
|
||||
sed 's/)//g' \
|
||||
2>/dev/null)
|
||||
[ -z $command ] && echo -e "$ " || echo -e "$command $ "
|
||||
}
|
||||
|
||||
|
|
@ -28,16 +28,16 @@ autoload -U colors && colors
|
|||
autoload bashcompinit && bashcompinit
|
||||
setopt PROMPT_SUBST
|
||||
PS1='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~) $(parse_git_branch)%{$reset_color%}'
|
||||
plugins=(rake ruby vagrant knife knife_ssh kitchen )
|
||||
plugins=(rake ruby vagrant knife knife_ssh kitchen)
|
||||
|
||||
ZSH_DISABLE_COMPFIX=true
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
[ -d $CONFIG/zsh/zsh-autosuggestions ] && source $CONFIG/zsh/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh &>> /dev/null
|
||||
[ -d $CONFIG/zsh/zsh-syntax-highlighting ] && source $CONFIG/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh &>> /dev/null
|
||||
[ -d $CONFIG/zsh/zsh-command-time ] && source $CONFIG/zsh/zsh-command-time/command-time.plugin.zsh &>> /dev/null
|
||||
[ -d $CONFIG/zsh/aws ] && source $CONFIG/zsh/aws/aws.plugin.zsh &>> /dev/null
|
||||
[ -d $CONFIG/zsh/azure-cli ] && source $CONFIG/zsh/azure-cli/az.completion &>> /dev/null
|
||||
[ -d $CONFIG/zsh/zsh-autosuggestions ] && source $CONFIG/zsh/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh &>>/dev/null
|
||||
[ -d $CONFIG/zsh/zsh-syntax-highlighting ] && source $CONFIG/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh &>>/dev/null
|
||||
[ -d $CONFIG/zsh/zsh-command-time ] && source $CONFIG/zsh/zsh-command-time/command-time.plugin.zsh &>>/dev/null
|
||||
[ -d $CONFIG/zsh/aws ] && source $CONFIG/zsh/aws/aws.plugin.zsh &>>/dev/null
|
||||
[ -d $CONFIG/zsh/azure-cli ] && source $CONFIG/zsh/azure-cli/az.completion &>>/dev/null
|
||||
[ -f $HOME/.password ] && source $HOME/.password
|
||||
[ -f $CONFIG/fzf/shell/key-bindings.zsh ] && source $HOME/.config/fzf/shell/key-bindings.zsh
|
||||
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
|
||||
|
|
@ -141,7 +141,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
|
|||
|
||||
export PYTHONVERSION=$(ls -la /opt/homebrew/opt/ |
|
||||
grep -iEo 'python@.* ->' |
|
||||
sed 's/ ->//g'|
|
||||
sed 's/ ->//g' |
|
||||
sort |
|
||||
tail -n1 |
|
||||
sed 's/python@//g')
|
||||
|
|
@ -167,11 +167,11 @@ if [[ "$(uname)" == "Darwin" ]]; then
|
|||
export TFENVVERSION=$(ls -la /opt/homebrew/Cellar/tfenv/ |
|
||||
grep -iEo '[0-9]\.[0-9]\.[0-9]' |
|
||||
sort |
|
||||
tail -n1 )
|
||||
tail -n1)
|
||||
export TFVERSION=$(ls -la /opt/homebrew/Cellar/tfenv/*/versions |
|
||||
grep -iEo '[0-9]\.[0-9]\.[0-9]' |
|
||||
sort |
|
||||
tail -n1 )
|
||||
tail -n1)
|
||||
export PATH=$PATH:/opt/homebrew/Cellar/tfenv/$TFENVVERSION/versions/$TFVERSION/
|
||||
|
||||
# Project
|
||||
|
|
@ -179,7 +179,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
|
|||
fi
|
||||
|
||||
# Setting the right editor
|
||||
if which nvim > /dev/null 2>&1; then
|
||||
if which nvim >/dev/null 2>&1; then
|
||||
export VISUAL='nvim -u $HOME/.vimrc'
|
||||
export EDITOR='nvim -u $HOME/.vimrc'
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in New Issue