From bc95e0fdf9e8c08d5030ba6f8de255f0bd9b7055 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Sep 2009 12:50:58 +0000 Subject: [PATCH] * Simplified the X server directory structure: x11/xserver/* -> x11/. svn path=/nixos/trunk/; revision=17005 --- modules/module-list.nix | 42 +++++++++---------- .../desktop-managers/default.nix | 0 .../{xserver => }/desktop-managers/gnome.nix | 0 .../desktop-managers/kde-environment.nix | 0 .../{xserver => }/desktop-managers/kde.nix | 0 .../{xserver => }/desktop-managers/kde4.nix | 0 .../{xserver => }/desktop-managers/none.nix | 0 .../{xserver => }/desktop-managers/xterm.nix | 0 .../display-managers/default.nix | 0 .../{xserver => }/display-managers/kdm.nix | 0 .../{xserver => }/display-managers/slim.nix | 0 .../x11/{xserver => }/hardware/synaptics.nix | 0 .../x11/{xserver => }/hardware/wacom.nix | 0 .../{xserver => }/window-managers/compiz.nix | 0 .../{xserver => }/window-managers/default.nix | 0 .../x11/{xserver => }/window-managers/kwm.nix | 0 .../window-managers/metacity.nix | 0 .../{xserver => }/window-managers/none.nix | 0 .../x11/{xserver => }/window-managers/twm.nix | 0 .../{xserver => }/window-managers/wmii.nix | 0 .../{xserver => }/window-managers/xmonad.nix | 0 .../x11/{xserver/default.nix => xserver.nix} | 0 22 files changed, 21 insertions(+), 21 deletions(-) rename modules/services/x11/{xserver => }/desktop-managers/default.nix (100%) rename modules/services/x11/{xserver => }/desktop-managers/gnome.nix (100%) rename modules/services/x11/{xserver => }/desktop-managers/kde-environment.nix (100%) rename modules/services/x11/{xserver => }/desktop-managers/kde.nix (100%) rename modules/services/x11/{xserver => }/desktop-managers/kde4.nix (100%) rename modules/services/x11/{xserver => }/desktop-managers/none.nix (100%) rename modules/services/x11/{xserver => }/desktop-managers/xterm.nix (100%) rename modules/services/x11/{xserver => }/display-managers/default.nix (100%) rename modules/services/x11/{xserver => }/display-managers/kdm.nix (100%) rename modules/services/x11/{xserver => }/display-managers/slim.nix (100%) rename modules/services/x11/{xserver => }/hardware/synaptics.nix (100%) rename modules/services/x11/{xserver => }/hardware/wacom.nix (100%) rename modules/services/x11/{xserver => }/window-managers/compiz.nix (100%) rename modules/services/x11/{xserver => }/window-managers/default.nix (100%) rename modules/services/x11/{xserver => }/window-managers/kwm.nix (100%) rename modules/services/x11/{xserver => }/window-managers/metacity.nix (100%) rename modules/services/x11/{xserver => }/window-managers/none.nix (100%) rename modules/services/x11/{xserver => }/window-managers/twm.nix (100%) rename modules/services/x11/{xserver => }/window-managers/wmii.nix (100%) rename modules/services/x11/{xserver => }/window-managers/xmonad.nix (100%) rename modules/services/x11/{xserver/default.nix => xserver.nix} (100%) diff --git a/modules/module-list.nix b/modules/module-list.nix index e49a9b3631c..d44d15c09e4 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -84,28 +84,28 @@ ./services/web-servers/apache-httpd/default.nix ./services/web-servers/jboss.nix ./services/web-servers/tomcat.nix + ./services/x11/desktop-managers/default.nix + ./services/x11/desktop-managers/gnome.nix + ./services/x11/desktop-managers/kde-environment.nix + ./services/x11/desktop-managers/kde.nix + ./services/x11/desktop-managers/kde4.nix + ./services/x11/desktop-managers/none.nix + ./services/x11/desktop-managers/xterm.nix + ./services/x11/display-managers/default.nix + ./services/x11/display-managers/kdm.nix + ./services/x11/display-managers/slim.nix + ./services/x11/hardware/synaptics.nix + ./services/x11/hardware/wacom.nix + ./services/x11/window-managers/compiz.nix + ./services/x11/window-managers/default.nix + ./services/x11/window-managers/kwm.nix + ./services/x11/window-managers/metacity.nix + ./services/x11/window-managers/none.nix + ./services/x11/window-managers/twm.nix + ./services/x11/window-managers/wmii.nix + ./services/x11/window-managers/xmonad.nix ./services/x11/xfs.nix - ./services/x11/xserver/default.nix - ./services/x11/xserver/desktop-managers/default.nix - ./services/x11/xserver/desktop-managers/gnome.nix - ./services/x11/xserver/desktop-managers/kde-environment.nix - ./services/x11/xserver/desktop-managers/kde.nix - ./services/x11/xserver/desktop-managers/kde4.nix - ./services/x11/xserver/desktop-managers/none.nix - ./services/x11/xserver/desktop-managers/xterm.nix - ./services/x11/xserver/display-managers/default.nix - ./services/x11/xserver/display-managers/kdm.nix - ./services/x11/xserver/display-managers/slim.nix - ./services/x11/xserver/hardware/synaptics.nix - ./services/x11/xserver/hardware/wacom.nix - ./services/x11/xserver/window-managers/compiz.nix - ./services/x11/xserver/window-managers/default.nix - ./services/x11/xserver/window-managers/kwm.nix - ./services/x11/xserver/window-managers/metacity.nix - ./services/x11/xserver/window-managers/none.nix - ./services/x11/xserver/window-managers/twm.nix - ./services/x11/xserver/window-managers/wmii.nix - ./services/x11/xserver/window-managers/xmonad.nix + ./services/x11/xserver.nix ./system/activation/activation-script.nix ./system/activation/top-level.nix ./system/boot/kernel.nix diff --git a/modules/services/x11/xserver/desktop-managers/default.nix b/modules/services/x11/desktop-managers/default.nix similarity index 100% rename from modules/services/x11/xserver/desktop-managers/default.nix rename to modules/services/x11/desktop-managers/default.nix diff --git a/modules/services/x11/xserver/desktop-managers/gnome.nix b/modules/services/x11/desktop-managers/gnome.nix similarity index 100% rename from modules/services/x11/xserver/desktop-managers/gnome.nix rename to modules/services/x11/desktop-managers/gnome.nix diff --git a/modules/services/x11/xserver/desktop-managers/kde-environment.nix b/modules/services/x11/desktop-managers/kde-environment.nix similarity index 100% rename from modules/services/x11/xserver/desktop-managers/kde-environment.nix rename to modules/services/x11/desktop-managers/kde-environment.nix diff --git a/modules/services/x11/xserver/desktop-managers/kde.nix b/modules/services/x11/desktop-managers/kde.nix similarity index 100% rename from modules/services/x11/xserver/desktop-managers/kde.nix rename to modules/services/x11/desktop-managers/kde.nix diff --git a/modules/services/x11/xserver/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix similarity index 100% rename from modules/services/x11/xserver/desktop-managers/kde4.nix rename to modules/services/x11/desktop-managers/kde4.nix diff --git a/modules/services/x11/xserver/desktop-managers/none.nix b/modules/services/x11/desktop-managers/none.nix similarity index 100% rename from modules/services/x11/xserver/desktop-managers/none.nix rename to modules/services/x11/desktop-managers/none.nix diff --git a/modules/services/x11/xserver/desktop-managers/xterm.nix b/modules/services/x11/desktop-managers/xterm.nix similarity index 100% rename from modules/services/x11/xserver/desktop-managers/xterm.nix rename to modules/services/x11/desktop-managers/xterm.nix diff --git a/modules/services/x11/xserver/display-managers/default.nix b/modules/services/x11/display-managers/default.nix similarity index 100% rename from modules/services/x11/xserver/display-managers/default.nix rename to modules/services/x11/display-managers/default.nix diff --git a/modules/services/x11/xserver/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix similarity index 100% rename from modules/services/x11/xserver/display-managers/kdm.nix rename to modules/services/x11/display-managers/kdm.nix diff --git a/modules/services/x11/xserver/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix similarity index 100% rename from modules/services/x11/xserver/display-managers/slim.nix rename to modules/services/x11/display-managers/slim.nix diff --git a/modules/services/x11/xserver/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix similarity index 100% rename from modules/services/x11/xserver/hardware/synaptics.nix rename to modules/services/x11/hardware/synaptics.nix diff --git a/modules/services/x11/xserver/hardware/wacom.nix b/modules/services/x11/hardware/wacom.nix similarity index 100% rename from modules/services/x11/xserver/hardware/wacom.nix rename to modules/services/x11/hardware/wacom.nix diff --git a/modules/services/x11/xserver/window-managers/compiz.nix b/modules/services/x11/window-managers/compiz.nix similarity index 100% rename from modules/services/x11/xserver/window-managers/compiz.nix rename to modules/services/x11/window-managers/compiz.nix diff --git a/modules/services/x11/xserver/window-managers/default.nix b/modules/services/x11/window-managers/default.nix similarity index 100% rename from modules/services/x11/xserver/window-managers/default.nix rename to modules/services/x11/window-managers/default.nix diff --git a/modules/services/x11/xserver/window-managers/kwm.nix b/modules/services/x11/window-managers/kwm.nix similarity index 100% rename from modules/services/x11/xserver/window-managers/kwm.nix rename to modules/services/x11/window-managers/kwm.nix diff --git a/modules/services/x11/xserver/window-managers/metacity.nix b/modules/services/x11/window-managers/metacity.nix similarity index 100% rename from modules/services/x11/xserver/window-managers/metacity.nix rename to modules/services/x11/window-managers/metacity.nix diff --git a/modules/services/x11/xserver/window-managers/none.nix b/modules/services/x11/window-managers/none.nix similarity index 100% rename from modules/services/x11/xserver/window-managers/none.nix rename to modules/services/x11/window-managers/none.nix diff --git a/modules/services/x11/xserver/window-managers/twm.nix b/modules/services/x11/window-managers/twm.nix similarity index 100% rename from modules/services/x11/xserver/window-managers/twm.nix rename to modules/services/x11/window-managers/twm.nix diff --git a/modules/services/x11/xserver/window-managers/wmii.nix b/modules/services/x11/window-managers/wmii.nix similarity index 100% rename from modules/services/x11/xserver/window-managers/wmii.nix rename to modules/services/x11/window-managers/wmii.nix diff --git a/modules/services/x11/xserver/window-managers/xmonad.nix b/modules/services/x11/window-managers/xmonad.nix similarity index 100% rename from modules/services/x11/xserver/window-managers/xmonad.nix rename to modules/services/x11/window-managers/xmonad.nix diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver.nix similarity index 100% rename from modules/services/x11/xserver/default.nix rename to modules/services/x11/xserver.nix