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
1d57489427
Global replace /var/run/opengl-driver -> /run/opengl-driver
2012-07-16 11:34:21 -04:00
Eelco Dolstra
73532c3855
Global replace /var/run/current-system -> /run/current-system
2012-07-16 11:34:21 -04:00
Shea Levy
8c24de13e4
D'oh
2012-07-16 08:11:44 -04:00
Shea Levy
cdd8ecf9c7
multitouch: Invert left-right scrolling when invertScroll is enabled
2012-07-16 08:03:47 -04:00
Shea Levy
3d2b83c110
multitouch: Add an option to ignore palm touches
2012-07-14 21:40:49 -04:00
Shea Levy
c909ea9208
multitouch: Add option to invert scroll
2012-07-14 18:02:46 -04:00
Peter Simons
0c12e29368
Don't add the i3 window manager to the system if it isn't enabled in configuration.nix.
2012-07-12 11:33:10 +02:00
Rok Garbas
b7398794ed
i3 window manager was not installed when enabled
2012-07-10 16:07:53 +02:00
Eelco Dolstra
872a76b177
Merge branch 'master' of github.com:NixOS/nixos into systemd
2012-06-22 11:11:21 -04:00
Eelco Dolstra
055eae2a58
Merge pull request #1 from aszlig/i3_integration
...
Add xserver integration of i3 WM.
2012-06-20 20:49:45 -07:00
Eelco Dolstra
2526afb1c7
Don't use ConsoleKit
2012-06-19 16:22:26 -04:00
Eelco Dolstra
dab6bbe3a6
Set the default unit to "graphical.target" if X11 is enabled
2012-06-19 14:51:04 -04:00
Mathijs Kwik
bd5b06bf86
synaptics driver: accelleration factor config option
...
svn path=/nixos/trunk/; revision=34523
2012-06-16 11:13:48 +00:00
aszlig
b78ce79f89
Add xserver integration of i3 WM.
...
This allows to set i3 as the default window manager in the system configuration.
2012-06-04 21:19:12 +02:00
Eelco Dolstra
ea3cfc9287
* Add xdg-open to the default X11 configuration so that programs like
...
Chrome can open downloaded files.
svn path=/nixos/trunk/; revision=34097
2012-05-15 02:49:47 +00:00
Arie Middelkoop
0cb5673400
Some additional synaptics settings.
...
svn path=/nixos/trunk/; revision=33837
2012-04-19 08:29:22 +00:00
Mathijs Kwik
3bbaa3b60c
slim display manager: enabled auto_login setting
...
useful for demo/kiosk mode
svn path=/nixos/trunk/; revision=33774
2012-04-13 14:52:25 +00:00
Shea Levy
11066067f7
Add nouveau xorg video driver
...
svn path=/nixos/trunk/; revision=33300
2012-03-20 16:29:22 +00:00
Shea Levy
6435207dd1
Whoops, actually use the mtrack fork
...
svn path=/nixos/trunk/; revision=33285
2012-03-20 01:56:39 +00:00
Shea Levy
724b5abe42
xf86-input-multitouch seems to be abandoned, update it with the mtrack fork
...
svn path=/nixos/trunk/; revision=33283
2012-03-20 01:48:09 +00:00
Shea Levy
14dd95b692
xserver.nix: Automatically support xorg's own video drivers
...
svn path=/nixos/trunk/; revision=33281
2012-03-19 23:57:26 +00:00
Eelco Dolstra
86d8d62d16
* Allow Upstart jobs to declare that they shouldn't be restarted by
...
switch-to-configuration. E.g. the X server shouldn't be restarted
because that kills all the X clients.
svn path=/nixos/trunk/; revision=33223
2012-03-18 02:10:39 +00:00
Eelco Dolstra
ed436179e1
* Improve some job names.
...
svn path=/nixos/trunk/; revision=33215
2012-03-17 19:22:22 +00:00
Eelco Dolstra
53bd25c7fa
* Automatically start VBoxClient-all when the X session starts. This
...
allows seamless windows, resizing of the desktop, cut and paster,
etc.
svn path=/nixos/trunk/; revision=33131
2012-03-16 01:29:51 +00:00
Eelco Dolstra
1186167be2
* Fix xserver restart with cfg.driSupport32Bit. Contributed by Kirill
...
Elagin.
svn path=/nixos/trunk/; revision=33099
2012-03-15 10:26:08 +00:00
Yury G. Kudryashov
34c2f2cf58
gtkLibs.gtk moved to gtk
...
svn path=/nixos/trunk/; revision=33096
2012-03-15 07:19:12 +00:00
Mathijs Kwik
8bfe513e75
renamed "all-interfaces" to "networking"
...
svn path=/nixos/trunk/; revision=32780
2012-03-04 18:44:42 +00:00
Mathijs Kwik
86bf5566fe
many daemons: depend on all-interfaces instead of gw6c
...
svn path=/nixos/trunk/; revision=32766
2012-03-04 12:58:18 +00:00
Peter Simons
f0dfd7d06a
made kde4's phonon backends configurable
...
svn path=/nixos/trunk/; revision=32481
2012-02-22 20:29:00 +00:00
Eelco Dolstra
5d12152b13
* Enable xfce4-appfinder.
...
svn path=/nixos/trunk/; revision=31612
2012-01-17 18:15:20 +00:00
Arie Middelkoop
609a02906e
Another type error fix ("The example shouldn't be a string either").
...
svn path=/nixos/trunk/; revision=31538
2012-01-14 12:24:41 +00:00
Arie Middelkoop
2f49427e4f
Fixed the default value for the palmDetect synaptics option (empty string -> false).
...
svn path=/nixos/trunk/; revision=31529
2012-01-14 09:40:08 +00:00
Arie Middelkoop
bf1bf4957c
Additional options for synaptics
...
How can you ever work with a touchpad while having finger taps on...
svn path=/nixos/trunk/; revision=31523
2012-01-13 22:23:18 +00:00
Yury G. Kudryashov
98f5e3b3b2
Drop kde4.5-specific code
...
svn path=/nixos/trunk/; revision=31486
2012-01-11 22:58:32 +00:00
Peter Simons
cab4a28361
synaptics: add 'additionalOptions' option
...
svn path=/nixos/trunk/; revision=31469
2012-01-10 18:40:02 +00:00
Florian Friesdorf
76986a24f9
enable noX11 on kernel cmdline to suppress start of X
...
xserver is started on start_xserver event, which is emitted by
check_for_xserver_start if there is no "noX11" on the kernel cmdline.
Thanks to viric for the general idea.
svn path=/nixos/trunk/; revision=31166
2011-12-31 00:24:48 +00:00
Florian Friesdorf
5b7e7bb429
services.xserver.xkbVariant
...
svn path=/nixos/trunk/; revision=31165
2011-12-30 23:26:11 +00:00
Eelco Dolstra
48adcd5510
* Remove xdpyinfo from the $PATH.
...
svn path=/nixos/trunk/; revision=30388
2011-11-11 03:11:32 +00:00
Eelco Dolstra
21d808ee6c
* Add a module that enables a x11vnc-based terminal server, allowing
...
users to login via VNC. Xvfb servers are started as required to
allow multiple concurrent users.
svn path=/nixos/trunk/; revision=30374
2011-11-10 20:52:23 +00: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
Eelco Dolstra
07694cab46
* Doh. Never rename a variable *after* testing.
...
svn path=/nixos/trunk/; revision=30160
2011-11-01 02:53:37 +00:00
Eelco Dolstra
cf03194d59
* Disable Nepomuk/Strigi by default because they cause problems
...
(e.g. segfaults whn loggin in to the NixOS graphical ISO) and don't
really work very well (e.g. fail to find files). They can be
re-enabled in the KDE System Settings.
svn path=/nixos/trunk/; revision=30155
2011-10-31 21:04:39 +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
Eelco Dolstra
6e809242e9
* Ensure that the "kde" PAM module exists whn KDE is enabled.
...
Previously, this was only enabled in the KDM module, so if you were
using a different display manager than KDM, stuff like getting out
of the screensaver didn't work correctly.
svn path=/nixos/trunk/; revision=30049
2011-10-26 21:47:03 +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
7a858f2a89
Adjust DM/kde4.nix to latest changes in kde-4.7
...
svn path=/nixos/trunk/; revision=29181
2011-09-11 12:44:54 +00:00
Eelco Dolstra
0de04bd4be
* Xfce 4.6 fix.
...
svn path=/nixos/trunk/; revision=29046
2011-09-05 20:50:15 +00:00
Eelco Dolstra
8d8c250b8f
* Enable gvfs in Xfce.
...
svn path=/nixos/trunk/; revision=29044
2011-09-05 20:37:06 +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
Yury G. Kudryashov
c174554ad7
polkit_kde_agent is now kde4.polkit_kde_agent
...
svn path=/nixos/trunk/; revision=28834
2011-08-26 13:50:03 +00:00
Eelco Dolstra
1aa1c86afc
* Enable upower and udisks for Xfce 4.8.
...
svn path=/nixos/trunk/; revision=28764
2011-08-22 23:10:24 +00:00
Eelco Dolstra
3b1c741f3f
* Xfce 4.8 doesn't need HAL anymore.
...
svn path=/nixos/trunk/; revision=28762
2011-08-22 22:52:13 +00:00
Eelco Dolstra
ecbfe0d9c0
* Cause KDE's Polkit authentication agent to be started at login.
...
You now get a nice popup window asking for the appropriate password
if you try to do something that requires administrative privilege
(e.g. "pkexec ls" in a terminal, unmounting devices that don't
belong to you in Dolphin, or killing other people's processes in
ksysguard).
svn path=/nixos/trunk/; revision=28735
2011-08-22 11:51:03 +00:00
Yury G. Kudryashov
9177fc455d
Adjust nixos to latest changes in kde-4.7 in nixpkgs
...
svn path=/nixos/trunk/; revision=28598
2011-08-15 18:08:12 +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
7e2ea4df32
* Xsession script: set the current directory to $HOME.
...
svn path=/nixos/trunk/; revision=28511
2011-08-12 10:04:43 +00:00
Shea Levy
38cab9070f
synaptics module: By default, disable edge drag scrolling if two finger scrolling is enabled
...
svn path=/nixos/trunk/; revision=28472
2011-08-10 22:14:46 +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
Shea Levy
843ccae5d5
multitouch: Use the right package name
...
svn path=/nixos/trunk/; revision=28375
2011-08-08 01:39:26 +00:00
Shea Levy
9464c99ce2
First attempt at a multitouch touchpad module.
...
Note that the Multitouch X Driver currently has no configuration beyond editing the source code, so the only option is enable or disable
svn path=/nixos/trunk/; revision=28373
2011-08-08 01:34:36 +00:00
Shea Levy
30861ecbc8
Create multitouch module based off synaptics module
...
svn path=/nixos/trunk/; revision=28372
2011-08-08 01:27:44 +00:00
Karn Kallio
c36cf7b591
Reflect kdegraphics organization.
...
svn path=/nixos/trunk/; revision=28214
2011-08-07 00:52:35 +00:00
Eelco Dolstra
d890e74d9c
* Hacks to keep KDE 4.5 working. The latest D-Bus is more strict in
...
checking function arguments, so DBUS_FATAL_WARNINGS=0 is necessary
to prevent KDE from aborting. Also put the Phonon gstreamer backend
in the environment if available.
svn path=/nixos/trunk/; revision=28113
2011-08-01 14:28:28 +00:00
Eelco Dolstra
fc9f6d0395
svn path=/nixos/trunk/; revision=27991
2011-07-28 16:35:13 +00:00
Eelco Dolstra
d1f1cfcd41
* Don't make PulseAudio a requirement for KDE, it works fine without
...
it (especially now that KDE doesn't try to start PulseAudio
automatically).
svn path=/nixos/trunk/; revision=27969
2011-07-26 18:34:59 +00:00
Eelco Dolstra
3b374ea326
* Move PulseAudio initialisation below the re-exec to prevent it from
...
being started twice.
svn path=/nixos/trunk/; revision=27968
2011-07-26 18:34:10 +00:00
Eelco Dolstra
3fdc209978
* Start PulseAudio from the X session script.
...
svn path=/nixos/trunk/; revision=27967
2011-07-26 18:16:24 +00:00
Eelco Dolstra
7bdaedb465
* Add a module to enable PulseAudio. It causes all ALSA applications
...
to be rerouted to PulseAudio.
Note that this is distinct from the already existing module
‘services/audio/pulseaudio.nix’ that provides a system-wide
PulseAudio daemon, which is usually not what you want.
svn path=/nixos/trunk/; revision=27958
2011-07-26 01:51:56 +00:00
Eelco Dolstra
a1df35a590
* Don't enable HAL by default anymore. It's obsolete. It's still
...
enabled by modules that need it (KDE < 4.7, Xfce).
* Don't enable the PolicyKit module by default either, it's also
obsolete (replaced by PolKit). It's still enabled if HAL is
enabled.
svn path=/nixos/trunk/; revision=27933
2011-07-25 00:52:59 +00:00
Eelco Dolstra
38fddb2243
* The X server doesn't actually depend on HAL anymore.
...
svn path=/nixos/trunk/; revision=27932
2011-07-25 00:50:46 +00:00
Eelco Dolstra
a9f599154a
* Remove stupid ‘libraryPath’ entries from ~/.config/Trolltech.conf
...
that can randomly cause KDE to fail.
svn path=/nixos/trunk/; revision=27925
2011-07-24 22:07:58 +00:00
Eelco Dolstra
7c6c50a3bf
* Nuke the KDE icon cache on login.
...
svn path=/nixos/trunk/; revision=27867
2011-07-21 11:16:46 +00:00
Eelco Dolstra
68350e646d
* Support KDE 4.7.
...
svn path=/nixos/trunk/; revision=27818
2011-07-18 12:37:13 +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
Nicolas Pierron
96fc9379ba
Convert assertion option into mkAssert.
...
svn path=/nixos/trunk/; revision=26614
2011-03-30 17:52:34 +00:00
Eelco Dolstra
c31c4290cc
* Style fix.
...
svn path=/nixos/trunk/; revision=26140
2011-03-03 12:00:54 +00:00
Eelco Dolstra
e740badcc6
* Revert unintended commit.
...
svn path=/nixos/trunk/; revision=26082
2011-02-23 19:06:59 +00:00
Eelco Dolstra
9fca36bfa3
* Add the Intel 5000/6000 firmwares to the installation media.
...
svn path=/nixos/trunk/; revision=26081
2011-02-23 19:06:14 +00:00
Karn Kallio
0ea15a8f76
Strigi has moved out of kde4
...
svn path=/nixos/trunk/; revision=26061
2011-02-22 16:39:40 +00:00
Eelco Dolstra
8f5f70b292
* We don't really need a display manager on the installation CD. Just
...
log in as root automatically.
svn path=/nixos/trunk/; revision=26014
2011-02-17 14:38:02 +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
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
2118288557
KDE4: mp3 playback out of the box
...
svn path=/nixos/trunk/; revision=24416
2010-10-22 13:18:22 +00:00
Eelco Dolstra
baaf7bd6e3
* Updated the Compiz module: add the plugins, put ccsm in the PATH,
...
and don't use GConf anymore.
svn path=/nixos/trunk/; revision=24374
2010-10-19 23:25:53 +00:00
Eelco Dolstra
1b55007d63
* Don't use environment.kdePackages; environment.systemPackages works
...
just as well.
svn path=/nixos/trunk/; revision=24290
2010-10-14 14:57:38 +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
968437c5d0
* Enable xfce4-mixer.
...
svn path=/nixos/trunk/; revision=24208
2010-10-10 22:35:18 +00:00
Evgeny Egorochkin
9b7533c2fd
KDE4: fix suid for kcheckpass, although suid doesn't seem to be needed if you use PAM
...
svn path=/nixos/trunk/; revision=23906
2010-09-22 23:08:05 +00:00
Nicolas Pierron
c9dc3651da
Replace mkOverride by its alias mkOverrideTemplate to remove the unused
...
template argument of mkOverride later.
svn path=/nixos/trunk/; revision=23631
2010-09-03 19:10:59 +00:00
Nicolas Pierron
6fa66ff7b9
Move matches just below the identifier.
...
svn path=/nixos/trunk/; revision=23628
2010-09-03 19:10:45 +00:00
Lluís Batlle i Rossell
63c3d72aa6
Updating the nvidiaLegacy nixos xserver driver to a numbered name, to match the current
...
*two* possibilities of nvidia legacy driver in nixpkgs.
svn path=/nixos/trunk/; revision=23412
2010-08-24 22:00:18 +00:00
Lluís Batlle i Rossell
1e7058d025
Removing the NvAGP special option for nvidiaLegacy. Although it helped in
...
suspending the machine, it also slowed down the graphics (specially 2D) quite a lot.
firefox flash, firefox scrolling was a pain.
I'll leave that up to the nixos user with the cfg.deviceSection.
svn path=/nixos/trunk/; revision=23407
2010-08-24 18:24:06 +00:00
Yury G. Kudryashov
a7d7f1630f
Will move digikam outside of kde4 in kde4.5, so change example
...
svn path=/nixos/trunk/; revision=23266
2010-08-19 23:07:14 +00:00
Eelco Dolstra
751ec4f845
* Xfce requires desktop-file-utils to create/update .desktop files.
...
svn path=/nixos/trunk/; revision=23183
2010-08-16 07:48:06 +00:00
Eelco Dolstra
2e0a569187
* Use InputClass in the synaptics module to automatically use the
...
synaptics driver for all touchpads (unless the "dev" option is set).
* Get rid of some synaptics options: SHMConfig, Repeater (obsolete);
*Edge (usually auto-detected), Protocol (use auto-detect instead).
svn path=/nixos/trunk/; revision=23092
2010-08-10 14:13:57 +00:00
Eelco Dolstra
5456815016
* Re-enable ctrl-alt-backspace to kill the X server.
...
svn path=/nixos/trunk/; revision=23089
2010-08-10 12:37:39 +00:00
Eelco Dolstra
8de6ab7dff
* Enable the Xfce power manager.
...
svn path=/nixos/trunk/; revision=23079
2010-08-09 23:15:39 +00:00
Eelco Dolstra
c388446bb0
* Xfce is now more or less functional.
...
svn path=/nixos/trunk/; revision=23075
2010-08-09 21:59:34 +00:00