Extest is in nixpkgs now, let's use that option instead
This commit is contained in:
parent
6d32697a65
commit
d11c042bc8
70
flake.lock
70
flake.lock
|
|
@ -150,41 +150,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"extest": {
|
||||
"inputs": {
|
||||
"extest": "extest_2",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1706332837,
|
||||
"narHash": "sha256-6jwCjD6hLVRkPHyl/2K+5ZEoQV3C5BgWlDroUx/9ru8=",
|
||||
"owner": "chaorace",
|
||||
"repo": "extest-nix",
|
||||
"rev": "a9dbc41a7ba6723d8598cd699bbb163630b646b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "chaorace",
|
||||
"repo": "extest-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"extest_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1703711841,
|
||||
"narHash": "sha256-ZCHOyAACYoV3wW7en374Kfj0STmi0+72INKGNQkO/rU=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "extest",
|
||||
"rev": "2a0a1f27239f6307b333a68ca7023ccf90215f3e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Supreeeme",
|
||||
"repo": "extest",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -407,7 +372,7 @@
|
|||
"jovian": {
|
||||
"inputs": {
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712296875,
|
||||
|
|
@ -429,7 +394,7 @@
|
|||
"flake-compat": "flake-compat_3",
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
|
|
@ -637,22 +602,6 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1712328247,
|
||||
"narHash": "sha256-cswxdMQH0fATfonhXgVfxliuZMfkdrCQQud4cO76eDw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8311011fcea909e0cc9684ada784dae080fbfb60",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1712122226,
|
||||
"narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=",
|
||||
|
|
@ -668,7 +617,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1711297276,
|
||||
"narHash": "sha256-KtHBr73Z729krfueBV6pUsEyq/4vILGP77DPmrKOTrI=",
|
||||
|
|
@ -684,7 +633,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1712163089,
|
||||
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
|
||||
|
|
@ -700,7 +649,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1709703039,
|
||||
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
|
||||
|
|
@ -715,7 +664,7 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1711715736,
|
||||
"narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=",
|
||||
|
|
@ -815,7 +764,6 @@
|
|||
"inputs": {
|
||||
"conduit": "conduit",
|
||||
"disko": "disko",
|
||||
"extest": "extest",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"home-manager": "home-manager",
|
||||
"jovian": "jovian",
|
||||
|
|
@ -823,7 +771,7 @@
|
|||
"linger": "linger",
|
||||
"nixos-generators": "nixos-generators",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"pihole": "pihole",
|
||||
"plasma-manager": "plasma-manager",
|
||||
|
|
@ -877,7 +825,7 @@
|
|||
"inputs": {
|
||||
"blobs": "blobs",
|
||||
"flake-compat": "flake-compat_4",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -897,7 +845,7 @@
|
|||
},
|
||||
"sops-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs-stable": "nixpkgs-stable_3"
|
||||
},
|
||||
"locked": {
|
||||
|
|
|
|||
|
|
@ -53,7 +53,6 @@
|
|||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# Fix for steam cursor not being visible under wayland
|
||||
extest.url = "github:chaorace/extest-nix";
|
||||
|
||||
# Add any other flake you might need
|
||||
# hardware.url = "github:nixos/nixos-hardware";
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@
|
|||
enable = true;
|
||||
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
||||
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
||||
extest.enable = true;
|
||||
};
|
||||
hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
nixpkgs = {
|
||||
# You can add overlays here
|
||||
overlays = [
|
||||
inputs.extest.overlays.default
|
||||
];
|
||||
# Configure your nixpkgs instance
|
||||
config = {
|
||||
|
|
@ -55,7 +54,6 @@
|
|||
alejandra
|
||||
btrfs-progs
|
||||
efitools
|
||||
extest
|
||||
git
|
||||
git-filter-repo
|
||||
home-manager
|
||||
|
|
@ -68,7 +66,6 @@
|
|||
rsync
|
||||
rustdesk
|
||||
sbctl
|
||||
steam
|
||||
udisks
|
||||
util-linux
|
||||
wget
|
||||
|
|
@ -121,9 +118,7 @@
|
|||
enable = true;
|
||||
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
||||
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
||||
package = pkgs.steam.override {
|
||||
extraProfile = ''export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD'';
|
||||
};
|
||||
extest.enable = true;
|
||||
};
|
||||
hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses
|
||||
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
# You can change versions, add patches, set compilation flags, anything really.
|
||||
# https://nixos.wiki/wiki/Overlays
|
||||
modifications = final: prev: {
|
||||
steam = prev.steam.override {
|
||||
extraProfile = ''export LD_PRELOAD=${inputs.extest}/lib/libextest.so:$LD_PRELOAD'';
|
||||
};
|
||||
# steam = prev.steam.override {
|
||||
# extraProfile = ''export LD_PRELOAD=${inputs.extest}/lib/libextest.so:$LD_PRELOAD'';
|
||||
# };
|
||||
};
|
||||
|
||||
# This one brings our custom packages from the 'pkgs' directory
|
||||
|
|
|
|||
Loading…
Reference in a new issue