Commit graph

34 commits

Author SHA1 Message Date
Evgeny Egorochkin aa150f5aea KDE: fix config build when grub is used to generate boot menu, but isn't used as a loader. 2013-08-06 16:13:20 +03:00
Rickard Nilsson b0f33f2052 Add options for setting theme and setup-script in KDM 2013-02-22 09:34:36 +01:00
Eelco Dolstra 4d983d4955 Rename ‘system.build.systemd’ to ‘systemd.package’
This makes it cheaper to test a new systemd and is more consistent
with other modules.
2013-01-16 13:17:57 +01:00
Eelco Dolstra cdc3604a7d kdm: Do a poweroff, not a halt 2012-08-20 11:11:10 -04:00
Eelco Dolstra 490ce3a230 PAM: Rename ownDevices to startSession
Logind sessions are more generally useful than for device ownership.
For instances, ssh logins can be put in their own session (and thus
their own cgroup).
2012-08-17 13:48:22 -04:00
Eelco Dolstra 7d958dcdd1 Drop Upstart references 2012-08-17 11:02:12 -04:00
Eelco Dolstra 44d091674b Merge branch 'master' of github.com:NixOS/nixos into systemd
Conflicts:
	modules/config/networking.nix
	modules/services/networking/ssh/sshd.nix
	modules/services/ttys/agetty.nix
	modules/system/boot/stage-2-init.sh
	modules/system/upstart-events/shutdown.nix
2012-07-16 17:27:11 -04:00
Eelco Dolstra 73532c3855 Global replace /var/run/current-system -> /run/current-system 2012-07-16 11:34:21 -04:00
Eelco Dolstra 2526afb1c7 Don't use ConsoleKit 2012-06-19 16:22:26 -04:00
Eelco Dolstra e348fbf7a4 * Allow logging in with an empty password in KDE. This is consistent
with SLiM and local console logins.

svn path=/nixos/trunk/; revision=30339
2011-11-08 18:50:42 +00:00
Lluís Batlle i Rossell c7f568dc06 Fixing the xserver.enableTCP for kdm.
svn path=/nixos/trunk/; revision=30056
2011-10-27 15:43:13 +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
Eelco Dolstra c45356769e * /var/lib/kdm needs to be owned by ‘kdm’.
* Set KDEDIRS properly in kdm.

svn path=/nixos/trunk/; revision=27817
2011-07-18 12:36:46 +00:00
Eelco Dolstra 6490c6ba21 * Don't use /tmp/kdm as the home directory for the kdm user - sounds
insecure.
* Create /var/lib/kdm.
* In kdmrc, set BootManager to "Grub2" if we're using GRUB 2.

svn path=/nixos/trunk/; revision=27805
2011-07-17 10:52:40 +00:00
Yury G. Kudryashov f58efe3336 Add kdm user. Kdm doesn't work here without kdm user
svn path=/nixos/trunk/; revision=24835
2010-11-24 10:45:34 +00:00
Eelco Dolstra f9a62453b0 * Set KDEDIRS in kdm, otherwise it can't find the wallpaper.
svn path=/nixos/trunk/; revision=24282
2010-10-14 12:11:37 +00:00
Eelco Dolstra 6e118cd66b * Change the default desktop manager from "xterm" to the last imported
and enabled desktop manager (e.g. "kde" if KDE is enabled, and
  "xterm" if nothing is explicitly enabled).  This means that you
  don't have to write

    services.xserver.desktopManager.default = "kde4";

  anymore in addition to

    services.xserver.desktopManager.kde4.enable = true;

  to make KDE the default desktop environment.
  
* Remove the "none + none" session type.

* Remove the "+ none" string at the end of session types.  I.e. now
  it's "kde", not "kde + none".

* In kdm, add coreutils to its SystemPath so that it can remove the
  temporary directories in /tmp that it creates.

svn path=/nixos/trunk/; revision=23036
2010-08-08 14:05:32 +00:00
Eelco Dolstra 622a7d3d46 * If kdm is enabled, disabled slim automatically. This is so that
users don't have to write

    services.xserver.displayManager.kdm.enable = true;
    services.xserver.displayManager.slim.enable = false;

  to enable kdm, but just

    services.xserver.displayManager.kdm.enable = true;


svn path=/nixos/trunk/; revision=23033
2010-08-08 12:39:00 +00:00
Eelco Dolstra da0d5c5645 * Use config.system.build.grub rather than pkgs.grub to get the right
GRUB when version 2 is enabled.

