Frederik Rietdijk
2f936f85d8
Merge master into staging-next
2019-04-29 13:46:20 +02:00
Silvan Mosberger
da4f6a2a09
browserpass: Remove v2 and switch to buildGoModule ( #60282 )
2019-04-28 11:05:24 -07:00
Michael Weiss
15010f0436
sway: Read the configuration from /etc before /nix/store ( #60319 )
...
This change will load all configuration files from /etc, to make it easy
to override them, but fallback to /nix/store/.../etc/sway/config to make
Sway work out-of-the-box with the default configuration on non NixOS
systems.
2019-04-27 22:38:18 +02:00
worldofpeace
7abeda982a
gnome3.gsettings-desktop-schemas -> gsettings-desktop-schemas
...
gnome3.pomodoro is left out because I don't want to create a conflict.
2019-04-17 13:39:23 -04:00
Florian Klink
2457510db4
Merge pull request #51918 from bobvanderlinden/var-run
...
tree-wide: nixos: /var/run -> /run
2019-04-07 20:09:46 +02:00
Silvan Mosberger
cddafbcc60
Merge pull request #57782 from bkchr/gnupg_program
...
programs.gnupg: Support setting the gnupg program
2019-04-05 15:43:18 +02:00
Bastian Köcher
c0deb007fc
programs.gnupg: Support setting the gnupg package
2019-04-05 08:49:53 +02:00
Silvan Mosberger
e98ee8d70c
nixos/browserpass: update for v3
...
See https://github.com/browserpass/browserpass-native/issues/31
Additionally browserpass was removed from systemPackages, because it
doesn't need to be installed, browsers will get the path to the binary
from the native messaging host JSON.
2019-04-01 01:24:54 +02:00
Vladimír Čunát
4c3ec0e325
nixos docs: run the formatting tool (no content change)
...
As documented in the docs themselves :-)
2019-03-22 14:44:11 +01:00
Will Dietz
173f79f690
zsh: don't export HISTFILE and friends
...
Just set them normally.
Exporting them will propagate them to all executed programs
such as bash (as used by nix-shell or nix run),
and badness ensues when different formats are used.
2019-03-21 10:28:20 -05:00
Alyssa Ross
0cd7f32a4c
Merge pull request #54627 from FlorianFranzen/waybar
...
waybar: init at 0.4.0
2019-03-20 23:38:04 +00:00
Bob van der Linden
9d4bc79003
nixos/zsh: do not use /var/run
2019-03-20 00:01:45 +01:00
Bob van der Linden
8f6aaa8b78
nixos/xonsh: do not use /var/run
2019-03-20 00:01:45 +01:00
Bob van der Linden
45d43a6472
nixos/fish: do not use /var/run
2019-03-20 00:01:45 +01:00
Bob van der Linden
bad7d82487
nixos/bash: do not use /var/run
2019-03-20 00:01:45 +01:00
Izorkin
53d05fd0cc
nixos/zsh: enable configure history and custom options
2019-03-18 19:57:54 +03:00
Florian Franzen
52d0db7e73
nixos/waybar: init module
2019-03-18 09:56:27 +01:00
Michael Weiss
578fe3f5a0
nixos/sway: Improve the module and adapt it to NixOS
...
This commit contains the following changes:
- nixos/sway: Remove the beta references
- sway: Drop buildDocs
- nixos/sway: Improve the documentation
- sway,nixos/sway: Adapt Sway to NixOS
- Copy the default configuration file to /etc/sway/config (Sway will
still load the identical file from the Nix store but this makes it
easier to copy the default configuration file).
- This will also remove all references to the Nix store from the
default configuration file as they will eventually be garbage
collected which is a problem if the user copies it.
- I've also decided to drop the default wallpaper (alternatively we
could copy it to a fixed location).
- nixos/sway: Drop the package option
2019-03-13 11:37:11 +01:00
Michael Weiss
45004c6f63
sway: Switch to 1.0
...
This is the result of executing:
git mv -f pkgs/applications/window-managers/sway/beta.nix pkgs/applications/window-managers/sway/default.nix
git mv -f nixos/modules/programs/sway-beta.nix nixos/modules/programs/sway.nix
And removing sway-beta from the following files:
pkgs/top-level/all-packages.nix
nixos/modules/module-list.nix
2019-03-12 22:29:39 +01:00
Silvan Mosberger
6c81f41e36
Merge pull request #56880 from mayflower/bash-root-prompt-fix
...
nixos/bash: fix root prompt
2019-03-08 03:10:18 +01:00
Silvan Mosberger
782cc919c8
Merge pull request #56254 from shosti/gnupg-ssh-austh-sock
...
nixos/gnupg: set SSH_AUTH_SOCK in non-interactive settings
2019-03-08 01:46:34 +01:00
Linus Heckemann
efbd24ffcc
nixos/bash: fix root prompt
...
b4b67177b5
introduced a regression of
its own: the prompt would end with $ for all users, not with # for
root as it should.
2019-03-05 13:27:32 +01:00
hyperfekt
3731835efc
nixos/fish: generate autocompletions from man pages
2019-02-27 12:23:48 +01:00
Robert Schütz
029adf9619
Revert "nixos/fish: generate autocompletions from man pages" ( #56439 )
...
System rebuilds currently fail due to collisions.
See also https://github.com/NixOS/nixpkgs/issues/56432 .
2019-02-27 00:08:57 +01:00
Linus Heckemann
31f0972e27
Merge pull request #52464 from hyperfekt/fish_generate-completions
...
nixos/fish: generate autocompletions from man pages
2019-02-25 22:03:51 +01:00
hyperfekt
5cc6377647
nixos/fish: generate autocompletions from man pages
2019-02-25 16:39:04 +01:00
Emanuel Evans
ddabdc0a1e
nixos/gnupg: set SSH_AUTH_SOCK in non-interactive settings
...
`SSH_AUTH_SOCK` is useful in some non-interactive settings, for instance
daemonized Emacs. Fixes #55733 .
2019-02-23 10:49:32 -08:00
Symphorien Gibol
a915b33315
nixos: add preferLocalBuild=true; on derivations for config files
2019-02-22 20:11:27 +01:00
Domen Kožar
ae3a807a21
Merge pull request #47334 from bfortz/autojump
...
autojump: new program.autojump.enable flag to automatically load autojump
2019-02-20 15:12:51 +07:00
Kai Wohlfahrt
de7abf63b8
nixos/ssh: apply options after extraConfig
...
Otherwise, the standard options (e.g. AddressFamily) cannot be overriden
in extraConfig, as the option is applied on the first (not most
specific) match. Closes #52267
2019-02-18 21:58:46 +00:00
Justin Bedő
05ab1a6e5a
Merge branch 'master' into singularity
2019-02-17 21:49:37 +00:00
Maximilian Bosch
6a0d2ff7c1
nixos/iotop: don't install the package globally
...
The binary will be in `/run/wrappers/bin` and adding `pkgs.iotop` won't
have any effect.
See also https://github.com/NixOS/nixpkgs/pull/51749#discussion_r254724170
2019-02-07 16:52:01 +01:00
Maximilian Bosch
1ac5612be8
Merge pull request #51749 from Ma27/add-iotop-module
...
nixos/iotop: add module
2019-02-07 16:12:11 +01:00
Michael Weiss
ebe36008d6
nixos/sway-beta: Install swaylock and swayidle by default
2019-02-03 15:35:07 +01:00
Jörg Thalheim
ecb265f106
nixos/singularity: fix singularity output
2019-01-31 11:04:16 +00:00
Jörg Thalheim
a1233ecdcf
nixos/singularity: fix indentation
2019-01-31 10:58:01 +00:00
Justin Bedo
3bab170088
singularity: update module to correctly wrap suid binary
2019-01-31 09:21:18 +11:00
Graham Christensen
0fe1645987
Merge pull request #53245 from Izorkin/zsh-syntaxHighlighting
...
zsh.syntaxHighlighting: add option to customize styles
2019-01-29 12:27:43 -05:00
Florian Klink
4f11c06fac
programs.ssh.knownHosts: update example to be an attrset
...
We shouldn't encourage using a list here, but prefer the attrset.
Using a list here causes very unintuitive effects during merging.
2019-01-18 15:33:07 +01:00
gnidorah
30ff54c348
way-cooler: 0.8.0 -> 0.8.1 ( #53220 )
2019-01-15 23:05:17 +02:00
Claudio Bley
4dbf45bc5e
programs/nano: Generate nanorc if syntaxHighlight
enabled
...
* prepend a newline to the `include` directive
* generate the nanorc by default, since `cfg.syntaxHighlight` is `true`
2019-01-14 23:27:04 +01:00
Frederik Rietdijk
e5381cdece
Merge master into staging-next
2019-01-06 09:36:23 +01:00
Jörg Thalheim
2614c8a6c5
nixos/xss-lock: specify a default locker
...
Having a default locker is less error-prone and more convenient.
Incorrect values might leave the machine vulnerable since there is no
fallback.
2019-01-05 16:42:30 +01:00
Frederik Rietdijk
9618abe87c
Merge master into staging-next
2019-01-04 21:13:19 +01:00
Izorkin
420b83b29b
zsh.syntaxHighlighting: add option to customize styles
2019-01-03 01:05:45 +03:00
gnidorah
d15425f816
nixos/sway: Improve the wrapper
...
Port a change by @primeos from sway-beta module to sway module.
https://github.com/NixOS/nixpkgs/pull/51316
2019-01-01 11:21:15 +03:00
Jan Tojnar
c45e9d0fac
Merge branch 'master' into staging
2018-12-25 17:03:57 +01:00
Sander van der Burg
a27aa247c0
Merge pull request #50596 from svanderburg/mobile-updates
...
Mobile updates
2018-12-24 15:52:33 +01:00
Sander van der Burg
e37f0454ac
Remove relatedPackages to fix ofborg evaluation
2018-12-20 19:29:00 +01:00
Frederik Rietdijk
9ab61ab8e2
Merge staging-next into staging
2018-12-19 09:00:36 +01:00