diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-01 22:00:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-01 22:00:47 -0400 |
commit | ed073806a439243764846465382b876a668d31c9 (patch) | |
tree | 275f0bb2fc5188ef2f61b0cfa2a045868fab4f7c /nixos | |
parent | 1b6d715bdc5eea9f76dad36016c6244c6b2e4a5c (diff) | |
parent | af6d2c822c5100965d90754fab29fa45c4ff6df5 (diff) | |
download | nixlib-ed073806a439243764846465382b876a668d31c9.tar nixlib-ed073806a439243764846465382b876a668d31c9.tar.gz nixlib-ed073806a439243764846465382b876a668d31c9.tar.bz2 nixlib-ed073806a439243764846465382b876a668d31c9.tar.lz nixlib-ed073806a439243764846465382b876a668d31c9.tar.xz nixlib-ed073806a439243764846465382b876a668d31c9.tar.zst nixlib-ed073806a439243764846465382b876a668d31c9.zip |
Merge pull request #84037 from worldofpeace/remove-none.nix
nixos/none: remove
Diffstat (limited to 'nixos')
5 files changed, 2 insertions, 22 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d6f8e5849abd..855e3a2ae6e0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -907,7 +907,6 @@ ./services/x11/window-managers/icewm.nix ./services/x11/window-managers/bspwm.nix ./services/x11/window-managers/metacity.nix - ./services/x11/window-managers/none.nix ./services/x11/window-managers/twm.nix ./services/x11/window-managers/windowlab.nix ./services/x11/window-managers/wmii.nix diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index ea6aac9f6c92..981ab26cf02c 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -18,7 +18,7 @@ in # determines the default: later modules (if enabled) are preferred. # E.g., if Plasma 5 is enabled, it supersedes xterm. imports = [ - ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix + ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix ]; diff --git a/nixos/modules/services/x11/desktop-managers/none.nix b/nixos/modules/services/x11/desktop-managers/none.nix deleted file mode 100644 index af7a376ae029..000000000000 --- a/nixos/modules/services/x11/desktop-managers/none.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - services.xserver.desktopManager.session = - [ { name = "none"; - start = ""; - } - ]; -} diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 04a9fc46628c..b32dca52a735 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -35,7 +35,7 @@ in ./wmii.nix ./xmonad.nix ./qtile.nix - ./none.nix ]; + ]; options = { diff --git a/nixos/modules/services/x11/window-managers/none.nix b/nixos/modules/services/x11/window-managers/none.nix deleted file mode 100644 index 84cf1d770776..000000000000 --- a/nixos/modules/services/x11/window-managers/none.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - services = { - xserver = { - windowManager = { - session = [{ - name = "none"; - start = ""; - }]; - }; - }; - }; -} |