* No camelCase in filenames. Also pluralise the *-manager directories

for consistency. svn path=/nixos/branches/modular-nixos/; revision=15719
15 years ago · f1fb3b45cf
parent 5ebdee3577
commit f1fb3b45cf
21 changed files with 5 additions and 5 deletions
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@ -470,9 +470,9 @@ mkIf cfg.enable {
    options

    # services.xserver.*Manager
-    ./displayManager/default.nix
-    ./windowManager/default.nix
-    ./desktopManager/default.nix
+    ./display-managers/default.nix
+    ./window-managers/default.nix
+    ./desktop-managers/default.nix

    # services.extraJobs
    # ../../upstart-jobs/default.nix
--- a/modules/services/x11/xserver/desktop-managers/default.nix
+++ b/modules/services/x11/xserver/desktop-managers/default.nix
--- a/modules/services/x11/xserver/desktop-managers/gnome.nix
+++ b/modules/services/x11/xserver/desktop-managers/gnome.nix
--- a/modules/services/x11/xserver/desktop-managers/kde-environment.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde-environment.nix
--- a/modules/services/x11/xserver/desktop-managers/kde.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde.nix
@ -23,7 +23,7 @@ mkIf cfg.enable {
    options

    # environment.kdePackages
-    ./kdeEnvironment.nix
+    ./kde-environment.nix
  ];

  services = {
--- a/modules/services/x11/xserver/desktop-managers/kde.pam
+++ b/modules/services/x11/xserver/desktop-managers/kde.pam
--- a/modules/services/x11/xserver/desktop-managers/kde4.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde4.nix
@ -23,7 +23,7 @@ mkIf cfg.enable {
    options

    # environment.kdePackages
-    ./kdeEnvironment.nix
+    ./kde-environment.nix
  ];

  services = {
--- a/modules/services/x11/xserver/desktop-managers/none.nix
+++ b/modules/services/x11/xserver/desktop-managers/none.nix
--- a/modules/services/x11/xserver/desktop-managers/xterm.nix
+++ b/modules/services/x11/xserver/desktop-managers/xterm.nix
--- a/modules/services/x11/xserver/display-managers/default.nix
+++ b/modules/services/x11/xserver/display-managers/default.nix
--- a/modules/services/x11/xserver/display-managers/kdm.nix
+++ b/modules/services/x11/xserver/display-managers/kdm.nix
--- a/modules/services/x11/xserver/display-managers/slim.nix
+++ b/modules/services/x11/xserver/display-managers/slim.nix
--- a/modules/services/x11/xserver/display-managers/slim.pam
+++ b/modules/services/x11/xserver/display-managers/slim.pam
--- a/modules/services/x11/xserver/window-managers/compiz.nix
+++ b/modules/services/x11/xserver/window-managers/compiz.nix
--- a/modules/services/x11/xserver/window-managers/default.nix
+++ b/modules/services/x11/xserver/window-managers/default.nix
--- a/modules/services/x11/xserver/window-managers/kwm.nix
+++ b/modules/services/x11/xserver/window-managers/kwm.nix
--- a/modules/services/x11/xserver/window-managers/metacity.nix
+++ b/modules/services/x11/xserver/window-managers/metacity.nix
--- a/modules/services/x11/xserver/window-managers/none.nix
+++ b/modules/services/x11/xserver/window-managers/none.nix
--- a/modules/services/x11/xserver/window-managers/twm.nix
+++ b/modules/services/x11/xserver/window-managers/twm.nix
--- a/modules/services/x11/xserver/window-managers/wmii.nix
+++ b/modules/services/x11/xserver/window-managers/wmii.nix
--- a/modules/services/x11/xserver/window-managers/xmonad.nix
+++ b/modules/services/x11/xserver/window-managers/xmonad.nix