diff options
| -rw-r--r-- | etc/portage/make.conf | 1 | ||||
| -rw-r--r-- | etc/portage/package.accept_keywords/conf | 3 | ||||
| -rw-r--r-- | etc/portage/package.unmask | 1 | ||||
| -rw-r--r-- | root/.bash_aliases | 2 | ||||
| -rw-r--r-- | root/.vimrc | 1 | ||||
| -rwxr-xr-x | root/posodobi.sh | 2 |
6 files changed, 9 insertions, 1 deletions
diff --git a/etc/portage/make.conf b/etc/portage/make.conf index c7cc251..5f6d799 100644 --- a/etc/portage/make.conf +++ b/etc/portage/make.conf @@ -70,6 +70,7 @@ USE="$USE authlib" # za maildrop USE="$USE irc-plus" # za ngircd USE="$USE cgi" # za uwsgi USE="$USE fileinfo spell change-password enigma" # za roundcube +USE="$USE tkip" # za wpa_supplicant UWSGI_PLUGINS="pam" NGINX_MODULES_HTTP="$NGINX_MODULES_HTTP addition auth_ldap auth_pam auth_request brotli dav dav_ext echo fancyindex flv gunzip gzip_static headers_more image_filter javascript memc metrics mp4 push_stream random_index realip secure_link sticky stub_status sub upload_progress vhost_traffic_status xslt gzip userid ssi uwsgi slice security rewrite referer proxy perl map limit_req limit_conn fastcgi empty_gif charset browser autoindex access auth_basic" diff --git a/etc/portage/package.accept_keywords/conf b/etc/portage/package.accept_keywords/conf index 5dee005..40ba91c 100644 --- a/etc/portage/package.accept_keywords/conf +++ b/etc/portage/package.accept_keywords/conf @@ -61,3 +61,6 @@ sys-kernel/dracut-crypt-ssh ~* app-crypt/certbot-dns-rfc2136 ~* net-im/coturn ~* net-dns/hash-slinger ~* +dev-java/maven-project ~* +dev-java/maven-bin ~* +net-wireless/mdk ~* diff --git a/etc/portage/package.unmask b/etc/portage/package.unmask index 3e54265..75c4ec9 100644 --- a/etc/portage/package.unmask +++ b/etc/portage/package.unmask @@ -1,3 +1,4 @@ +dev-java/maven-bin sys-firmware/*-bin # required by sys-apps/nvme-cli-2.5::gentoo # required by @selected diff --git a/root/.bash_aliases b/root/.bash_aliases index 806d572..65c81d7 100644 --- a/root/.bash_aliases +++ b/root/.bash_aliases @@ -73,3 +73,5 @@ function d () { fi } alias de='docker exec -it `docker ps | tail -n1 | cut -d\ -f1` /bin/bash' +[ -d ~/projects/r/skripti ] && PATH=$PATH:~/projects/r/skripti +export XMLLINT_INDENT=$'\t' diff --git a/root/.vimrc b/root/.vimrc index 9397cac..d8bc435 100644 --- a/root/.vimrc +++ b/root/.vimrc @@ -238,3 +238,4 @@ let g:rust_recommended_style = 0 set modeline set modelines=5 set modelineexpr +au FileType xml setlocal equalprg=xmllint\ --format\ --recover\ -\ 2>/dev/null diff --git a/root/posodobi.sh b/root/posodobi.sh index b7f7216..9f75dd4 100755 --- a/root/posodobi.sh +++ b/root/posodobi.sh @@ -25,7 +25,7 @@ grep "no-sync" <<<"$@" || /usr/sbin/emaint sync --auto grep "no-ask" <<<"$@" || a=--ask grep "colo" <<<"$@" || f="$f --color y" [ `hostname` = varovalka ] && f="$f --exclude=media-libs/mesa" -emerge --tree --verbose --update $f $a --newuse --changed-use --backtrack 30 --deep --with-bdeps=y --rebuilt-binaries --autounmask --autounmask-write @world +emerge --tree --verbose --update $f $a --newuse --changed-use --backtrack 30 --deep --with-bdeps=y --rebuilt-binaries --autounmask --autounmask-write --autounmask-backtrack=y @world emerge --verbose $f --autounmask-write --autounmask @preserved-rebuild emerge --depclean $f /root/linux/dist.sh |