Commit graph

85 commits

Author SHA1 Message Date
Eelco Dolstra
f1a99bd914 * Subscribe the root user to the NixOS channel by default.
svn path=/nixos/trunk/; revision=33883
2012-04-22 22:43:57 +00:00
Eelco Dolstra
6abf3c8a97 * Change $NIXPKGS_CONFIG to a better location (/etc/nix instead of
/nix/etc).  Not sure the default profile should be setting this at
  all though.

svn path=/nixos/trunk/; revision=33824
2012-04-18 10:59:57 +00:00
Eelco Dolstra
7ba5881146 * Don't install the "nixpkgs_sys" symlink in ~/.nix-defexpr anymore.
Note that for attribute-based nix-env installations, the NixOS
  channel contains Nixpkgs as its "pkgs" attribute, so

    $ nix-env -iA nixos.pkgs.foo

  will work instead of the old

    $ nix-env -iA nixpkgs_sys.foo
    
* Fix the path to root's channels installed in ~/.nix-defexpr.

svn path=/nixos/trunk/; revision=33823
2012-04-18 10:58:33 +00:00
Eelco Dolstra
a193fe4f1d * Add root's NixOS channel to $NIX_PATH. Will remove
/etc/nixos/{nixos,nixpkgs,services} eventually.

svn path=/nixos/trunk/; revision=33822
2012-04-18 10:34:39 +00:00
Mathijs Kwik
de5b437004 assertions '.msg' doesn't exist => .message
svn path=/nixos/trunk/; revision=33508
2012-04-01 10:54:06 +00:00
Mathijs Kwik
f31fefdfd9 splitted ssh/sshd X11 forwarding logic. Backward compatible change.
You can now set the forwardX11 config option for the ssh client and server separately.

For server, the option means "allow clients to request X11 forwarding".
For client, the option means "request X11 forwarding by default on all connections".

I don't think it made sense to couple them. I might not even run the server on some machines.
Also, I ssh to a lot of machines, and rarely want X11 forwarding. The times I want it,
I use the -X/-Y option, or set it in my ~/.ssh/config.

I also decoupled the 'XAuthLocation' logic from forwardX11.
For my case where ssh client doesn't want forwarding by default, it still wants to set the path for the cases I do need it.

As this flag is the one that pulls in X11 dependencies, I changed the minimal profile and the no-x-libs config to check that instead now.

svn path=/nixos/trunk/; revision=33407
2012-03-25 15:42:05 +00:00
Eelco Dolstra
d12339b282 * Doh.
svn path=/nixos/trunk/; revision=33332
2012-03-21 12:38:11 +00:00
Eelco Dolstra
8884d445b7 * VirtualBox: create a vboxnet0 interface by default.
svn path=/nixos/trunk/; revision=33331
2012-03-21 12:28:14 +00:00
Eelco Dolstra
6f03065dce * Move the setting of $MODULE_DIR to modprobe.nix.
* Add a slash to the end of $MODULE_DIR, as expected by depmod.  (Not
  that running depmod from the command line is all that useful, since
  you can't use it to update the tree in the Nix store.  But at least
  commands like "depmod -n" work now.)  Reported by Kirill Elagin on
  IRC.

svn path=/nixos/trunk/; revision=33312
2012-03-20 22:02:27 +00:00
Eelco Dolstra
010578d8a4 * Restrict VirtualBox to users in the vboxusers group.
The VirtualBox build in Nixpkgs is insecure because it uses the
  "--disable-hardened" flag, which disables some checks in the
  VirtualBox kernel module.  Since getting rid of that flag looks like
  too much work, it's better to ensure that only explicitly permitted
  users have access to VirtualBox.

* Drop the 666 permission on "sonypi" because it's not clear why that
  device should be world-writable.

svn path=/nixos/trunk/; revision=33301
2012-03-20 16:30:43 +00:00
Eelco Dolstra
dde8453a09 * Initialise $LOCALE_ARCHIVE earlier in /etc/profile to prevent the
warning

    -bash: warning: setlocale: LC_TIME: cannot change locale (en_GB.UTF8): No such file or directory

  when $LC_TIME is set in environment.shellInit.

svn path=/nixos/trunk/; revision=33248
2012-03-19 02:53:58 +00:00
Eelco Dolstra
bcbe2dce4c * Don't source /etc/profile in interactive non-login shells, unless it
wasn't sourced in a parent shell (as determined by the environment
  variable __ETC_PROFILE_DONE).  This prevents overriden values of
  environment variables such as $PATH from being clobbered in
  subshells.
* Move all aliases to /etc/bashrc (since those are for interactive
  use).

