Zynh0722/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

umu: nullpkgs :(

Browse source
This commit is contained in:
Zynh Ludwig 2025-01-03 22:15:21 -08:00
parent e404fb073c
commit 6bd0e4c50b
5 changed files with 344 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
builders.nix
View file

@ -12,6 +12,22 @@ let
inputs.zdwl.overlays.default
(final: prev: (
let
umu-launcher = inputs.nullpkgs.packages.${prev.system}.umu-launcher;
in
{
inherit umu-launcher;
# FIXME: Hatch build failure
# https://github.com/NixOS/nixpkgs/issues/366359
hatch = prev.hatch.overridePythonAttrs { doCheck = false; };
# FIXME: https://github.com/NixOS/nixpkgs/pull/369259
star-citizen = inputs.nix-gaming.packages.${prev.system}.star-citizen.override { umu = umu-launcher; };
}
))
(final: prev: {
tmux = prev.tmux.overrideAttrs (old: rec {
version = "3.5";

325
flake.lock
View file

@ -20,6 +20,27 @@
"url": "https://git.zynh.me/Zynh0722/backgrounds"
}
},
"bluetui": {
"inputs": {
"nixpkgs": [
"nullpkgs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1734856983,
"narHash": "sha256-3go5y+ueUjDKuOE2XZK159qfTpSQLYUsgppj28Mh/u4=",
"owner": "pythops",
"repo": "bluetui",
"rev": "0bc5bc2d06c690664cb61d8a861815555111e18d",
"type": "github"
},
"original": {
"owner": "pythops",
"repo": "bluetui",
"type": "github"
}
},
"chaotic": {
"inputs": {
"flake-schemas": "flake-schemas",
@ -65,6 +86,19 @@
"type": "github"
}
},
"discord-tarball": {
"flake": false,
"locked": {
"lastModified": 1734459622,
"narHash": "sha256-Qlos8S8amL3iDelNK57M00tl3obfEI9tO7q+3ljgbMc=",
"type": "tarball",
"url": "https://discord.com/api/download?platform=linux&format=tar.gz"
},
"original": {
"type": "tarball",
"url": "https://discord.com/api/download?platform=linux&format=tar.gz"
}
},
"dunst-theme": {
"flake": false,
"locked": {
@ -145,6 +179,21 @@
"type": "github"
}
},
"flake-compat_4": {
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@ -206,6 +255,27 @@
}
},
"flake-parts_4": {
"inputs": {
"nixpkgs-lib": [
"nullpkgs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1735774679,
"narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_5": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
@ -223,6 +293,21 @@
"type": "github"
}
},
"flake-root": {
"locked": {
"lastModified": 1723604017,
"narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=",
"owner": "srid",
"repo": "flake-root",
"rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"flake-schemas": {
"locked": {
"lastModified": 1721999734,
@ -255,6 +340,24 @@
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
@ -539,6 +642,28 @@
"type": "github"
}
},
"nix-alien": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_2",
"nix-filter": "nix-filter",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1734239219,
"narHash": "sha256-iKY/OGNANXpd9hXBGfx8vObpHW4IcOH0MrerLCCc7hA=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "a266d0f74dd4a82ec6a72b02fbf3fbc5f7105f15",
"type": "github"
},
"original": {
"owner": "thiagokokada",
"repo": "nix-alien",
"type": "github"
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
@ -559,6 +684,21 @@
"type": "github"
}
},
"nix-filter": {
"locked": {
"lastModified": 1731533336,
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts_3",
@ -602,6 +742,55 @@
"type": "github"
}
},
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nullpkgs",
"nix-alien",
"nixpkgs"
]
},
"locked": {
"lastModified": 1734234111,
"narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nixd": {
"inputs": {
"flake-parts": [
"nullpkgs",
"flake-parts"
],
"flake-root": "flake-root",
"nixpkgs": [
"nullpkgs",
"nixpkgs"
],
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1735752858,
"narHash": "sha256-YzrT9iIODyf96XLhgDi2ESKvrl1v7iNhMqMdNjTTSW4=",
"owner": "nix-community",
"repo": "nixd",
"rev": "17b7dfd1b4a888ded1bbf875b7601e40f43f94e8",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixd",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1734649271,
@ -706,6 +895,65 @@
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1733940404,
"narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nullpkgs": {
"inputs": {
"bluetui": "bluetui",
"discord-tarball": "discord-tarball",
"flake-parts": "flake-parts_4",
"nix-alien": "nix-alien",
"nixd": "nixd",
"nixpkgs": [
"nixpkgs"
],
"pkgs-by-name-for-flake-parts": "pkgs-by-name-for-flake-parts",
"rust-overlay": "rust-overlay",
"vencord-git": "vencord-git"
},
"locked": {
"lastModified": 1735968455,
"narHash": "sha256-syIuJV8B9Wws5cBvKei409GqEjF8e+uwVM0jv080exA=",
"ref": "refs/heads/main",
"rev": "c0cb460202ce3442d2749f9c530279f7209b4174",
"revCount": 46,
"type": "git",
"url": "https://git.nullcube.net/nullcube/nullpkgs"
},
"original": {
"type": "git",
"url": "https://git.nullcube.net/nullcube/nullpkgs"
}
},
"pkgs-by-name-for-flake-parts": {
"locked": {
"lastModified": 1727519927,
"narHash": "sha256-3SNX6BuaisoX9PKYI+fh3geZ3jBgKKkAtHcWuHRU0+o=",
"owner": "drupol",
"repo": "pkgs-by-name-for-flake-parts",
"rev": "91debb07d81ff25b8e3b48914b6abd6f11dc26e2",
"type": "github"
},
"original": {
"owner": "drupol",
"repo": "pkgs-by-name-for-flake-parts",
"type": "github"
}
},
"repo-clone": {
"locked": {
"lastModified": 1722509718,
@ -735,6 +983,7 @@
"nix-darwin": "nix-darwin",
"nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_3",
"nullpkgs": "nullpkgs",
"repo-clone": "repo-clone",
"sops-nix": "sops-nix",
"umu": "umu_2",
@ -742,6 +991,27 @@
"zdwm": "zdwm"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"nullpkgs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1735957590,
"narHash": "sha256-vbkoQTInunSjwx9DKebbCNBq9bim8CRj1VbS4eiABfg=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "d40e15e076bcedc5bf5498a0f8ff5f18de4bf8c3",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": [
@ -792,6 +1062,21 @@
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@ -813,6 +1098,28 @@
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nullpkgs",
"nixd",
"nixpkgs"
]
},
"locked": {
"lastModified": 1734704479,
"narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"umu": {
"inputs": {
"nixpkgs": [
@ -880,6 +1187,22 @@
"type": "github"
}
},
"vencord-git": {
"flake": false,
"locked": {
"lastModified": 1735525702,
"narHash": "sha256-S49O3ph0HMUAkqhAhoviaF2vpc1h1pVX/78mn/PafH4=",
"owner": "Vendicated",
"repo": "Vencord",
"rev": "0fd76ab15a51a8426786b696d422f59bd1250099",
"type": "github"
},
"original": {
"owner": "Vendicated",
"repo": "Vencord",
"type": "github"
}
},
"xwayland-satellite-stable": {
"flake": false,
"locked": {
@ -915,7 +1238,7 @@
},
"zdwl": {
"inputs": {
"flake-parts": "flake-parts_4",
"flake-parts": "flake-parts_5",
"nixpkgs": [
"nixpkgs"
]

2
flake.nix
View file

@ -21,6 +21,8 @@
backgrounds = { url = "git+https://git.zynh.me/Zynh0722/backgrounds"; inputs.nixpkgs.follows = "nixpkgs"; };
umu = { url = "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; };
nullpkgs = { url = "git+https://git.nullcube.net/nullcube/nullpkgs"; inputs.nixpkgs.follows = "nixpkgs"; };
deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; };
};

3
home/modules/lutris.nix
View file

@ -10,8 +10,7 @@ in
config = lib.mkIf cfg.enable {
home.packages = [
(inputs.umu.packages.${pkgs.system}.umu.override
{ version = "${inputs.umu.shortRev}"; })
pkgs.umu-launcher
pkgs.lutris
];

2
modules/star-citizen.nix
View file

@ -15,7 +15,7 @@ in
};
environment.systemPackages = [
(inputs.nix-gaming.packages.${pkgs.system}.star-citizen.override {
(pkgs.star-citizen.override {
useUmu = true;
location = "/data/star-citizen";
})