Commit Graph

3483 Commits

Author SHA1 Message Date
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
Sefa Eyeoglu
48eb49b8ba fishPlugins.bobthefisher: init at unstable-2023-03-09
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-03-13 16:45:19 +01:00
Sefa Eyeoglu
fe1d5a7720 fishPlugins.bobthefish: init at unstable-2022-08-02
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-03-13 16:45:18 +01:00
Sefa Eyeoglu
6b558b3df9 fishPlugins.z: init at unstable-2022-04-08
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-03-13 16:44:53 +01:00
Sefa Eyeoglu
aec7857745 fishPlugins.humantime-fish: init at unstable-2022-04-08
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-03-13 16:44:06 +01:00
Sefa Eyeoglu
196e9745e3 fishPlugins.fzf: init at unstable-2021-05-12
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-03-13 16:44:06 +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
Arthur Outhenin-Chalandre
6c53240915 zsh-f-sy-h: init at v1.67
Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>
2023-02-28 00:18:36 +01: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
Aaron Bieber
f8de38cc12 yash: 2.53 -> 2.54 2023-02-25 07:52:38 -07: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
R. Ryantm
19d6a0cecb oh-my-zsh: 2023-02-16 -> 2023-02-23 2023-02-24 13:38:31 +00:00
Naïm Favier
9c4b6bbad4 Merge pull request #217876 from joedevivo/zimfw-init-fix
zimfw: fix generated init.zsh to use $out
2023-02-23 22:04:55 +01:00
Joe DeVivo
b348e7ef9f zimfw: fix generated init.zsh to use $out 2023-02-23 09:59:14 -07:00
Bernardo Meurer
42008a14a4 Merge pull request #217206 from Artturin/stdenvimprovements1 2023-02-23 12:07:47 +00:00
Rebecca Turner
65fe5aba2e nix-your-shell: 1.1.0 -> 1.1.1 2023-02-22 12:22:36 -08:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
R. Ryantm
f8d68cd3fd zimfw: 1.11.1 -> 1.11.2 2023-02-21 04:11:33 +00:00
R. Ryantm
bab6f9f3a5 murex: 3.0.9310 -> 3.1.3100 2023-02-19 06:26:51 +00:00
Rebecca Turner
b32db566fe nix-your-shell: 1.0.2 -> 1.1.0 2023-02-16 11:48:45 -08:00
Weijia Wang
ac1f5b72a9 Merge pull request #216662 from wegank/nushell-darwin
nushell: use newer libproc.h
2023-02-16 18:41:37 +01:00
Weijia Wang
453840daf1 nushell: use newer libproc.h 2023-02-16 17:50:14 +01:00
R. Ryantm
68329697a6 oh-my-zsh: 2023-02-05 -> 2023-02-16 2023-02-16 12:56:07 +00:00
Rebecca Turner
751f8617b3 nix-your-shell: 1.0.1 -> 1.0.2
https://github.com/MercuryTechnologies/nix-your-shell/releases/tag/v1.0.2
2023-02-13 15:05:06 -08:00