svn path=/nixos/branches/boot-order/; revision=22479
2010-07-05 14:33:11 +00:00
Eelco Dolstra 95a9c5dd77 * Log the standard output/error of Upstart jobs to
/var/log/upstart/<jobname> rather than spamming the console with it.

svn path=/nixos/trunk/; revision=22093
2010-06-01 19:44:23 +00:00
Yury G. Kudryashov 1e83fe6122 Remove tabs
svn path=/nixos/trunk/; revision=21104
2010-04-15 15:47:26 +00:00
Eelco Dolstra 73668f41da * Added an "auto" pseudo display manager that logs in a user
automatically.  This is mostly useful for testing.  (KDM also has
  this feature, but it's nice not to depend on KDE for non-KDE tests.)

svn path=/nixos/trunk/; revision=19239
2010-01-05 15:32:14 +00:00
Eelco Dolstra 7d47575a58 * A 15-second timeout to start the X server is too low if there are a
billion other daemons starting at the same time during the boot.

svn path=/nixos/branches/upstart-0.6/; revision=18250
2009-11-07 11:32:28 +00:00
Eelco Dolstra b581a56d79 * Define the Upstart package to use in one place.
svn path=/nixos/branches/upstart-0.6/; revision=18187
2009-11-06 09:36:35 +00:00
Sander van der Burg ac5bc4a68a Added XDMCP option to KDM
svn path=/nixos/trunk/; revision=17938
2009-10-23 10:54:35 +00:00
Lluís Batlle i Rossell b0a6c15f42 Fixing a reference to a grub in kdm, I hadn't tested before.
svn path=/nixos/trunk/; revision=17461
2009-09-27 21:51:47 +00:00
Eelco Dolstra 6ca8fa8949 * Enable Grub support in kdm, i.e., the reboot menu option can be used
to directly boot into any of the Grub menu entries.  This doesn't
  work yet though.  Probably Grub needs some messing with the
  savedefault option.

svn path=/nixos/trunk/; revision=17091
2009-09-13 15:03:07 +00:00
Eelco Dolstra 379778c385 * For X logins, don't use pam_ck_connector since it doesn't really
work for X logins.  (The documentation also says so.)  Instead just
  call ck-launch-session from the xsession script.

svn path=/nixos/trunk/; revision=17090
2009-09-13 14:05:21 +00:00
Eelco Dolstra 6596a3ec55 * When using kdm, always use our xsession script, even when the
default session is selected.  This is because we always want to run
  our own initialisation (like starting ssh-agent).

* ssh-agent: don't start it is a child but have it re-exec the
  xsession script.  This ensures that ssh-agent quits when we log out.

* In the xsession script, don't redirect output to ~/.xsession-errors
  if the display manager is kdm, since kdm already does that.  In fact
  it uses ~/.xsession-errors<optional number> if there are concurrent
  X sessions.

* For consistency with other distros and the xdm manpage, exec the
  ~/.xsession script instead of sourcing it.  Do this for the "custom"
  session type provided by kdm.

svn path=/nixos/trunk/; revision=17087
2009-09-13 13:34:52 +00:00
Eelco Dolstra 6e2914fb9b * Make the KDE modules work with KDE 4.2 and 4.3. Also, when using
KDE 4.3, add Qt 4.5 instead of Qt 4.4 to the system path.

svn path=/nixos/trunk/; revision=17085
2009-09-13 11:09:58 +00:00
Sander van der Burg 297889f05c Switched KDE 4.2 to KDE 4.3
svn path=/nixos/trunk/; revision=17043
2009-09-11 10:43:13 +00:00
Eelco Dolstra ecde113c52 * Fix logging out in X. Without this option, the X server dies for
some reason:

  Sep 10 17:52:49 dutibo kernel: mtrr: no MTRR for f0000000,400000 found
  Sep 10 17:52:50 dutibo kdm[2960]: X server for display :0 terminated unexpectedly
  Sep 10 17:52:50 dutibo kdm[2960]: Unable to fire up local display :0; disabling.

svn path=/nixos/trunk/; revision=17013
2009-09-10 15:58:39 +00:00
Eelco Dolstra 0156cfbe9e * Cleaned up the display manager module a bit.
svn path=/nixos/trunk/; revision=17012
2009-09-10 15:49:16 +00:00
Eelco Dolstra bc95e0fdf9 * Simplified the X server directory structure: x11/xserver/* -> x11/.
svn path=/nixos/trunk/; revision=17005
2009-09-10 12:50:58 +00:00
Renamed from modules/services/x11/xserver/display-managers/kdm.nix (Browse further)