From 12f5aa330c95db39a120b44c90744add6a7fe336 Mon Sep 17 00:00:00 2001 From: insert Date: Sun, 5 May 2024 16:52:37 +0000 Subject: [PATCH] revert c748ff86081786c76f0ed771d9ba88e78fd79eb0 revert add hacky method to fix sunshine REMOVE NEXT FLAKE UPDATE --- flake.lock | 19 +------------------ flake.nix | 3 +-- special/insertpclinux.nix | 9 +-------- 3 files changed, 3 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 86254c4..3031958 100644 --- a/flake.lock +++ b/flake.lock @@ -261,24 +261,7 @@ "flatpaks": "flatpaks", "home-manager": "home-manager_2", "hyprland": "hyprland", - "nixpkgs": "nixpkgs", - "sunshine": "sunshine" - } - }, - "sunshine": { - "locked": { - "lastModified": 1714035204, - "narHash": "sha256-4ESBKQzr7Ngs2ryhc9/BlfO3qgkYRQOEn0xE6WdFH50=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "13e6ece4709970e8f36f2713366ee9902e6ef137", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "13e6ece4709970e8f36f2713366ee9902e6ef137", - "type": "github" + "nixpkgs": "nixpkgs" } }, "systems": { diff --git a/flake.nix b/flake.nix index 58c9e3b..c5df7d8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ inputs = { # ... nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - sunshine.url = "github:NixOS/nixpkgs/13e6ece4709970e8f36f2713366ee9902e6ef137"; flatpaks.url = "github:GermanBread/declarative-flatpak/dev"; flatpaks.inputs.nixpkgs.follows = "nixpkgs"; hyprland.url = "github:hyprwm/Hyprland"; @@ -15,7 +14,7 @@ }; }; - outputs = { nixpkgs, sunshine, flatpaks, agenix, home-manager, ... } @ inputs: { + outputs = { nixpkgs, flatpaks, agenix, home-manager, ... } @ inputs: { nixosConfigurations.insertpclinux = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; modules = [ diff --git a/special/insertpclinux.nix b/special/insertpclinux.nix index 6a3ef3b..13a307a 100644 --- a/special/insertpclinux.nix +++ b/special/insertpclinux.nix @@ -13,18 +13,11 @@ # })) ]; #boot.kernelPackages = pkgs.linuxPackages; - nixpkgs.overlays = [ (self: super: (let - patched_pkgs = import inputs.sunshine { - inherit (self) system; - }; - in { - services.sunshine = { - package = patched.sunshine; + services.sunshine = { enable = true; autoStart = true; capSysAdmin = true; }; - })) ]; hardware.nvidia = {