diff --git a/paludis/use.conf.d/desktop.conf b/paludis/use.conf.d/desktop.conf index afbc061..233d458 100644 --- a/paludis/use.conf.d/desktop.conf +++ b/paludis/use.conf.d/desktop.conf @@ -44,7 +44,7 @@ app-office/libreoffice-bin java app-office/writerscafe gtk2 app-text/evince djvu dvi -app-crypt/pinentry gtk +app-crypt/pinentry gtk gnome-keyring gnome-base/gvfs cdda fuse http udisks diff --git a/profile.d/nix.sh b/profile.d/nix.sh deleted file mode 100644 index 1d6b4d5..0000000 --- a/profile.d/nix.sh +++ /dev/null @@ -1,31 +0,0 @@ -if [ -n "$HOME" ]; then - NIX_LINK="$HOME/.nix-profile" - - # Set the default profile. - if ! [ -L "$NIX_LINK" ]; then - echo "creating $NIX_LINK" >&2 - _NIX_DEF_LINK=/var/lib/nix/profiles/default - /bin/ln -s "$_NIX_DEF_LINK" "$NIX_LINK" - fi - - export PATH=$NIX_LINK/bin:$NIX_LINK/sbin:$PATH - - # Subscribe the user to the Nixpkgs channel by default. - if [ ! -e $HOME/.nix-channels ]; then - echo "https://nixos.org/channels/nixpkgs-unstable nixpkgs" > $HOME/.nix-channels - fi - - # Append ~/.nix-defexpr/channels/nixpkgs to $NIX_PATH so that - # paths work when the user has fetched the Nixpkgs - # channel. - export NIX_PATH=${NIX_PATH:+$NIX_PATH:}nixpkgs=$HOME/.nix-defexpr/channels/nixpkgs - - # Set $SSL_CERT_FILE so that Nixpkgs applications like curl work. - if [ -e /etc/ssl/certs/ca-bundle.crt ]; then # Fedora, NixOS - export SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt - elif [ -e /etc/ssl/certs/ca-certificates.crt ]; then # Ubuntu, Debian - export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt - elif [ -e "$NIX_LINK/etc/ca-bundle.crt" ]; then # fall back to Nix profile - export SSL_CERT_FILE="$NIX_LINK/etc/ca-bundle.crt" - fi -fi