From 2a10419d95125ed86b8fbfbc986cca98bb42ea65 Mon Sep 17 00:00:00 2001 From: twoneis Date: Wed, 20 Dec 2023 02:35:40 +0100 Subject: [PATCH] r2modman for lethal company --- flake.lock | 38 ---------------------------------- modules/home/games/default.nix | 1 + modules/system/default.nix | 9 +++++--- 3 files changed, 7 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index b0f9a00..3608093 100644 --- a/flake.lock +++ b/flake.lock @@ -20,43 +20,6 @@ "type": "github" } }, - "niri": { - "inputs": { - "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703000056, - "narHash": "sha256-d4LrEmhj9w26SknUadcIM7Y1rllMxArKdFCyspADBn4=", - "owner": "twoneis", - "repo": "niri", - "rev": "fa2a60977e8d96738cd96a532244798028282eb7", - "type": "github" - }, - "original": { - "owner": "twoneis", - "ref": "nixify", - "repo": "niri", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1701697642, - "narHash": "sha256-L217WytWZHSY8GW9Gx1A64OnNctbuDbfslaTEofXXRw=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "c843418ecfd0344ecb85844b082ff5675e02c443", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1702453208, @@ -107,7 +70,6 @@ "root": { "inputs": { "home-manager": "home-manager", - "niri": "niri", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nur": "nur" diff --git a/modules/home/games/default.nix b/modules/home/games/default.nix index 559dc76..a0764f6 100644 --- a/modules/home/games/default.nix +++ b/modules/home/games/default.nix @@ -4,5 +4,6 @@ prismlauncher-qt5 lutris winePackages.stagingFull + r2modman ]; } diff --git a/modules/system/default.nix b/modules/system/default.nix index 9ffe4ad..ef1f169 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -8,6 +8,12 @@ ../virt ]; + # Allow packages from nixpkgs + nixpks.config = { + permittedInsecurePackages = ["electron-25.9.0"]; # Used for r2modman + allowUnfree = true; + }; + #Optimise nix store nix = { optimise.automatic = true; @@ -83,9 +89,6 @@ extraGroups = [ "networkmanager" "wheel" "surface-control" "docker" ]; }; - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - # Configure fonts fonts.packages = with pkgs; [ alegreya