mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-21 20:58:41 +03:00
* Allow metacity as the window manager.
svn path=/nixos/trunk/; revision=8119
This commit is contained in:
parent
f948c10999
commit
8960f038dd
@ -481,6 +481,17 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
{
|
||||||
|
name = ["services" "xserver" "windowManager"];
|
||||||
|
default = "metacity";
|
||||||
|
description = "
|
||||||
|
This option selects the window manager. Available values are
|
||||||
|
<literal>twm</literal> (extremely primitive),
|
||||||
|
<literal>metacity</literal>, and <literal>compiz</literal>.
|
||||||
|
";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
{
|
{
|
||||||
name = ["services" "httpd" "enable"];
|
name = ["services" "httpd" "enable"];
|
||||||
default = false;
|
default = false;
|
||||||
|
@ -120,6 +120,7 @@ import ../upstart-jobs/gather.nix {
|
|||||||
(import ../upstart-jobs/xserver.nix {
|
(import ../upstart-jobs/xserver.nix {
|
||||||
inherit config;
|
inherit config;
|
||||||
inherit (pkgs) stdenv writeText lib xterm slim xorg mesa;
|
inherit (pkgs) stdenv writeText lib xterm slim xorg mesa;
|
||||||
|
inherit (pkgs.gnome) metacity;
|
||||||
fontDirectories = import ./fonts.nix {inherit pkgs;};
|
fontDirectories = import ./fonts.nix {inherit pkgs;};
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, writeText, lib, xorg, mesa, xterm, slim
|
{ stdenv, writeText, lib, xorg, mesa, xterm, slim, metacity
|
||||||
|
|
||||||
, config
|
, config
|
||||||
|
|
||||||
@ -24,6 +24,8 @@ let
|
|||||||
|
|
||||||
resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (getCfg "resolutions");
|
resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (getCfg "resolutions");
|
||||||
|
|
||||||
|
windowManager = getCfg "windowManager";
|
||||||
|
|
||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
xorg.xorgserver
|
xorg.xorgserver
|
||||||
@ -63,7 +65,11 @@ let
|
|||||||
|
|
||||||
|
|
||||||
clientScript = writeText "xclient" "
|
clientScript = writeText "xclient" "
|
||||||
|
${if windowManager == "twm" then "
|
||||||
${xorg.twm}/bin/twm &
|
${xorg.twm}/bin/twm &
|
||||||
|
" else if windowManager == "metacity" then "
|
||||||
|
${metacity}/bin/metacity &
|
||||||
|
" else abort ("unknown window manager "+ windowManager)}
|
||||||
${xterm}/bin/xterm -ls
|
${xterm}/bin/xterm -ls
|
||||||
";
|
";
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user