From 2d0fcbe30ad1ceb938225801517daafd20d01a0b Mon Sep 17 00:00:00 2001 From: insert Date: Sat, 4 May 2024 14:32:49 -0400 Subject: [PATCH] Remove sunshine.nix it is now part of nixpkgs --- special/insertpclinux.nix | 8 ++++-- special/sunshine.nix | 51 --------------------------------------- 2 files changed, 6 insertions(+), 53 deletions(-) delete mode 100644 special/sunshine.nix diff --git a/special/insertpclinux.nix b/special/insertpclinux.nix index c914590..0bd5400 100644 --- a/special/insertpclinux.nix +++ b/special/insertpclinux.nix @@ -1,7 +1,6 @@ { inputs, config, lib, pkgs, ... }: { environment.etc.nixpkgs.source = inputs.nixpkgs; - imports = [ ./sunshine.nix ]; networking.hostName = "insertpclinux"; services.xserver.videoDrivers = ["nvidia"]; #nixpkgs.overlays = [ (self: super: (let @@ -14,6 +13,12 @@ # })) ]; #boot.kernelPackages = pkgs.linuxPackages; + services.sunshine = { + enable = true; + autoStart = true; + capSysAdmin = true; + }; + hardware.nvidia = { # Modesetting is needed most of the time @@ -41,7 +46,6 @@ }; virtualisation.libvirtd.enable = true; programs.virt-manager.enable = true; - services.sunshine.enable = true; security.pki.certificateFiles = [ /home/insert/Documents/nextcloud/nextcloudinternal.pem /home/insert/Documents/personal-vaultwarden/cert.pem diff --git a/special/sunshine.nix b/special/sunshine.nix deleted file mode 100644 index 5016352..0000000 --- a/special/sunshine.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ config, lib, pkgs, ... }: -#source: https://github.com/RandomNinjaAtk/nixos/blob/d2480c148e882f49e5caa6267060fd2d9e10af9b/services.sunshine.nix -#https://discourse.nixos.org/t/sunshine-self-hosted-game-stream/25608/16 - -with lib; - -let - - cfg = config.services.sunshine; - -in - -{ - options = { - - services.sunshine = { - enable = mkEnableOption (mdDoc "Sunshine"); - }; - - }; - - config = mkIf config.services.sunshine.enable { - - environment.systemPackages = [ - pkgs.sunshine - ]; - - security.wrappers.sunshine = { - owner = "root"; - group = "root"; - capabilities = "cap_sys_admin+p"; - source = "${pkgs.sunshine}/bin/sunshine"; - }; - - # Requires to simulate input - boot.kernelModules = [ "uinput" ]; - services.udev.extraRules = '' - KERNEL=="uinput", SUBSYSTEM=="misc", OPTIONS+="static_node=uinput", TAG+="uaccess" - ''; - - systemd.user.services.sunshine = - { - description = "sunshine"; - wantedBy = [ "graphical-session.target" ]; - serviceConfig = { - ExecStart = "${config.security.wrapperDir}/sunshine"; - }; - }; - - }; -}