Commit Graph

2196 Commits

Author SHA1 Message Date
Lin Jian
43f45fe24f
zsh: fix the guard variable for /etc/set-environment
This guard variable is written to $out/etc/zshenv using
here-documents, so we need to escape it.
2023-03-29 13:51:26 +08:00
Bernardo Meurer
bd4e35e14a
Merge pull request #222002 from marsam/update-dash 2023-03-28 09:17:13 -03:00
Vladimír Čunát
92b37e5136
Merge #223108: fish: 3.6.0 -> 3.6.1 2023-03-26 15:30:48 +02:00
Yureka
f8cbc3c281 tree-wide: convert rust with git deps to importCargoLock 2023-03-26 01:52:04 +01:00
Cole Helbling
75cf58e348 fish: disable flaky pexpect test on darwin 2023-03-25 13:03:48 -07:00
Cole Helbling
b27114d16b fish: 3.6.0 -> 3.6.1
https://github.com/fish-shell/fish-shell/releases/tag/3.6.1
2023-03-25 10:31:20 -07:00
K900
382c756097
Merge pull request #217205 from linj-fork/fix-zsh-set-env
zsh: set environment variables in zshenv instead of zprofile
2023-03-23 18:57:40 +03:00
R. Ryantm
b780344698 nushell: 0.77.0 -> 0.77.1 2023-03-22 22:34:04 +00:00
Anderson Torres
6477d7f0ea elvish: rewrite 2023-03-22 07:30:37 -03:00
Scott Reeves
69ddafed7b elvish: 0.18.0 -> 0.19.2
https://elv.sh/blog/0.19.1-release-notes.html

Packaging has changed and what was previously called a 'reproducible'
build is now called 'official' and these builds are generated using a
docker image: https://github.com/elves/elvish/blob/master/PACKAGING.md
2023-03-21 22:19:45 -03:00
Weijia Wang
0ddb1461ee
Merge pull request #207395 from r-ryantm/auto-update/grml-zsh-config
grml-zsh-config: 0.19.4 -> 0.19.5
2023-03-17 12:29:27 +02:00
Mario Rodas
22d7930c64 dash: 0.5.11.5 -> 0.5.12 2023-03-17 04:20:00 +00:00
Weijia Wang
c9a178c8b7
Merge pull request #221397 from r-ryantm/auto-update/oil
oil: 0.14.0 -> 0.14.2
2023-03-16 22:42:56 +02:00
R. Ryantm
c3c3f487cd oil: 0.14.0 -> 0.14.2 2023-03-16 00:19:11 +00:00
Weijia Wang
1df7332c72
Merge pull request #221161 from r-ryantm/auto-update/oh-my-zsh
oh-my-zsh: 2023-03-06 -> 2023-03-12
2023-03-15 22:30:19 +02:00
Vladimír Čunát
a86610144f
Merge #219444: staging-next 2023-03-04 2023-03-15 17:35:39 +01:00
Adam Stephens
a26d5fbdef
nushell: 0.76.0 -> 0.77.0 2023-03-15 08:42:32 -04:00
github-actions[bot]
068a7415f8
Merge master into staging-next 2023-03-15 06:01:09 +00:00
R. Ryantm
1dc043677c spaceship-prompt: 4.13.2 -> 4.13.3 2023-03-15 04:15:03 +00:00
R. Ryantm
b19b513a93 oh-my-zsh: 2023-03-06 -> 2023-03-12 2023-03-14 12:13:53 +00:00
Martin Weinelt
6b67186fe9
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/crownstone-cloud/default.nix
- pkgs/development/python-modules/exrex/default.nix
- pkgs/development/python-modules/mkdocs-minify/default.nix
- pkgs/development/python-modules/myjwt/default.nix
- pkgs/development/tools/analysis/checkov/default.nix
2023-03-14 08:14:26 +01:00
Lin Jian
8e2e741ab5
zsh: set environment variables in zshenv instead of zprofile
This patch fixes two issues:

1. The file in which environment variables are set is inconsistent.
  - This file sets them in zprofile when programs.zsh.enable is not
  set.
  - Zsh module sets them in zshenv when programs.zsh.enable is set.

2. Setting environment variables in zprofile overrides what users set
in .zshenv.  See these[1] home-manager[2] issues[3].

/etc/profile is also changed to /etc/set-environment. Here is a
comparison:

Using /etc/profile:
- Pros
  - config.environment.shellInit is sourced in all zsh
- Cons
  - config.environment.loginShellInit is also sourced in non-login zsh
  - config.programs.bash.shellInit is also sourced in all zsh
  - config.programs.bash.loginShellInit is also sourced in all zsh

Using /etc/set-environment:
- Pros
  - config.programs.bash.shellInit is not sourced in any zsh
  - config.programs.bash.loginShellInit is not sourced in any zsh
- Cons
  - config.environment.shellInit is not sourced in any zsh
  - config.environment.loginShellInit is not sourced in any zsh

