From a8b3e5e86031a2edb3a6e5acd8d0e4adbc89e712 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Tue, 23 Apr 2024 16:31:37 +0200
Subject: [PATCH] sunshine: It's in nixos now

---
 flake.lock                      | 25 -------------------------
 flake.nix                       | 14 +++++++-------
 lib/default.nix                 |  2 +-
 machines/loki/configuration.nix | 11 ++---------
 4 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/flake.lock b/flake.lock
index add9feb..034f89c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -876,7 +876,6 @@
         "pre-commit-hooks": "pre-commit-hooks",
         "rust-overlay": "rust-overlay_2",
         "sops": "sops",
-        "sunshine": "sunshine",
         "treefmt-nix": "treefmt-nix"
       }
     },
@@ -981,30 +980,6 @@
         "type": "github"
       }
     },
-    "sunshine": {
-      "inputs": {
-        "flake-parts": [
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1705261503,
-        "narHash": "sha256-88kkBSwPjdGLY5U4q5rD0IjxRQ8Si1QaqeI00Z2Fib4=",
-        "ref": "main",
-        "rev": "223fb72217b97ed13248713b5825b234023eed83",
-        "revCount": 13,
-        "type": "git",
-        "url": "https://git.datarift.nl/erwin/sunshine.git"
-      },
-      "original": {
-        "ref": "main",
-        "type": "git",
-        "url": "https://git.datarift.nl/erwin/sunshine.git"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index ef69971..4c71711 100644
--- a/flake.nix
+++ b/flake.nix
@@ -142,13 +142,13 @@
       };
     };
 
-    sunshine = {
-      url = "git+https://git.datarift.nl/erwin/sunshine.git?ref=main";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-parts.follows = "flake-parts";
-      };
-    };
+    # sunshine = {
+    #   url = "git+https://git.datarift.nl/erwin/sunshine.git?ref=main";
+    #   inputs = {
+    #     nixpkgs.follows = "nixpkgs";
+    #     flake-parts.follows = "flake-parts";
+    #   };
+    # };
 
     git-fs-monitor = {
       url = "git+https://git.datarift.nl/erwin/git-fs-monitor.git?ref=main";
diff --git a/lib/default.nix b/lib/default.nix
index e29ac0c..d2f8356 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -56,6 +56,6 @@ rec {
       inputs.home-manager.nixosModules.home-manager
 
       inputs.sops.nixosModules.sops
-      inputs.sunshine.nixosModules.sunshine
+      # inputs.sunshine.nixosModules.sunshine
     ];
 }
diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix
index 9d772b6..2dabcf7 100644
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@@ -172,9 +172,6 @@
         # SteamLink
         27036
         27037
-
-        # Sunshine
-        48010
       ];
 
       allowedUDPPorts = [
@@ -195,11 +192,6 @@
       ];
 
       allowedTCPPortRanges = [
-        # Sunshine
-        {
-          from = 47984;
-          to = 47990;
-        }
         # Sonos / noson
         {
           from = 1400;
@@ -378,7 +370,8 @@
     teamviewer.enable = true;
     sunshine = {
       enable = true;
-      user = "erwin";
+      capSysAdmin = true;
+      # user = "erwin";
       openFirewall = true;
     };
     nfs.server = {