diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/by-name/fi/fish/module.nix | 12 | ||||
| -rw-r--r-- | modules/by-name/ni/nix/module.nix | 1 | ||||
| -rwxr-xr-x | modules/by-name/ni/nix/nix_wrapper.sh | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/modules/by-name/fi/fish/module.nix b/modules/by-name/fi/fish/module.nix index 6f13e39f..7d423bec 100644 --- a/modules/by-name/fi/fish/module.nix +++ b/modules/by-name/fi/fish/module.nix @@ -53,6 +53,7 @@ "<" ">" "^" + "#" ] base_key; escaped_cmd = @@ -69,10 +70,15 @@ mkMode = mode: attr: builtins.concatStringsSep "" (lib.mapAttrsToList (mkBinding mode) attr); keymappings = '' - fish_vi_key_bindings - bind --erase --all + function fish_my_key_bindings + fish_vi_key_bindings + bind --erase --all --preset '' - + builtins.concatStringsSep "\n" (lib.mapAttrsToList mkMode keymappings_raw); + + builtins.concatStringsSep "\n" (lib.mapAttrsToList mkMode keymappings_raw) + + '' + end + set -g fish_key_bindings fish_my_key_bindings + ''; in { options.soispha.programs.fish = { enable = lib.mkEnableOption "fish"; diff --git a/modules/by-name/ni/nix/module.nix b/modules/by-name/ni/nix/module.nix index 391f38e5..5fd10541 100644 --- a/modules/by-name/ni/nix/module.nix +++ b/modules/by-name/ni/nix/module.nix @@ -29,7 +29,6 @@ text = builtins.readFile ./nix_wrapper.sh; runtimeInputs = [ pkgs.lixPackageSets.latest.lix - pkgs.libnotify pkgs.btrfs-progs pkgs.coreutils pkgs.gnused diff --git a/modules/by-name/ni/nix/nix_wrapper.sh b/modules/by-name/ni/nix/nix_wrapper.sh index 489f10f1..077988d2 100755 --- a/modules/by-name/ni/nix/nix_wrapper.sh +++ b/modules/by-name/ni/nix/nix_wrapper.sh @@ -5,12 +5,11 @@ _NIX_WRAPPER_FALLBACK="${_NIX_WRAPPER_FALLBACK-false}" me="$(basename "$0")" -notify-send "Running '$me' via the wrapper." if [ "$_NIX_WRAPPER_FALLBACK" = "true" ]; then # Allow skipping the size check. "$me" "$@" else - usage="$(btrfs filesystem usage /nix --raw 2>/dev/null)" + usage="$(btrfs filesystem usage /nix/store --raw 2>/dev/null)" avail="$(echo "$usage" | grep 'Device size:' | cut -f 3 | sed 's/ //g')" used="$(echo "$usage" | grep 'Used:' | cut -f 4 | head -n 1 | sed 's/ //g')" perc="$(printf "scale=4\n%d / %d\n" "$used" "$avail" | bc)" |