[1]: https://github.com/nix-community/home-manager/issues/2751#issuecomment-1048682643
[2]: https://github.com/nix-community/home-manager/issues/2991
[3]: https://github.com/nix-community/home-manager/issues/3681#issuecomment-1436054233
2023-03-13 17:25:04 +08:00
figsoda
73f2151877 fishPlugins.async-prompt: init at 1.2.0 2023-03-12 19:34:36 -04:00
Vladimír Čunát
1dd94ad62f
Merge branch 'master' into staging-next 2023-03-12 09:06:28 +01:00
figsoda
b18978c3f3 fishPlugins.autopair: add figsoda as a maintainer 2023-03-10 13:11:08 -05:00
figsoda
fad7304030 fishPlugins.autopair-fish: remove in favor of fishPlugins.autopair 2023-03-10 13:11:08 -05:00
figsoda
678e2fe30e fishPlugins.autopair: 1.0.3 -> 1.0.4 2023-03-10 13:11:08 -05:00
Martin Weinelt
e3f019bb71 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-07 15:05:00 +01:00
R. Ryantm
68852fbe7c oh-my-zsh: 2023-03-04 -> 2023-03-06 2023-03-07 03:56:25 +00:00
github-actions[bot]
fa94414f70
Merge master into staging-next 2023-03-07 00:02:41 +00:00
Weijia Wang
447d6b9614
Merge pull request #219702 from r-ryantm/auto-update/carapace
carapace: 0.21.0 -> 0.22.0
2023-03-06 22:10:29 +02:00
R. Ryantm
8caf109c28 carapace: 0.21.0 -> 0.22.0 2023-03-05 16:26:07 +00:00
Martin Weinelt
8a085cd8e3 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-05 15:36:16 +01:00
R. Ryantm
f7bc732830 oh-my-zsh: 2023-03-01 -> 2023-03-04 2023-03-05 11:36:52 +00:00
Martin Weinelt
d0286ecd24 Merge remote-tracking branch 'origin/staging' into staging-next 2023-03-04 01:42:06 +00:00
Weijia Wang
d24cb3711e
Merge pull request #219224 from r-ryantm/auto-update/spaceship-prompt
spaceship-prompt: 4.13.1 -> 4.13.2
2023-03-03 22:04:51 +02:00
Weijia Wang
cc3cddc25f
Merge pull request #219278 from r-ryantm/auto-update/zsh-forgit
zsh-forgit: 23.02.0 -> 23.03.0
2023-03-03 21:47:48 +02:00
github-actions[bot]
a74c8d03ea
Merge staging-next into staging 2023-03-03 18:01:44 +00:00
Weijia Wang
f5ffd57877
Merge pull request #218030 from MangoIV/mangoiv/update-nushell
nushell: 0.75.0 -> 0.76.0
2023-03-03 16:15:45 +02:00
github-actions[bot]
595d55c8a9
Merge staging-next into staging 2023-03-03 12:01:44 +00:00
Mario Rodas
39a9b1897e
Merge pull request #219113 from r-ryantm/auto-update/oh-my-zsh
oh-my-zsh: 2023-02-23 -> 2023-03-01
2023-03-03 06:32:29 -05:00
R. Ryantm
3937eb869a zsh-forgit: 23.02.0 -> 23.03.0 2023-03-03 00:50:48 +00:00
R. Ryantm
e367ea697b spaceship-prompt: 4.13.1 -> 4.13.2 2023-03-02 20:00:12 +00:00
github-actions[bot]
6c8444842c
Merge staging-next into staging 2023-03-02 12:02:00 +00:00
R. Ryantm
68fe9c3e3d oh-my-zsh: 2023-02-23 -> 2023-03-01 2023-03-02 04:22:05 +00:00
R. Ryantm
5c16cfc824 zimfw: 1.11.2 -> 1.11.3 2023-03-02 01:36:07 +00:00
Weijia Wang
ae27e61481
Merge pull request #211753 from r-ryantm/auto-update/zsh-prezto
zsh-prezto: unstable-2023-01-12 -> unstable-2023-01-31
2023-02-26 01:01:40 +02:00
Ryan Mulligan
ee3e8092a6
Merge pull request #218028 from r-ryantm/auto-update/oh-my-zsh
oh-my-zsh: 2023-02-16 -> 2023-02-23
2023-02-24 11:08:03 -08:00
Matthew McMillan
32a93b58b2 fishPlugins.plugin-git: init at 0.1 2023-02-24 07:09:36 -08:00
mangoiv
2a42048c89
nushell: 0.75.0 -> 0.76.0
Bumped version for nushell
(release notes at https://www.nushell.sh/blog/2023-02-21-nushell_0_76.html);
changed the name of the settings such that it complies with the
current Cargo.toml; made it possible to apply additional cargo features
such as the dataframes feature, made it possible to skip checks to
avoid building and running the tests for derivations that modify
the cargo features
2023-02-24 14:54:44 +01:00