Commit graph

105 commits

Author SHA1 Message Date
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
Eelco Dolstra
f729f12e4e Some cleanups in the activation script:
* Moved some scriptlets to the appropriate modules.
* Put the scriptlet that sets the default path at the start, since it
  never makes sense not to have it there.  It no longer needs to be
  declared as a dependency.
* If a scriptlet has no dependencies, it can be denoted as a plain
  string (i.e., `noDepEntry' is not needed anymore).

svn path=/nixos/trunk/; revision=23762
2010-09-13 15:41:38 +00:00
Eelco Dolstra
0cdce12006 * Rename the pwdutils' module to shadow'.
svn path=/nixos/trunk/; revision=22109
2010-06-02 21:16:27 +00:00
Eelco Dolstra
c089738bdc * Use the shadow' package instead of pwdutils', `pam_login' and
`su'.
* The `usermod' from `shadow' allows setting a supplementary group
  equal to the user's primary group, so the special hack for the
  `nixbld' group is no longer needed.
* Removed /etc/default/passwd since it's not used by the new passwd.
  The hash is configured in pam_unix.
* Move some values for `security.setuidPrograms' and
  `security.pam.services' to the appropriate modules.

svn path=/nixos/trunk/; revision=22107
2010-06-02 21:10:48 +00:00
Eelco Dolstra
d317d83ba8 * Remove `stopOn = "shutdown"' which doesn't work.
svn path=/nixos/trunk/; revision=22101
2010-06-02 16:05:09 +00:00
Eelco Dolstra
eb4c33eeca * Added an option to enable support for 32-bit binaries (such as Wine
or Google Earth) on 64-bit NixOS on NVIDIA hardware.  The 32-bit
  OpenGL library is symlinked from /var/run/opengl-driver-32, which is
  added to the LD_LIBRARY_PATH so that 32-bit binaries can find it.

svn path=/nixos/trunk/; revision=22062
2010-05-30 22:00:52 +00:00
Eelco Dolstra
540c673364 * Enable the `chfn' program. Note that by default non-root users are
still not permitted to change their account information, as
  specified in login.defs.

svn path=/nixos/trunk/; revision=22049
2010-05-28 14:59:34 +00:00
Lluís Batlle i Rossell
ee8ba3bb79 Updating bashrc, so it does not leave in PATH (and other environment variables) a void element, which
the linux kernel would take as '.'.
This fixes the bug of linux looking into '.' for executables.


svn path=/nixos/trunk/; revision=21818
2010-05-17 14:15:18 +00:00
Yury G. Kudryashov
9d33d05269 Add $profile/lib/qt4/plugins to QT_PLUGIN_PATH
svn path=/nixos/trunk/; revision=21448
2010-04-30 07:36:19 +00:00
Lluís Batlle i Rossell
cf3f1e9f23 INFOPATH fix; the info.nix module should not set the INFOPATH variable in bashrc,
because the bashrc already cares on that, even taking into account all the usual
nixos profiles.

As a side change, I changed a tab to spaces in bashrc.


svn path=/nixos/trunk/; revision=21439
2010-04-29 18:59:05 +00:00
Lluís Batlle i Rossell
b7dab319e5 Fixing the tty group and permissions for vt consoles
svn path=/nixos/trunk/; revision=21231
2010-04-22 10:11:32 +00:00
Marco Maggesi
c423f16f69 Fix job name in nixos/modules/programs/blcr.nix
svn path=/nixos/trunk/; revision=21106
2010-04-15 17:14:44 +00:00
Yury G. Kudryashov
267e0af8db A few typos in previous commits
svn path=/nixos/trunk/; revision=21105
2010-04-15 17:02:33 +00:00
Yury G. Kudryashov
8324ccf755 Add /var/run/current-system/sw to NIX_PROFILES
Also adds a possibility to just add KDE packages to systemPackages.

svn path=/nixos/trunk/; revision=21103
2010-04-15 15:47:15 +00:00
Marco Maggesi
37746e4fb3 Add support for BLCR: modules/programs/blcr.nix
svn path=/nixos/trunk/; revision=21092
2010-04-15 12:11:33 +00:00
Ludovic Courtès
8e16742b79 Update users of `services.sshd'.
svn path=/nixos/trunk/; revision=20575
2010-03-11 17:02:53 +00:00
Sander van der Burg
3d87a133a0 Added gstreamer plugins to the systemPackages, so that Phonon does not crash on shutdown when using KDE 4.4.x
svn path=/nixos/trunk/; revision=20350
2010-03-03 13:22:06 +00:00
Eelco Dolstra
0bae6c2c18 * Disable the "smart" tab completion again, because it causes lots of
problems:

  - It doesn't support filenames with spaces.
  - It inserts a space after the filename when tab-completing in an
    "svn" command.
  - Many people find it annoying that tab-completion on commands like
    "tar" only matches filenames with the "right" extension.
  - Lluís reported bash apparently crashing on some tab completions.

  We should probably make this optional, and maybe use a subset of the
  bash_completion file in the bash distribution that works.

svn path=/nixos/trunk/; revision=20179
2010-02-22 17:20:12 +00:00
Ludovic Courtès
5cb934da59 Fix Bash completion support.
svn path=/nixos/trunk/; revision=19971
2010-02-13 00:07:12 +00:00
Eelco Dolstra
0f56bd755a * Disable bash completion for now. It gives login errors:
bash: BASH_COMPLETION_DIR: readonly variable
    bash: BASH_COMPLETION: readonly variable

  And in the non-interactive shell, we get:

    /nix/store/654xcqk8h2a409mxsnsbnj5c0cp9mjhm-bash-4.1-p2/etc/bash_completion: line 75: shopt: progcomp: invalid shell option name

svn path=/nixos/trunk/; revision=19809
2010-02-04 09:15:46 +00:00
Eelco Dolstra
e76f14714b svn path=/nixos/trunk/; revision=18599 2009-11-24 15:05:08 +00:00
Nicolas Pierron
2e34baba3b Rename environment.extraPackages to environment.systemPackages.
svn path=/nixos/trunk/; revision=17705
2009-10-07 17:14:25 +00:00
Lluís Batlle i Rossell
7b14ee9932 Setting the files cipher algorithm depending on the architecture
(with libxcrypt or without libxcrypt, at the end)

svn path=/nixos/trunk/; revision=17389
2009-09-23 20:50:41 +00:00
Ludovic Courtès
fe51b0c6c3 bashrc: Source `${bash}/etc/bash_completion' when available.
svn path=/nixos/trunk/; revision=16641
2009-08-10 10:18:33 +00:00
Ludovic Courtès
4c848efc1a bashrc: Remove obsolete aclocal' and rpcgen' hacks.
svn path=/nixos/trunk/; revision=16640
2009-08-10 10:07:30 +00:00
Eelco Dolstra
b66fd2364c * Don't put /etc/nixos/nixos in ~/.nix-defexpr.
svn path=/nixos/branches/modular-nixos/; revision=16366
2009-07-15 08:45:29 +00:00
Eelco Dolstra
0d5ea86748 * Merge some stuff from the trunk.
svn path=/nixos/branches/modular-nixos/; revision=16051
2009-06-26 11:36:38 +00:00
Eelco Dolstra
eb8b534173 * Include only the en_US locale on the CD. This saves 75 MiB or so.
svn path=/nixos/branches/modular-nixos/; revision=15883
2009-06-05 17:19:30 +00:00
Eelco Dolstra
82254ce466 * Doh.
svn path=/nixos/branches/modular-nixos/; revision=15794
2009-05-29 13:30:28 +00:00
Eelco Dolstra
ca0038b9b0 svn path=/nixos/branches/modular-nixos/; revision=15793 2009-05-29 13:30:12 +00:00
Eelco Dolstra
81d8c2e1c8 * Move the info wrapper into a module.
svn path=/nixos/branches/modular-nixos/; revision=15792
2009-05-29 13:29:49 +00:00
Eelco Dolstra
3c84d56273 * Move the /etc generation to modules/system/etc.
svn path=/nixos/branches/modular-nixos/; revision=15767
2009-05-28 13:17:56 +00:00
Eelco Dolstra
de7aae5d5e * Move the generation of /etc/nix.machines to the nix-daemon module.
svn path=/nixos/branches/modular-nixos/; revision=15765
2009-05-28 12:56:56 +00:00
Eelco Dolstra
ec55562ec3 * Move the configuration of the pwdutils (passwd, useradd etc.) to
modules/programs/pwdutils.
* Renamed config.system.shell to config.users.defaultUserShell and
  updated the description to make clear it has to be a non-store
  path.

svn path=/nixos/branches/modular-nixos/; revision=15761
2009-05-28 12:24:56 +00:00
Eelco Dolstra
421dcc35c5 * Moved the Bash configuration to modules/programs/bash.
svn path=/nixos/branches/modular-nixos/; revision=15759
2009-05-28 12:06:54 +00:00
Eelco Dolstra
2d7beac377 * New directory modules/programs that contains system-wide
configuration for specific programs.  For instance, ssh.nix provides
  the configuration for the SSH client; ssmtp.nix provides the
  configuration for the `ssmtp' MTA.

svn path=/nixos/branches/modular-nixos/; revision=15757
2009-05-27 23:59:14 +00:00