diff --git a/flake.lock b/flake.lock index 468baf1..760c7e1 100644 --- a/flake.lock +++ b/flake.lock @@ -64,22 +64,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -288,22 +272,6 @@ "type": "github" } }, - "libnbtplusplus": { - "flake": false, - "locked": { - "lastModified": 1650031308, - "narHash": "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4=", - "owner": "PrismLauncher", - "repo": "libnbtplusplus", - "rev": "2203af7eeb48c45398139b583615134efd8d407f", - "type": "github" - }, - "original": { - "owner": "PrismLauncher", - "repo": "libnbtplusplus", - "type": "github" - } - }, "nix-formatter-pack": { "inputs": { "nixpkgs": [ @@ -548,28 +516,6 @@ "type": "gitlab" } }, - "prismlauncher": { - "inputs": { - "flake-compat": "flake-compat", - "libnbtplusplus": "libnbtplusplus", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1677672526, - "narHash": "sha256-JgmU3g0JznT8EeFB/FJi+KRJFZXmv46BT88EgFdbVr4=", - "owner": "PrismLauncher", - "repo": "PrismLauncher", - "rev": "9f202caf9356ebaf5fd845210adea5e935d4350f", - "type": "github" - }, - "original": { - "owner": "PrismLauncher", - "repo": "PrismLauncher", - "type": "github" - } - }, "quilt-server": { "inputs": { "java": "java_2", @@ -605,7 +551,6 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", - "prismlauncher": "prismlauncher", "quilt-server": "quilt-server", "scripts": "scripts", "sops-nix": "sops-nix", @@ -738,7 +683,7 @@ }, "wsl": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index a4ebdfa..50762b0 100644 --- a/flake.nix +++ b/flake.nix @@ -33,10 +33,6 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - prismlauncher = { - url = "github:PrismLauncher/PrismLauncher"; - inputs.nixpkgs.follows = "nixpkgs"; - }; java = { url = "git+https://git.stranger.systems/nix/java"; inputs.nixpkgs.follows = "nixpkgs"; @@ -61,9 +57,8 @@ }; outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, nixos-hardware - , fenix, emacs, sops-nix, home-manager, darwin, prismlauncher, java - , quilt-server, nixos-generators, wsl, nix-on-droid, idris2, scripts - }@inputs: + , fenix, emacs, sops-nix, home-manager, darwin, java, quilt-server + , nixos-generators, wsl, nix-on-droid, idris2, scripts }@inputs: let makeNixosSystem = { system, hostName, extraModules ? [ ], ourNixpkgs ? nixpkgs }: diff --git a/modules/linux/programs/games.nix b/modules/linux/programs/games.nix index b158b57..d1d911e 100644 --- a/modules/linux/programs/games.nix +++ b/modules/linux/programs/games.nix @@ -12,15 +12,14 @@ in with lib; { enableFPS = true; }) # Prism Launcher minecraft stuff - inputs.prismlauncher.packages."${system}".prismlauncher glfw-patched gamescope ]; unstable-packages = - with inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}"; - [ + with inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}"; [ # Packwiz for maintaing modpacks packwiz + prismlauncher ]; in stable-packages ++ unstable-packages; # Install steam