move windowManager.xbmc to desktopManager.xbmc
This commit is contained in:
parent
a3bf4df6e4
commit
28069d6aad
|
@ -103,6 +103,7 @@ in zipModules ([]
|
|||
++ obsolete [ "services" "sshd" "gatewayPorts" ] [ "services" "openssh" "gatewayPorts" ]
|
||||
++ obsolete [ "services" "sshd" "permitRootLogin" ] [ "services" "openssh" "permitRootLogin" ]
|
||||
++ obsolete [ "services" "xserver" "startSSHAgent" ] [ "services" "xserver" "startOpenSSHAgent" ]
|
||||
++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "xbmc" ]
|
||||
|
||||
# KDE
|
||||
++ deprecated [ "kde" "extraPackages" ] [ "environment" "kdePackages" ]
|
||||
|
|
|
@ -17,7 +17,7 @@ in
|
|||
# Note: the order in which desktop manager modules are imported here
|
||||
# determines the default: later modules (if enabled) are preferred.
|
||||
# E.g., if KDE is enabled, it supersedes xterm.
|
||||
imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./gnome3.nix ];
|
||||
imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./gnome3.nix ./xbmc.nix ];
|
||||
|
||||
options = {
|
||||
|
||||
|
|
31
nixos/modules/services/x11/desktop-managers/xbmc.nix
Normal file
31
nixos/modules/services/x11/desktop-managers/xbmc.nix
Normal file
|
@ -0,0 +1,31 @@
|
|||
{ pkgs, config, ... }:
|
||||
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
cfg = config.services.xserver.desktopManager.xbmc;
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.xserver.desktopManager.xbmc = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
example = true;
|
||||
description = "Enable the xbmc multimedia center.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.desktopManager.session = [{
|
||||
name = "xbmc";
|
||||
start = ''
|
||||
${pkgs.xbmc}/bin/xbmc --lircdev /var/run/lirc/lircd --standalone &
|
||||
waitPID=$!
|
||||
'';
|
||||
}];
|
||||
|
||||
environment.systemPackages = [ pkgs.xbmc ];
|
||||
};
|
||||
}
|
|
@ -16,7 +16,6 @@ in
|
|||
./wmii.nix
|
||||
./xmonad.nix
|
||||
./i3.nix
|
||||
./xbmc.nix
|
||||
./herbstluftwm.nix
|
||||
];
|
||||
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
{pkgs, config, ...}:
|
||||
|
||||
let
|
||||
inherit (pkgs.lib) mkOption mkIf;
|
||||
cfg = config.services.xserver.windowManager.xbmc;
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.xserver.windowManager.xbmc = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
example = true;
|
||||
description = "Enable the xbmc multimedia center.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.windowManager = {
|
||||
session = [{
|
||||
name = "xbmc";
|
||||
start = "
|
||||
${pkgs.xbmc}/bin/xbmc --lircdev /var/run/lirc/lircd --standalone &
|
||||
waitPID=$!
|
||||
";
|
||||
}];
|
||||
};
|
||||
environment.systemPackages = [ pkgs.xbmc ];
|
||||
};
|
||||
}
|
Loading…
Reference in a new issue