svn path=/nixos/trunk/; revision=33246
2012-03-19 02:35:17 +00:00
Eelco Dolstra
de6968c163 * Virtualbox: use the right set of kernel packages.
svn path=/nixos/trunk/; revision=32971
2012-03-10 14:34:40 +00:00
Eelco Dolstra
e97817b577 * Atomically replace the /bin/sh symlink; otherwise there is a time
window in which /bin/sh is missing.  This can cause concurrently
  running programs to fail (e.g. Hydra jobs =>
  http://hydra.nixos.org/build/2267831).  You'd think the odds of this
  are very low, but they're not.

svn path=/nixos/trunk/; revision=32901
2012-03-08 16:08:03 +00:00
Eelco Dolstra
e11e9b4ef0 * Provide info's manpage.
svn path=/nixos/trunk/; revision=32774
2012-03-04 16:10:19 +00:00
Eelco Dolstra
29d84af677 * Remove the use of the NIXPKGS and NIXOS environment variables.
Instead use $NIX_PATH.  NIXOS_CONFIG is still supported.

svn path=/nixos/trunk/; revision=32739
2012-03-02 12:38:22 +00:00
Eelco Dolstra
58c6231a20 * Added a module for enabling VirtualBox.
svn path=/nixos/trunk/; revision=32722
2012-03-01 20:10:08 +00:00
Florian Friesdorf
66f82c043e Revert "Revert "add ~/bin to PATH if it exists""
sorry m(

svn path=/nixos/trunk/; revision=31246
2012-01-03 17:29:20 +00:00
Florian Friesdorf
68e9f2e09b Revert "add ~/bin to PATH if it exists"
This reverts commit 73bda7c4575b5664d54340db95fec2fa759b6f28.

svn path=/nixos/trunk/; revision=31243
2012-01-03 17:11:21 +00:00
Florian Friesdorf
7b7976ac01 export NIX_PROFILES and NIX_USER_PROFILE_DIR
svn path=/nixos/trunk/; revision=31242
2012-01-03 17:11:19 +00:00
Florian Friesdorf
b4765401af add ~/bin to PATH if it exists
svn path=/nixos/trunk/; revision=31235
2012-01-03 14:36:05 +00:00
Peter Simons
8eca4db54a /etc/profile: do not add ~/bin to $PATH in system-wide init file
Users who want a user-specific bin directory to override system paths should
configure that in their user-specific ~/.bashrc, not in the system-wide init
file. The global file shouldn't add directories from user homes to $PATH
without knowing whether those actually exist or whether the users even want
them in $PATH. On my system, for example, there is no ~/bin, so I don't want my
$PATH to look for one. Removing an erroneous entry from $PATH is cumbersome,
but adding one is easy, so it feels better to err on the side of caution.

svn path=/nixos/trunk/; revision=31188
2011-12-31 12:56:45 +00:00
Florian Friesdorf
ea121d0ff9 Revert "EMACSLOADPATH in /etc/profile"
svn path=/nixos/trunk/; revision=31187
2011-12-31 06:24:12 +00:00
Florian Friesdorf
a38ca160ec EMACSLOADPATH in /etc/profile
svn path=/nixos/trunk/; revision=31175
2011-12-31 04:14:36 +00:00
Florian Friesdorf
b0fefb876f unset MOZ_PLUGIN_PATH and TERMINFO_DIRS before setting them
svn path=/nixos/trunk/; revision=31174
2011-12-31 04:14:31 +00:00
Florian Friesdorf
221c637356 fix MOZ_PLUGIN_PATH
svn path=/nixos/trunk/; revision=31168
2011-12-31 02:57:45 +00:00
Florian Friesdorf
97ce0b1386 MOZ_PLUGIN_PATH based on NIX_PROFILES
svn path=/nixos/trunk/; revision=31167
2011-12-31 02:05:51 +00:00
Florian Friesdorf
b2eb54ae5a set TERMINFO_DIRS according to NIX_PROFILES
this finally makes rxvt-unicode work without manually linking it's terminfo

svn path=/nixos/trunk/; revision=31145
2011-12-29 19:38:03 +00:00
Florian Friesdorf
eb755d4692 switched all mergeOptionString to pkgs.lib.types.string
pierron recommended the use of types.string over mergeOptionString, as
it is superior but might break things.

For my system the change evaluated to the exactly same.

svn path=/nixos/trunk/; revision=31138
2011-12-29 00:51:35 +00:00
Peter Simons
e4ba69aecf wvdial: don't make wvdial a system package; only root can run it
svn path=/nixos/trunk/; revision=30570
2011-11-25 17:41:47 +00:00
Peter Simons
9de905ee61 modules/programs/wvdial.nix: added support for configuring wvdial
For example, I use the following settings to configure T-Mobile Internet
access on my laptop, which is connected to the cell phone by USB:

 | environment.wvdial.dialerDefaults = ''
 |   Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"
 |   Modem Type = USB Modem
 |   Phone = *99#
 |   ISDN = 0
 |   Username = tm
 |   Password = tm
 |   Modem = /dev/ttyACM0
 |   Baud = 460800
 | '';

svn path=/nixos/trunk/; revision=30489
2011-11-20 10:38:26 +00:00
Peter Simons
432d71f3ed modules/programs/bash: major clean-up and re-factoring of /etc/profile and /etc/bashrc
* Moved bash-specific code from /etc/profile to /etc/bashrc.

 * Moved general Bourne shell code from /etc/bashrc to /etc/profile.

 * Added "include guards" to both files to ensure that they aren't sourced
   multiple times (which would result in lots of redundancy in $PATH, etc.).

 * Both files include each other to make sure that the correct system
   environment is always defined.

 * When the current user has installed the 'bash-completion' package in her
   $HOME/.nix-profile, programmable completion is automatically enabled in
   interactive shells.

 * The /etc/skel/.bashrc we installed has been dropped because it is redundant.

svn path=/nixos/trunk/; revision=29451
2011-09-23 14:21:36 +00:00
Marco Maggesi
229b99321f Make blcr module use the configured kernel
svn path=/nixos/trunk/; revision=29413
2011-09-21 13:13:36 +00:00
Peter Simons
eb6e1310b8 strip trailing whitespace; no functional change
svn path=/nixos/trunk/; revision=29285
2011-09-14 18:20:50 +00:00
Yury G. Kudryashov
9a096c9ee7 Partially revert r2903
The nepomuk&virtuoso problem is solved without polutting $QT_PLUGIN_PATH and/or
$LD_LIBRARY_PATH by patching soprano.

svn path=/nixos/trunk/; revision=29107
2011-09-07 23:11:04 +00:00
Eelco Dolstra
94014f4adc * Get the Virtuoso backend in Soprano/Nepomuk to work. Soprano tries
to find virtodbc_r.so in QT_PLUGIN_PATH (among other locations), so
  make sure that Virtuoso can be found there.

svn path=/nixos/trunk/; revision=29033
2011-09-05 17:55:53 +00:00
Eelco Dolstra
4790c147bf * Revert r28400 because ConsoleKit got reverted to 0.4.1.
svn path=/nixos/trunk/; revision=28587
2011-08-15 14:48:32 +00:00
Eelco Dolstra
45d8c418b5 * Some hackery to get ConsoleKit to work with the SLIM and "auto"
display managers.  This was broken due to a change in ConsoleKit
  0.4.2:

    https://bugs.freedesktop.org/show_bug.cgi?id=28377

  Using ConsoleKit's pam-ck-connector helps in that it creates local
  sessions; however, they're not marked as active because the
  x11-display-device property is not set.  As a workaround, calling
  ck-launch-session seems to work.

  More details:

    https://bugs.gentoo.org/show_bug.cgi?id=336634
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598150
    https://bugzilla.redhat.com/show_bug.cgi?id=585952

svn path=/nixos/trunk/; revision=28400
2011-08-08 19:28:17 +00:00
Eelco Dolstra
2af368279c * Set NIX_PATH to something reasonable.
svn path=/nixos/trunk/; revision=28202
2011-08-06 18:55:00 +00:00
Eelco Dolstra
44725e50f0 * Apply the resource limits set by security.pam.loginLimits to all PAM
services (rather than just login(1)).  It's rather unexpected if
  resource limits are not applied to (say) users logged in via SSH or
  X11.

svn path=/nixos/trunk/; revision=28105
2011-08-01 10:17:18 +00:00
Eelco Dolstra
d9cf1c2da0 * Install ~/.bashrc as a regular file rather than as a symlink.
svn path=/nixos/trunk/; revision=26690
2011-04-05 11:24:36 +00:00
Eelco Dolstra
7104acfa8b * Set the checkwinsize option in interactive shells. Otherwise
bash may miss resize events (I guess SIGWINCH is only sent to
  the foreground process).

svn path=/nixos/trunk/; revision=25815
2011-02-08 14:58:41 +00:00
Lluís Batlle i Rossell
bef46f1553 Moving which to type -P, so 'which ls', 'which time', ... work.
svn path=/nixos/trunk/; revision=24862
2010-11-26 09:57:38 +00:00
Lluís Batlle i Rossell
edb5870deb Fixing the xterm PS1 for changing the window title, so it is properly bracketed for bash not to count the control sequences as printable characters.
svn path=/nixos/trunk/; revision=24545
2010-10-30 20:40:33 +00:00
Evgeny Egorochkin
421a80ae8f Make flash work in QtWebkit
svn path=/nixos/trunk/; revision=24474
2010-10-25 16:44:21 +00:00
Evgeny Egorochkin
006f7291e4 Make Strigi indexing work in Nepomuk
svn path=/nixos/trunk/; revision=24460
2010-10-25 01:46:30 +00:00
Evgeny Egorochkin
02f2b1f640 Fix lots of KDE functionality
svn path=/nixos/trunk/; revision=23992
2010-09-30 05:08:33 +00:00
Evgeny Egorochkin
bf3a8dfbe4 bashrc: make ALSA plugins discoverable
svn path=/nixos/trunk/; revision=23932
2010-09-26 03:49:33 +00:00
Yury G. Kudryashov
ca4b60d059 Auto add $prefix/lib/kde4/plugins to QT_PLUGIN_PATH
svn path=/nixos/trunk/; revision=23872
2010-09-20 14:10:46 +00:00
Lluís Batlle i Rossell
b9aa56969f Applying patch sent by roconnor about allowing "nix-env -S" in NixOS. I agree with the change.
svn path=/nixos/trunk/; revision=23861
2010-09-19 00:21:30 +00:00