Compare commits
3 commits
dbea825ed3
...
4c90de34e9
Author | SHA1 | Date | |
---|---|---|---|
4c90de34e9 | |||
93eaa6d9f6 | |||
7353f2ff23 |
3 changed files with 4 additions and 7 deletions
|
@ -59,6 +59,7 @@ in
|
||||||
icons = "auto";
|
icons = "auto";
|
||||||
};
|
};
|
||||||
# Shell
|
# Shell
|
||||||
|
bash.enable = true; # ensure HM variables are passed to `bash` too (otherwise `jpassmenu` doesn't work)
|
||||||
fish = {
|
fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
preferAbbrs = true; # when defining an alias, prefer instead to define an abbreviation
|
preferAbbrs = true; # when defining an alias, prefer instead to define an abbreviation
|
||||||
|
|
|
@ -38,11 +38,7 @@ in
|
||||||
# Launch fish if shell is interactive (from https://wiki.nixos.org/wiki/Fish)
|
# Launch fish if shell is interactive (from https://wiki.nixos.org/wiki/Fish)
|
||||||
bash.interactiveShellInit = # bash
|
bash.interactiveShellInit = # bash
|
||||||
''
|
''
|
||||||
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
|
if [[ "$(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm)" != "fish" && -z "$BASH_EXECUTION_STRING" ]]; then shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""; exec ${pkgs.fish}/bin/fish "$LOGIN_OPTION"; fi
|
||||||
then
|
|
||||||
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
|
|
||||||
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
|
||||||
fi
|
|
||||||
'';
|
'';
|
||||||
# Default shell
|
# Default shell
|
||||||
fish.enable = true;
|
fish.enable = true;
|
||||||
|
|
4
scripts/jpassmenu/Cargo.lock
generated
4
scripts/jpassmenu/Cargo.lock
generated
|
@ -217,9 +217,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "env_logger"
|
name = "env_logger"
|
||||||
version = "0.11.7"
|
version = "0.11.8"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697"
|
checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anstream",
|
"anstream",
|
||||||
"anstyle",
|
"anstyle",
|
||||||
|
|
Loading…
Add table
Reference in a new issue