diff --git a/flake.lock b/flake.lock index 787802c..17dbd5f 100644 --- a/flake.lock +++ b/flake.lock @@ -130,12 +130,64 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1707268954, + "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "agda": "agda", "cornelis": "cornelis", "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "ssbm-nix": "ssbm-nix" + } + }, + "slippi-desktop": { + "flake": false, + "locked": { + "lastModified": 1707981080, + "narHash": "sha256-Qd1jLAXWvxA5SHcafgHFRs1+XYz8yXLdQ27+qZ8MYxk=", + "owner": "project-slippi", + "repo": "slippi-desktop-app", + "rev": "16ab255406f7ab86846a7786ff15e3543501397c", + "type": "github" + }, + "original": { + "owner": "project-slippi", + "repo": "slippi-desktop-app", + "type": "github" + } + }, + "ssbm-nix": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "slippi-desktop": "slippi-desktop" + }, + "locked": { + "lastModified": 1708119120, + "narHash": "sha256-SuZbD4eGwS9OYeGL0V9uPVsW2SyL7MbLXBd5rngZB4c=", + "owner": "lytedev", + "repo": "ssbm-nix", + "rev": "041f495ab6446e6edd22c1a5fbd48dd704c5b9a6", + "type": "github" + }, + "original": { + "owner": "lytedev", + "repo": "ssbm-nix", + "type": "github" } }, "systems": { diff --git a/flake.nix b/flake.nix index c8bc738..b73eac5 100644 --- a/flake.nix +++ b/flake.nix @@ -10,9 +10,10 @@ agda.inputs.nixpkgs.follows = "nixpkgs"; cornelis.url = "github:isovector/cornelis/"; cornelis.inputs.nixpkgs.follows = "nixpkgs"; + ssbm-nix.url = "github:lytedev/ssbm-nix"; }; - outputs = { self, nixpkgs, home-manager, agda, cornelis }: + outputs = { self, nixpkgs, home-manager, agda, cornelis, ssbm-nix }: let nix-config-module = { nix.registry.nixpkgs.flake = nixpkgs; @@ -30,6 +31,7 @@ agda = agda.packages.${system}.Agda; cornelis = cornelis.packages.${system}.cornelis; cornelis-vim = cornelis.packages.${system}.cornelis-vim; + slippi-netplay = ssbm-nix.packages.${system}.slippi-netplay; }; }; } @@ -40,6 +42,7 @@ system = "x86_64-linux"; modules = [ nix-config-module + ssbm-nix.nixosModule ./lambda/configuration.nix ./shared/desktop.nix home-manager.nixosModules.home-manager @@ -51,6 +54,7 @@ system = "x86_64-linux"; modules = [ nix-config-module + ssbm-nix.nixosModule ./computational/configuration.nix ./shared/desktop.nix home-manager.nixosModules.home-manager diff --git a/home/rachel.nix b/home/rachel.nix index 78d4803..638a124 100644 --- a/home/rachel.nix +++ b/home/rachel.nix @@ -1,4 +1,4 @@ -{ pkgs, cornelis, cornelis-vim, agda, ... }: +{ pkgs, cornelis, cornelis-vim, agda, slippi-netplay, ... }: let username = "rachel"; homeDir = "/home/${username}"; SAX2NF = import ../shared/sax2nf.nix { inherit pkgs; }; @@ -84,6 +84,7 @@ in rzk whalebird lean4 + slippi-netplay ]; stateVersion = "23.11"; }; diff --git a/shared/desktop.nix b/shared/desktop.nix index 35707cf..5f50139 100644 --- a/shared/desktop.nix +++ b/shared/desktop.nix @@ -115,6 +115,10 @@ settings.general.renice = 20; }; programs.steam.enable = true; + ssbm.gcc = { + rules.enable = true; + oc-kmod.enable = true; + }; # [SERVICES] services.printing.enable = true;