diff options
| author | Alejandro Soto <alejandro@34project.org> | 2022-08-25 15:21:33 -0600 |
|---|---|---|
| committer | Alejandro Soto <alejandro@34project.org> | 2022-08-25 19:14:50 -0600 |
| commit | 64e6052f5f24213141faba155b896c6beaef26f4 (patch) | |
| tree | 7ae02eab6d26277ae14aef65120fd7808a01a0b7 /home | |
| parent | 6bf883a27dadb434aedfad9f6538a83ef02515c9 (diff) | |
home: switch old-style shenvs to hm-isolation
Diffstat (limited to '')
| -rw-r--r-- | home/default.nix | 7 | ||||
| -rw-r--r-- | home/shenvs/README.md | 1 | ||||
| -rw-r--r-- | home/zshrc.nix | 8 |
3 files changed, 2 insertions, 14 deletions
diff --git a/home/default.nix b/home/default.nix index 0941f42..7047634 100644 --- a/home/default.nix +++ b/home/default.nix @@ -54,13 +54,6 @@ with lib; { "vtmp" = symlink "/run/user/1000/vtmp"; ".calc_history" = devNull; ".units_history" = devNull; - - ".shenvs".text = let - keeps = { gcKeep ? [] }: concatStringsSep "\n" (map toString gcKeep); - in keeps (import ../shenvs/config.nix { - inherit (pkgs.local) shenvs; - inherit config lib; - }); }; packages = import ./path.nix pkgs; diff --git a/home/shenvs/README.md b/home/shenvs/README.md new file mode 100644 index 0000000..37073ba --- /dev/null +++ b/home/shenvs/README.md @@ -0,0 +1 @@ +# This directory has been lustrated. diff --git a/home/zshrc.nix b/home/zshrc.nix index 704ef0e..ec231f5 100644 --- a/home/zshrc.nix +++ b/home/zshrc.nix @@ -21,10 +21,6 @@ source ${local.git-aliases} } - function shenv() { - NIXPKGS_ALLOW_UNFREE=1 nix shell --impure 'system#shenvs.'"$1" - } - function xseli() { T=$(mktemp) $EDITOR -n $T @@ -44,8 +40,6 @@ INSTALLABLES=() while read -d: PATH_ITEM; do if [[ "$PATH_ITEM" =~ "^(/nix/store/[a-z0-9]+-([a-zA-Z][a-zA-Z0-9_]*(-[a-zA-Z][a-zA-Z0-9_]*)*)(-[^/]+)?)/" ]]; then - ENTER="''${match[1]}/lib/shenv/enter" - [[ "''${match[2]}" =~ '^shenv-' && -r "$ENTER" ]] && . "$ENTER" INSTALLABLES+=("''${match[2]}") fi done <<<"$PATH" @@ -54,7 +48,7 @@ _GRML_NIX_SHELL="{''${INSTALLABLES[@]}} " fi - unset INSTALLABLES ENTER PATH_ITEM + unset INSTALLABLES PATH_ITEM function grml_nix_shell() { REPLY="$_GRML_NIX_SHELL" |