From caf9f559390ac1eee78c9f5f7336fb7dc5290e14 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Thu, 4 May 2023 20:07:43 -0400
Subject: [PATCH] prismlauncher borked

---
 flake.lock                       | 48 ++++++++++++++++----------------
 systems/game-laptop/default.nix  |  3 +-
 systems/gerg-desktop/default.nix |  8 +++++-
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index d4413a1..f45e1fc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682299489,
-        "narHash": "sha256-bqHo0/82KB+IyBMyjBd6QdyZWJl/YZeGggjBsAgRFlY=",
+        "lastModified": 1683188822,
+        "narHash": "sha256-ZE+/n31vB5dRRt9qQI0x1MBjbu6c+SZLOxCq4gXus14=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "8ab9e5609929379ab15f03fd3bdc1f85419e5a3a",
+        "rev": "081f86329ca1bb4cff31b48b165db8aabe736500",
         "type": "github"
       },
       "original": {
@@ -141,11 +141,11 @@
     },
     "master": {
       "locked": {
-        "lastModified": 1682651240,
-        "narHash": "sha256-l9V0ViPf1Vhq14Vv7QQGeLrDceqdAZKZTrTU2puDZe4=",
+        "lastModified": 1683243893,
+        "narHash": "sha256-OfHwcjJy5pm99/BFVl/kKK/TIDCG9fqzOgG45gPWmVU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "35ef6d71d18e1a0426781375e1c425d5bad4412f",
+        "rev": "d7382229070c6b93d16d40dcb2f57b75af9ac65f",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682332772,
-        "narHash": "sha256-GMoWhChQdeNM2FFqVbEZgBABSdi/+JgSP6v+jUz5b24=",
+        "lastModified": 1683189539,
+        "narHash": "sha256-dqeE6PM1SSNCB9BSBgh/9dJPLn3sf7P4uay8/CymMlQ=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "d774aeedc0685e5871be1e1ee0511900deeb21c2",
+        "rev": "104ca15b0019bf461639050daeaa18e25642ccee",
         "type": "github"
       },
       "original": {
@@ -274,11 +274,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1682173319,
-        "narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=",
+        "lastModified": 1682817260,
+        "narHash": "sha256-kFMXzKNj4d/0Iqbm5l57rHSLyUeyCLMuvlROZIuuhvk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c",
+        "rev": "db1e4eeb0f9a9028bcb920e00abbc1409dd3ef36",
         "type": "github"
       },
       "original": {
@@ -297,11 +297,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682651256,
-        "narHash": "sha256-mByjRdt4iq5Dh5wnpEM+3+LW6zB4JV8SJfgD4FMnVMw=",
+        "lastModified": 1683064038,
+        "narHash": "sha256-XXNmm/eKfuGCAwSoZ5WJDHbI9mCYhgpnP+JsKMRJH4Q=",
         "owner": "Gerg-L",
         "repo": "nvim-flake",
-        "rev": "a0a27c2960534748fc0673f19d2f20307f977fa6",
+        "rev": "0b2653e59a06837e0065079f7be64d8ea124bdd9",
         "type": "github"
       },
       "original": {
@@ -334,11 +334,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1682539132,
-        "narHash": "sha256-djX/Vp1snR1XHyk400HKCfwWVoLBE8uiQalTXMH7Kj0=",
+        "lastModified": 1682823324,
+        "narHash": "sha256-KNu3OAqVyoKwnDP+gqptjQYCnZXxEwXccR89c0r1/8k=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "4a330ead6a990365c9bb48f30523ac048fb6d8ae",
+        "rev": "4f308f76633f81253a12b80e7b05b80d325005b2",
         "type": "github"
       },
       "original": {
@@ -387,11 +387,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1682538316,
-        "narHash": "sha256-YuHgVsR7S9zxJWHo7lo2ugd+uDC4ESWg1hA4bEZQv3Y=",
+        "lastModified": 1683207485,
+        "narHash": "sha256-gs+PHt/y/XQB7S8+YyBLAM8LjgYpPZUVFQBwpFSmJro=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "15b75800dce80225b44f067c9012b09de37dfad2",
+        "rev": "cc45a3f8c98e1c33ca996e3504adefbf660a72d1",
         "type": "github"
       },
       "original": {
@@ -453,11 +453,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1682526928,
-        "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=",
+        "lastModified": 1683014792,
+        "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891",
+        "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42",
         "type": "github"
       },
       "original": {
diff --git a/systems/game-laptop/default.nix b/systems/game-laptop/default.nix
index d6878ec..1467138 100644
--- a/systems/game-laptop/default.nix
+++ b/systems/game-laptop/default.nix
@@ -1,4 +1,4 @@
-_: {
+inputs: {
   pkgs,
   config,
   ...
@@ -27,6 +27,7 @@ _: {
       pkgs.heroic
       pkgs.legendary-gl
       pkgs.prismlauncher
+      inputs.master.legacyPackages.${pkgs.system}.prismlauncher
       pkgs.pcmanfm #file manager
       pkgs.librewolf #best browser
       pkgs.obs-studio
diff --git a/systems/gerg-desktop/default.nix b/systems/gerg-desktop/default.nix
index 1168e9d..9c5052f 100644
--- a/systems/gerg-desktop/default.nix
+++ b/systems/gerg-desktop/default.nix
@@ -35,6 +35,7 @@ inputs: {
       "nvidia-x11"
       "steam"
       "steam-original"
+      "discord"
     ];
 
     overlays = [
@@ -65,7 +66,12 @@ inputs: {
           wrapProgram "$out/bin/webcord" --run  'rm -f $HOME/.config/WebCord/windowState.json'
         '';
       })
-      pkgs.prismlauncher
+      inputs.master.legacyPackages.${pkgs.system}.prismlauncher
+      #pkgs.prismlauncher
+      (pkgs.discord.override {
+        withOpenASAR = true;
+        nss = pkgs.nss_latest;
+      })
     ];
     etc = {
       "jdks/17".source = pkgs.openjdk17 + /bin;