fix(gui): Accidentaly deleting settings
This commit is contained in:
parent
1e963ed08f
commit
519a8608fb
1 changed files with 20 additions and 18 deletions
|
@ -3,8 +3,8 @@ let
|
||||||
cfg = config.jconfig.gui;
|
cfg = config.jconfig.gui;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
config = lib.mkIf (config.jconfig.enable && cfg.enable)
|
config = lib.mkMerge [
|
||||||
{
|
(lib.mkIf (config.jconfig.enable && cfg.enable) {
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.gnome.adwaita-icon-theme
|
pkgs.gnome.adwaita-icon-theme
|
||||||
pkgs.adwaita-qt
|
pkgs.adwaita-qt
|
||||||
|
@ -56,22 +56,24 @@ in
|
||||||
hardware.opengl.enable = true;
|
hardware.opengl.enable = true;
|
||||||
hardware.uinput.enable = true;
|
hardware.uinput.enable = true;
|
||||||
hardware.steam-hardware.enable = cfg.steamHardwareSupport;
|
hardware.steam-hardware.enable = cfg.steamHardwareSupport;
|
||||||
} // lib.mkIf cfg."8bitdoFix" {
|
})
|
||||||
# Udev rules to start or stop systemd service when controller is connected or disconnected
|
(lib.mkIf cfg."8bitdoFix" {
|
||||||
services.udev.extraRules = ''
|
# Udev rules to start or stop systemd service when controller is connected or disconnected
|
||||||
# May vary depending on your controller model, find product id using 'lsusb'
|
services.udev.extraRules = ''
|
||||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3106", ATTR{manufacturer}=="8BitDo", RUN+="${pkgs.systemd}/bin/systemctl start 8bitdo-ultimate-xinput@2dc8:3106"
|
# May vary depending on your controller model, find product id using 'lsusb'
|
||||||
# This device (2dc8:3016) is "connected" when the above device disconnects
|
SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3106", ATTR{manufacturer}=="8BitDo", RUN+="${pkgs.systemd}/bin/systemctl start 8bitdo-ultimate-xinput@2dc8:3106"
|
||||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3016", ATTR{manufacturer}=="8BitDo", RUN+="${pkgs.systemd}/bin/systemctl stop 8bitdo-ultimate-xinput@2dc8:3106"
|
# This device (2dc8:3016) is "connected" when the above device disconnects
|
||||||
'';
|
SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3016", ATTR{manufacturer}=="8BitDo", RUN+="${pkgs.systemd}/bin/systemctl stop 8bitdo-ultimate-xinput@2dc8:3106"
|
||||||
|
'';
|
||||||
|
|
||||||
# Systemd service which starts xboxdrv in xbox360 mode
|
# Systemd service which starts xboxdrv in xbox360 mode
|
||||||
systemd.services."8bitdo-ultimate-xinput@" = {
|
systemd.services."8bitdo-ultimate-xinput@" = {
|
||||||
unitConfig.Description = "8BitDo Ultimate Controller XInput mode xboxdrv daemon";
|
unitConfig.Description = "8BitDo Ultimate Controller XInput mode xboxdrv daemon";
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
ExecStart = "${pkgs.xboxdrv}/bin/xboxdrv --mimic-xpad --silent --type xbox360 --device-by-id %I --force-feedback";
|
ExecStart = "${pkgs.xboxdrv}/bin/xboxdrv --mimic-xpad --silent --type xbox360 --device-by-id %I --force-feedback";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
})
|
||||||
};
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue