From 6450344ae2e48cb457091cf2506f91c0ab859419 Mon Sep 17 00:00:00 2001
From: Rachel Lambda Samuelsson <depsterr@protonmail.com>
Date: Wed, 16 Oct 2024 14:33:47 +0200
Subject: [PATCH] -slippi netplay

---
 flake.lock                    | 40 +----------------------------------
 flake.nix                     |  8 +------
 home-manager/applications.nix |  1 -
 nixos/shared/graphical.nix    |  6 +-----
 4 files changed, 3 insertions(+), 52 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2ee23da..ac5b5a1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -248,45 +248,7 @@
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixprof": "nixprof",
-        "plasma-manager": "plasma-manager",
-        "ssbm-nix": "ssbm-nix"
-      }
-    },
-    "slippi-desktop": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1713234497,
-        "narHash": "sha256-UOZo3YybBldkn1McZRr0oAYEieTtjCGgcA4YqpEOyXI=",
-        "owner": "project-slippi",
-        "repo": "slippi-desktop-app",
-        "rev": "ae8bb69e235b6e46b24bc966aeaa80f45030c6f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "project-slippi",
-        "repo": "slippi-desktop-app",
-        "type": "github"
-      }
-    },
-    "ssbm-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ],
-        "slippi-desktop": "slippi-desktop"
-      },
-      "locked": {
-        "lastModified": 1716565139,
-        "narHash": "sha256-kjfc9Mg/YdY8OQU+Irm8v9iIhtgIw5qW/6VAehjW6GA=",
-        "owner": "lytedev",
-        "repo": "ssbm-nix",
-        "rev": "922b91f3f9c0dbdf2ce17921dfc07872d7d41c4b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lytedev",
-        "repo": "ssbm-nix",
-        "type": "github"
+        "plasma-manager": "plasma-manager"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index 397ff48..38c9245 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,10 +18,6 @@
       url = "github:isovector/cornelis/";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    ssbm-nix = {
-      url = "github:lytedev/ssbm-nix";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
-    };
     nixprof = {
       url = "github:Kha/nixprof";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
@@ -33,7 +29,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, agda, cornelis, ssbm-nix, plasma-manager, flake-utils, nixprof }:
+  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, agda, cornelis, plasma-manager, flake-utils, nixprof }:
     let nix-config-module =
         {
           nix.registry.nixpkgs.flake = nixpkgs;
@@ -59,7 +55,6 @@
                   agda = agda.packages.${system}.default;
                   cornelis = cornelis.packages.${system}.cornelis;
                   cornelis-vim = cornelis.packages.${system}.cornelis-vim;
-                  slippi-netplay = ssbm-nix.packages.${system}.slippi-netplay;
                   rc2nix = plasma-manager.packages.${system}.rc2nix;
                   nixprof = nixprof.packages.${system}.nixprof;
                   sax2nf = self.packages.${system}.sax2nf;
@@ -78,7 +73,6 @@
           };
           base-modules = [
             nix-config-module
-            ssbm-nix.nixosModule
             home-manager.nixosModules.home-manager
           ];
     in {
diff --git a/home-manager/applications.nix b/home-manager/applications.nix
index d16ff51..a482aaf 100644
--- a/home-manager/applications.nix
+++ b/home-manager/applications.nix
@@ -73,7 +73,6 @@
     unstable.zoom-us
     extra.sax2nf
     extra.cornelis
-    extra.slippi-netplay
     unstable.kicad
     extra.renoise
     extra.nixprof
diff --git a/nixos/shared/graphical.nix b/nixos/shared/graphical.nix
index 36d85a6..7f428d0 100644
--- a/nixos/shared/graphical.nix
+++ b/nixos/shared/graphical.nix
@@ -40,12 +40,8 @@
     enable = true;
     settings.general.renice = 20;
   };
-  nixpkgs.config.allowUnfree = true;
   programs.steam.enable = true;
-  ssbm.gcc = {
-    rules.enable = true;
-    oc-kmod.enable = true;
-  };
+  nixpkgs.config.allowUnfree = true;
 
   hardware.logitech.wireless.enable = true;
 }