switching to unstable
This commit is contained in:
parent
a7c8007c73
commit
ebadab59f6
4 changed files with 16 additions and 48 deletions
41
flake.lock
generated
41
flake.lock
generated
|
|
@ -82,11 +82,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1751468302,
|
||||
"narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=",
|
||||
"lastModified": 1751810233,
|
||||
"narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "501cfec8277f931a9c9af9f23d3105c537faeafe",
|
||||
"rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -120,11 +120,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1751767731,
|
||||
"narHash": "sha256-0tO8Dz1fE0XgqC/F2dFyqBnzfDl4+TL+AkdXS712jPQ=",
|
||||
"lastModified": 1752137032,
|
||||
"narHash": "sha256-+vIBaUg9XysV2eUTEwLAJQSSLEZHnguHCfS1SHrFYuQ=",
|
||||
"owner": "fufexan",
|
||||
"repo": "nix-gaming",
|
||||
"rev": "93eaf06673e89eb32ebc7ece1786289761cd032b",
|
||||
"rev": "7bd0cbccbb3a1c0d407b189c6b3cf1243a5c2b40",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -163,11 +163,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1751582995,
|
||||
"narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=",
|
||||
"lastModified": 1751943650,
|
||||
"narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693",
|
||||
"rev": "88983d4b665fb491861005137ce2b11a9f89f203",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -184,26 +184,9 @@
|
|||
"i3-dotfiles": "i3-dotfiles",
|
||||
"nix-gaming": "nix-gaming",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"rpcs3_latest": "rpcs3_latest",
|
||||
"unstable": "unstable"
|
||||
}
|
||||
},
|
||||
"rpcs3_latest": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1751523192,
|
||||
"narHash": "sha256-YDU8wvfonbpcAZCChzWmDSiabzOyBibFd0vkLwm6Jgw=",
|
||||
"owner": "RPCS3",
|
||||
"repo": "rpcs3",
|
||||
"rev": "46150322a3089a8f5664094e8f2d15bc1fd3594e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "RPCS3",
|
||||
"repo": "rpcs3",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
|
|
@ -221,11 +204,11 @@
|
|||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1751625545,
|
||||
"narHash": "sha256-4E7wWftF1ExK5ZEDzj41+9mVgxtuRV3wWCId7QAYMAU=",
|
||||
"lastModified": 1751949589,
|
||||
"narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c860cf0b3a0829f0f6cf344ca8de83a2bbfab428",
|
||||
"rev": "9b008d60392981ad674e04016d25619281550a9d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
13
flake.nix
13
flake.nix
|
|
@ -14,11 +14,6 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
rpcs3_latest = {
|
||||
url = "github:RPCS3/rpcs3";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
unstable = {
|
||||
url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||
};
|
||||
|
|
@ -38,7 +33,6 @@
|
|||
nixpkgs,
|
||||
home-manager,
|
||||
nix-gaming,
|
||||
rpcs3_latest,
|
||||
unstable,
|
||||
...
|
||||
} @ inputs: let
|
||||
|
|
@ -54,7 +48,6 @@
|
|||
customPkgs = import "${self}/pkgs" {
|
||||
inherit pkgs;
|
||||
lib = nixpkgs.lib;
|
||||
inherit rpcs3_latest;
|
||||
};
|
||||
in {
|
||||
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
|
||||
|
|
@ -74,15 +67,13 @@
|
|||
hostPlatform = system;
|
||||
overlays = [
|
||||
(final: prev: {ollama = unstablePkgs.ollama;})
|
||||
(final: prev: {rpcs3 = unstablePkgs.rpcs3;})
|
||||
(final: prev: {
|
||||
ghostty = inputs.ghostty.packages.${system}.default;
|
||||
})
|
||||
(final: prev: {
|
||||
inherit
|
||||
(customPkgs)
|
||||
pugixml
|
||||
SDL3
|
||||
rpcs3_latest
|
||||
clear-sans
|
||||
binary-font
|
||||
minijinja-cli
|
||||
|
|
@ -103,7 +94,7 @@
|
|||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
inherit inputs unstable;
|
||||
i3dotfiles = inputs.i3-dotfiles;
|
||||
};
|
||||
users.cobray = import ./home-manager/cobray.nix;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
ryujinx
|
||||
retroarch
|
||||
waydroid
|
||||
rpcs3_latest
|
||||
rpcs3
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,7 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
rpcs3_latest,
|
||||
}: let
|
||||
rpcs3Pkgs = pkgs.callPackage ./rpcs3 {
|
||||
inherit lib rpcs3_latest;
|
||||
};
|
||||
in {
|
||||
inherit (rpcs3Pkgs) pugixml SDL3 rpcs3_latest;
|
||||
}: {
|
||||
clear-sans = pkgs.callPackage ./clear-sans {};
|
||||
binary-font = pkgs.callPackage ./binary-font {};
|
||||
minijinja-cli = pkgs.callPackage ./minijinja-cli {};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue