JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,508 Commits 2 Branches 0 Tags 13 GiB
d2f01f0dfd
Commit Graph

585 Commits

Author SHA1 Message Date
worldofpeace
2fbccbc728 Revert "Merge pull request #71095 from flokli/pinentry-cleanup" 
This reverts commit 823da4d492, reversing
changes made to b75c8ee3bc.
 2019-10-16 20:28:21 -04:00
Franz Pletz
b5bea4ce32 gnupg: disable gui/pinentry support by default 
This solves the dependency cycle in gcr alternatively so there won't be
two gnupg store paths in a standard NixOS system which has udisks2 enabled
by default.

NixOS users are expected to use the gpg-agent user service to pull in the
appropriate pinentry flavour or install it on their systemPackages and set
it in their local gnupg agent config instead.

Co-authored-by: Florian Klink <flokli@flokli.de>
 2019-10-16 19:56:50 -04:00
Franz Pletz
edea9fed72 nixos/gnupg: add option for setting pinentry flavours 
Co-authored-by: Florian Klink <flokli@flokli.de>
 2019-10-16 19:56:49 -04:00
worldofpeace
dd050270c7 nixos/environment: don't set GTK_DATA_PREFIX or GTK_EXE_PREFIX 
We had these set so gtk2 can discover themes properly, however we failed
realize that gtk2 already has a patch that makes it search in XDG_DATA_DIRS.
I don't believe any issue is solved by setting these.
 2019-10-13 19:54:09 -04:00
Eelco Dolstra
4e0d6a5ff8
Don't create /nix/var/nix/{gcroots,per-user}/per-user with 1777 permission 
In fact, don't create them at all because Nix does that automatically.

Also remove modules/programs/shell.nix because everything it did is
now done automatically by Nix.
 2019-10-10 16:24:33 +02:00
Joachim Fasting
923c449e9b
nixos/blcr: remove 2019-10-06 08:10:23 +02:00
Jörg Thalheim
bfed455de3
Merge pull request #68946 from volth/escape 
treewide: fix string escapes
 2019-09-24 04:19:12 +01:00
Eelco Dolstra
b0ccd6dd16
Revert "nixos/doc: re-format" 
This reverts commit ea6e8775bd. The new
format is not an improvement.
 2019-09-19 19:17:30 +02:00
worldofpeace
58f090cc7b
Merge pull request #69031 from worldofpeace/xcursor-update 
nixos/xdg/icons: match XCURSOR_PATH spec
 2019-09-18 17:42:20 -04:00
Jan Tojnar
c28659e2fb
doc: Disable wrapping source (#68181) 
doc: Disable wrapping source
 2019-09-18 22:33:56 +02:00
Jan Tojnar
ea6e8775bd
nixos/doc: re-format 2019-09-18 22:13:35 +02:00
Maximilian Bosch
713fda2eb5
nixos/sway: install swaybg by default 2019-09-18 21:50:18 +02:00
worldofpeace
b3f4ce351e nixos/xdg/icons: match XCURSOR_PATH spec 2019-09-18 13:03:14 -04:00
worldofpeace
ee29fbd9a2
Merge pull request #68492 from worldofpeace/pam-sessionvariables 
Introduce environment.profileRelativeSessionVariables
 2019-09-18 11:15:26 -04:00
worldofpeace
6663a795a3 nixos/environment: set GTK_EXE_PREFIX 2019-09-18 11:13:43 -04:00
worldofpeace
cc125810cb nixos/environment: set GTK_DATA_PREFIX 
Many desktop environment modules are already setting
this so it already makes sense to just do this globally.
 2019-09-18 11:13:43 -04:00
Robert Helgesson
866cc3e792 nixos/system-environment: introduce environment.profileRelativeSessionVariables 
There is a need for having sessionVariables set relative to the Nix Profiles.
Such as in #68383.
 2019-09-18 11:09:43 -04:00
volth
1aadcee68a
nixos/less: fix escape 2019-09-17 00:18:14 +00:00
Maximilian Bosch
99b291c73c
Merge pull request #68507 from peterhoeg/f/mtr 
nixos/mtr: support for selecting the package
 2019-09-12 09:34:22 +02:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Frederik Rietdijk
66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
worldofpeace
792444af84 nixos/system-config-printer: init 2019-09-06 09:40:17 -04:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next 
Fixed trivial conflicts caused by removing rec.
 2019-09-06 03:20:09 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g 
GTK was renamed.
 2019-09-06 02:54:53 +02:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
worldofpeace
9b13731b72
Merge pull request #67522 from worldofpeace/gnome3/harmonize-defaults 
Harmonize Gnome3 Defaults
 2019-09-01 18:33:00 -04:00
Silvan Mosberger
478e7184f8
nixos/modules: Remove all usages of types.string 
And replace them with a more appropriate type

Also fix up some minor module problems along the way
 2019-08-31 18:19:00 +02:00
Frederik Rietdijk
98ef78326d Merge staging-next into staging 2019-08-31 18:07:33 +02:00
Silvan Mosberger
4727a40be9
Merge pull request #65283 from averelld/add-x2goserver-module 
Add x2goserver module
 2019-08-31 17:49:41 +02:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
worldofpeace
90319d5e33 nixos/seahorse: move to programs 2019-08-30 20:42:01 -04:00
Averell Dalton
f0d23b6343 x2goserver: add module 2019-08-30 19:54:12 +02:00
Elis Hirwing
aacf9235d8
nixos/usbtop: Add module to install usbtop and to enable kernel module 2019-08-30 18:54:33 +02:00
Vika
844200a06f
nixos/bash: Improve Emacs detection for PS1 
That's one of my itches - when I'm sshing from Emacs' term to a NixOS
machine, it doesn't detect that I'm running emacs and showing a title
escape sequence. This commit fixes it, checking against $TERM to
prevent this from ever bothering anyone again.
 2019-08-30 00:28:57 +03:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Matthew Bauer
4081bec5ac
zsh: remove unfunction on TERM=dumb 
Unfortunately this gives an error when precmd or preexec exists. Removing to avoid that.
 2019-08-27 11:00:58 -04:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Daniel Hirschberger
9a6adc1619 nixos/gnupg: Add gpg to systemPackages 2019-08-24 21:30:49 +02:00
Jan Tojnar
d90aa7dc62
Merge pull request #67389 from jtojnar/xdg-user-dirs 
Allow changing xdg-user-dirs with environment.etc
 2019-08-24 19:22:45 +02:00
Jan Tojnar
48426833c8
nixos/environment: prepend /etc/xdg to XDG_CONFIG_DIRS 
Previously, we were only adding profile-relative paths to XDG_CONFIG_DIRS
variable. That required very ugly hacks like
https://github.com/NixOS/nixpkgs/issues/33282#issuecomment-524550842
to be able to configure XDG stuff.

Now, we are prepending the variable with /etc/xdg, allowing us to
simply use `environment.etc."xdg/…"` options.
 2019-08-24 16:01:01 +02:00
Matthew Bauer
ac773d1607 nixos/zsh: Fix tramp support 
For a long time, TRAMP has not worked with ZSH NixOS servers. I
thought I fixed this in 0740f57e63af61694d14796286cb9204, but now
realize that was only half the problem. For TRAMP to start working
again ‘unsetopt zle’ was needed, otherwise the connection would hang.
In addition, I have a few more settings added that can apparenty
interfere with these settings.
 2019-08-21 21:24:45 -04:00
worldofpeace
4ba10fbbfd
Merge pull request #66990 from worldofpeace/gnome-vte-config 
nixos/gnome-terminal: init
 2019-08-21 16:17:05 -04:00
worldofpeace
4a46140d29 nixos/gnome-terminal: init 
This module obsoletes services.gnome3.gnome-terminal-server
as that's a confusing option for users, and sounds internal.
It's much simpler to have a gnome-terminal module.
 2019-08-21 16:16:04 -04:00
Matthew Bauer
1ab1e11257
Merge pull request #66992 from oxij/nixos/fix-zsh-prompt 
nixos: zsh: setopt prompt_sp to workaround a zsh bug
 2019-08-20 13:20:30 -04:00
Jan Malakhovski
065c6ed96e nixos: zsh: setopt prompt_sp to workaround a zsh bug 
See #38535, properly fixing the prompt seems complicated, and this seems
to work in all the ttys I checked.

Suggested by @Mic92.
 2019-08-19 22:58:13 +00:00
worldofpeace
918b7d572f nixos/dconf: cleanup 
Add dconf to systemPackages and make GIO_EXTRA_MODULES
a list so it can actually merge.
 2019-08-18 21:54:00 -04:00
Matthew Bauer
3411c1566a
Merge pull request #66480 from primeos/nixos-fuse 
nixos/fuse: init
 2019-08-14 10:16:02 -04:00
Matthew Bauer
329e097828
Merge pull request #66425 from Gerschtli/fix/path-order 
environment.profiles: fix order of profiles and PATH
 2019-08-13 15:06:09 -04:00
Michael Weiss
62f7711e29
Fix the indentation 
Co-Authored-By: Alexey Shmalko <rasen.dubi@gmail.com>
 2019-08-12 13:37:15 +02:00