3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

303 commits

Author SHA1 Message Date
aszlig dd5f0d9538
nixos: Fix build of manual
Regression introduced by 520a43ced3.

Using XML tag characters for things that are not tags needs to be
properly indicated by an entity.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-08-25 14:08:11 +02:00
Jörg Thalheim 47295b4677 Merge pull request #28552 from romildo/fix.oblogout
oblogout: add description for configuration options
2017-08-25 09:35:36 +01:00
Izorkin 520a43ced3 Fix zsh completions (#28550)
* Fix zsh completions

* Fix zsh completions (fix commit)

* Fix zsh completions (fix commit)
2017-08-25 09:34:21 +01:00
romildo 51df72e4f6 oblogout: add description for configuration options 2017-08-24 18:10:32 -03:00
Robin Gloster dc13376ee2
wvdial: remove 2017-08-04 02:24:07 +02:00
Franz Pletz 32e7904624
gnupg agent module: fix ssh agent assertion logic 2017-08-04 02:07:49 +02:00
Maximilian Bosch 26655f505f
programs.thefuck: support shells that don't use /etc/profile 2017-07-30 08:23:35 +02:00
Peter Hoeg 588e3da3f4 Merge pull request #26761 from gnidorah/master3
qt5ct module: expose qtstyleplugins
2017-07-26 22:44:45 +08:00
gnidorah 9f61c7f947 qt5ct module: expose qtstyleplugins 2017-07-23 12:56:04 +03:00
Maximilian Bosch 95bf0cc1cb
programs.zsh.ohMyZsh: add package option to make package overrides on module-base easier 2017-07-20 08:54:10 +02:00
Robin Gloster b8d92a7840
programs.gnupg: use extraInit instead of interactiveShellInit
Otherwise some programmes cannot use the GPG agent, e.g. applications
started from dmenu.

Behaviour was changed in #26888, this reverts that part.
2017-07-17 18:45:37 +02:00
Daniel Fullmer 627260ddbf gnupg agent module: Only set tty for interactive shells 2017-07-14 00:22:20 +02:00
Daniel Fullmer 38e971d2e1 gnupg agent module: Fix dirmngr.enable option 2017-07-14 00:22:20 +02:00
Daniel Fullmer 3d360a5ffb gnupg agent module: Remove unnecessary unit configuration
These just seem to duplicate upstream systemd units, which are already
included in nixos configuration by systemd.packages
2017-07-14 00:22:20 +02:00
Yacine Hmito 1f70f3801b Make zshrc more predictable
Originially, `programs.zsh` sets default values for some
initialisation scripts.
Nix resolves the case of multiple values by concatenating them all.
It is however impossible to predict where the default script will be
inserted; but we never want the default value to override the
user-specified ones.
Now, it doesn't set default values; almost everything is hardcoded at
the begining of the file.
2017-07-06 22:43:05 +02:00
Michael Raskin 05aa2a58db Merge pull request #25600 from johnramsden/nylas-mail
nylas-mail: 2.0.32
2017-07-06 02:04:24 +02:00
John Ramsden 407324faa9
Rename nylas-mail to nylas-mail-bin.
Change pkg in module, and name in pkg.
2017-07-05 16:28:01 -07:00
Vladimír Čunát d1a89ae9d7
Merge branch 'master' into staging 2017-07-03 09:48:58 +02:00
Jörg Thalheim 343ad1697d Merge pull request #26897 from layus/nixos-terminfo
terminfo: symlink terminfo to /etc for ncurses
2017-07-01 09:27:24 +01:00
Robin Stumm 4540eaf578 browserpass: 2017-04-11 -> 1.0.5 2017-06-30 13:32:45 +02:00
Guillaume Maudoux bd562949cf terminfo: symlink terminfo to /etc for ncurses 2017-06-30 11:17:11 +02:00
John Ramsden 9f4c3b2efd
Add keyring enable option and add Nylas to systemPackages 2017-06-28 16:13:10 -07:00
John Ramsden 3fddb48020
Add Nylas mail module. Still needs keyring configuration 2017-06-28 15:56:41 -07:00
Peter Simons 003cd41310 zsh: extend default $fpath configured by NixOS to find "vendor-completions" 2017-06-26 10:50:52 +02:00
Franz Pletz ba1330b12e Merge pull request #26605 from mayflower/disable-ssh-agent
ssh module: disable agent by default
2017-06-18 22:03:59 +02:00
Roger Qiu 1b6176e45b gnupg module: Added extra and browser sockets (#26295)
Also added dirmngr and made SSH support false by default
due to programs.ssh.startAgent defaulting to true.
2017-06-15 19:40:09 +02:00
Franz Pletz 994ffc01a0
ssh module: disable agent by default 2017-06-15 19:27:01 +02:00
Maximilian Bosch 3803864ca6 thefuck: init at 3.18 (#26529) 2017-06-14 09:57:38 +01:00
Daniel Fullmer b8ebc60abd programs.zsh.syntaxHighlighting: Fix default value for patterns 2017-06-04 15:30:35 -04:00
Maximilian Bosch c4e4071ed1
programs.zsh.syntax-highlighting: simplify enable option by using mkEnableOption 2017-05-31 21:52:05 +02:00
Maximilian Bosch 0925f79d56
programs.zsh.syntaxHighlighting: refactor to use attr sets rather than recursive lists for patterns
The idea has been described here: https://github.com/NixOS/nixpkgs/pull/25323#issuecomment-298677369
2017-05-31 21:52:04 +02:00
Franz Pletz 04158d9aba
gnupg agent module: init
Creates a systemd user service and updates the tty on new logins so
that gpg-agent may find the current tty even if the SSH agent mode
is used.
2017-05-29 15:05:29 +02:00
Franz Pletz 1e95e114e5
nixos/xsession: use graphical systemd user target
While systemd suggests using the pre-defined graphical-session user
target, I found that this interface is difficult to use. Additionally,
no other major distribution, even in their unstable versions, currently
use this mechanism.

The window or desktop manager is supposed to run in a systemd user service
which activates graphical-session.target and the user services that are
binding to this target. The issue is that we can't elegantly pass the
xsession environment to the window manager session, in particular
whereas the PassEnvironment option does work for DISPLAY, it for some
mysterious reason won't for PATH.

This commit implements a new graphical user target that works just like
default.target. Services which should be run in a graphical session just
need to declare wantedBy graphical.target. The graphical target will be
activated in the xsession before executing the window or display manager.

Fixes #17858.
2017-05-29 15:05:28 +02:00
Maximilian Bosch a549596700
programs.zsh: rename oh-my-zsh to ohMyZsh
This is intended to provide better consistency with other NixOS modules.
Please refer to mayflower/nixpkgs#21 for further information.
2017-05-25 10:51:26 +02:00
Jaka Hudoklin ee8aab13ec Merge pull request #26025 from ck3d/XCURSOR_PATH-exp
NixOS: fix XCURSOR_PATH expansion
2017-05-25 01:12:24 +02:00
Christian Kögler f3cfc10ebb NixOS: fix XCURSOR_PATH expansion
This fix allows expansion of XCURSORPATH by using type array instead of
a string.
2017-05-23 18:53:55 +02:00
Jörg Thalheim 7e40287d00 Merge pull request #25835 from therealpxc/fish
Fish: source NixOS environment on non-login shells + source shell init on NixOS even when parent shell has done so
2017-05-22 07:08:30 +01:00
Willi Butz 4e4f7a2f66
zsh module: rename option syntax-highlighting
rename zsh-option "syntax-highlighting" -> "syntaxHighlighting"
2017-05-21 01:26:51 +02:00
Patrick Callahan 42c768c8e8 fish: (NixOS only) source configuration sections anew in all child shells
this fixes issue #25800: https://github.com/NixOS/nixpkgs/issues/25800
2017-05-19 21:00:24 -07:00
jammerful d9df350695 ssh: Add Newline to KnownHostsText
SSH expects a new line at the end of known_hosts file.
Without a new line the next entry goes on the same line
as the last entry in known_hosts causing errors.
2017-05-15 23:49:43 -04:00
Patrick Callahan 3f6d21bafc
fish: resolve NixOS-related initialization problems 2017-05-10 10:16:10 +01:00
Jörg Thalheim 539b091f6e
environment: remove sbin from PATH
sbin is a symlink to bin. /run/current-system/sw/sbin and related
profiles only contains packages, which have this symlink. It is a subset
of bin.
2017-05-06 08:39:27 +01:00
Jörg Thalheim 6ad804324f
environment: remove lib/kde4/libexec from PATH
kde4 is gone and does need to be in $PATH anymore by default
2017-05-05 07:50:34 +01:00
Jörg Thalheim 4c576fd946 Merge pull request #25323 from Ma27/zsh/support-pattern-highlighters
programs.zsh.syntax-highlighting: support custom highlighting patterns
2017-05-01 22:23:36 +02:00
Maximilian Bosch f6e612bb8f
programs.zsh.syntax-highlighting: support custom highlighting patterns
see https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/pattern.md
for further reference.
2017-05-01 20:58:56 +02:00
Michael Raskin 4d2f7b63e0 Merge pull request #24803 from pajowu/master
browserpass: init at 1.0.2
2017-05-01 11:27:17 +02:00
Michael Raskin 6b31de49cf Merge pull request #24005 from ambrop72/xcursor-path
nixos: Define XCURSOR_PATH environment variable.
2017-04-30 23:01:57 +02:00
Michael Raskin eedc0f0a78 Merge pull request #23333 from romildo/upd.qt5ct
qt5ct: 0.24 -> 0.30
2017-04-30 19:42:31 +02:00
Matt McHenry 48a3e1a88d fix 'command-not-found: is a directory' error 2017-04-28 23:11:21 -04:00
Maximilian Bosch baa3b3efff
programs.zsh.syntax-highlighting: refactor highlighters option for proper validation
Right now the `programs.zsh.syntax-highlighting.highlighters` option
lacks appropriate validation which can cause confusing things when
mistyping a higlighter for zsh-syntax-highlighting.
2017-04-25 16:00:26 +02:00