diff --git a/flake.lock b/flake.lock index 9476e57..7223efc 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1760101617, - "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=", + "lastModified": 1761420899, + "narHash": "sha256-kxGCip6GNbcbNWKu4J2iKbNYfFTS8Zbjg9CWp0zmFoM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "1826a9923881320306231b1c2090379ebf9fa4f8", + "rev": "62479232aae42c1ef09c2c027c8cfd91df060897", "type": "github" }, "original": { @@ -87,11 +87,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1761553912, - "narHash": "sha256-3UOEQPBlZo9OixT9L1zoD67QheopTG8/EfRPGKyP9bg=", + "lastModified": 1762198582, + "narHash": "sha256-P9giW/1Crn7ekQt4YIbONJ/hKFaHkTwyhz82FCjh+OM=", "owner": "catppuccin", "repo": "nix", - "rev": "7b42c91911c143ae3ea32a79cc8582b5920f24e3", + "rev": "08716214674ca27914daa52e6fa809cc022b581e", "type": "github" }, "original": { @@ -110,11 +110,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1761839147, - "narHash": "sha256-DXDb6AVCRPosOkQPyvVrHpO//VXqyzS3uLWiasTuENI=", + "lastModified": 1762349714, + "narHash": "sha256-0z73K2XW9jF+6aoMFk9UbFrKVyWoAiYdOh/EteRlfvw=", "owner": "cachix", "repo": "devenv", - "rev": "bb7849648b68035f6b910120252c22b28195cf54", + "rev": "3e07f0a5885f8a4156ab353cc5c5c9652371b017", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1761893049, - "narHash": "sha256-1TtFDPhC+ZsrOOtBnry1EZC+WipTTvsOVjIEVugqji8=", + "lastModified": 1762324835, + "narHash": "sha256-OJdnrIFHKBy97Fn88//ag1QK6iuBVafrU3uAvccGNUo=", "owner": "nix-community", "repo": "fenix", - "rev": "c2ac9a5c0d6d16630c3b225b874bd14528d1abe6", + "rev": "9bfa4155d454bbe19e076a23355cff95f0a407c0", "type": "github" }, "original": { @@ -195,11 +195,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -211,11 +211,11 @@ "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -266,11 +266,29 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1762040540, + "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "0010412d62a25d959151790968765a70c436598b", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1762040540, + "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "0010412d62a25d959151790968765a70c436598b", "type": "github" }, "original": { @@ -358,11 +376,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "type": "github" }, "original": { @@ -482,11 +500,11 @@ "gpg-base-conf": { "flake": false, "locked": { - "lastModified": 1746158414, - "narHash": "sha256-4jkYn38XgaA7qm8xoIHH8pjPiie2K2JU97Tas04Zl5A=", + "lastModified": 1762009215, + "narHash": "sha256-yXptsucJ3BYhA6DdPZ8S88Lu6PfhlFed1GMJy2niT00=", "owner": "drduh", "repo": "config", - "rev": "0ae075a000dd2f6cc64a06180986c827b0c94836", + "rev": "6734a79fc08677e70ee4c789fbbc720cacf4ef4c", "type": "github" }, "original": { @@ -503,11 +521,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1761863388, - "narHash": "sha256-UwdHjEui1q4HGrkTekvIpwM/R+pD4fCh+vKlsvZSVyU=", + "lastModified": 1762352939, + "narHash": "sha256-yYFrlLL3UCyWfZOMnoAtUzS3BB8gk2KpEnl0vHQvkfM=", "owner": "helix-editor", "repo": "helix", - "rev": "9dcd19e664a9efe2d6960710ddba3bbd8fda12b6", + "rev": "3f4a286c8dc586d3261bfba3cb2ec3fad5c36efe", "type": "github" }, "original": { @@ -523,11 +541,11 @@ ] }, "locked": { - "lastModified": 1761878381, - "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=", + "lastModified": 1762351818, + "narHash": "sha256-0ptUDbYwxv1kk/uzEX4+NJjY2e16MaAhtzAOJ6K0TG0=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa", + "rev": "b959c67241cae17fc9e4ee7eaf13dfa8512477ea", "type": "github" }, "original": { @@ -565,11 +583,11 @@ ] }, "locked": { - "lastModified": 1759126670, - "narHash": "sha256-p+HObKRf2j3DfI4mcrJoF+WR7IIg9demMioYBsRH0GM=", + "lastModified": 1761971414, + "narHash": "sha256-UeMEUlQsil5DEtF/VQ//41vXJF9ff2xjoYVjhR6dqu4=", "owner": "outfoxxed", "repo": "hy3", - "rev": "af94b011af255de87b2b026121fab1e6f2c56c6d", + "rev": "16dae4d8f853b0d3e8434ee9941f9fc0155b8952", "type": "github" }, "original": { @@ -683,11 +701,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1761869718, - "narHash": "sha256-jLfwwlPGpnGRAtVDyoGj9FgH2D9hWwyEu0yHkflG2EI=", + "lastModified": 1762269308, + "narHash": "sha256-3fTMnF1E7BsZ7NlmFmPo6+SRFm4FELP45IDLHcGLZ1s=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "8e9add2afda58d233a75e4c5ce8503b24fa59ceb", + "rev": "46b71eda6423cc9c3b19cb310c3344e81ac624c5", "type": "github" }, "original": { @@ -713,11 +731,11 @@ ] }, "locked": { - "lastModified": 1761824067, - "narHash": "sha256-dB27qZRH2X5h2KM99UBYmksxb2ly2EGp5eSznTzRDe0=", + "lastModified": 1762115485, + "narHash": "sha256-hr53AWO96ooLCwS1a2v416eT1/aWQZmuQV0ULqhaBTY=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "7a07883c4d3e7ec6726862586483ea119e20eb0f", + "rev": "bbb8d2cb0eb667f2911103eadb3d1e8176f4462c", "type": "github" }, "original": { @@ -914,11 +932,11 @@ ] }, "locked": { - "lastModified": 1759619523, - "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=", + "lastModified": 1762208756, + "narHash": "sha256-hC1jb4tdjFfEuU18KQiMgz5XPAO+d5SfbjAUS7haLl4=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef", + "rev": "164a30b3d8b3174a32ac7326782476f1188e6118", "type": "github" }, "original": { @@ -1004,11 +1022,11 @@ }, "import-tree": { "locked": { - "lastModified": 1761120675, - "narHash": "sha256-TEbh9zISiQcU82VwVoEbmXHnSGlUxTwvjJA9g9ErSDA=", + "lastModified": 1762327901, + "narHash": "sha256-AJ96FNj50DU0bTyIzAPkPOjCZTHqjURVjok8qoXvmqM=", "owner": "vic", "repo": "import-tree", - "rev": "a037ed2a58fc0ebed9e93b9ef79b0646e648f719", + "rev": "90fa129798be99cde036b78658e89475710966a1", "type": "github" }, "original": { @@ -1024,11 +1042,11 @@ ] }, "locked": { - "lastModified": 1761733523, - "narHash": "sha256-Z0i6J9KaMZW7bBwQOj4XZ4mZFfegvaAtvnT3suUMhPc=", + "lastModified": 1762341531, + "narHash": "sha256-wlWo/A1lOkzvo6PHMnVMKiXuv+dyX1UBCjFpJJ6tNiY=", "owner": "nix-community", "repo": "nh", - "rev": "78494d6b8587c8cb36e51949f1177a4ee42a41f8", + "rev": "6c77c9371ed92ac1f93d2b7eaf9fb86ad3433bae", "type": "github" }, "original": { @@ -1045,11 +1063,11 @@ "rust-overlay": [] }, "locked": { - "lastModified": 1761888958, - "narHash": "sha256-YgArUHI81Esn6fOCwVSrMI2G4RI3f3BPbRbPWsJubAc=", + "lastModified": 1762146685, + "narHash": "sha256-anRlNG6t7esBbF1+ALDeathVBSclA0PEL52Vo0WnN5g=", "owner": "YaLTeR", "repo": "niri", - "rev": "e2576879216a39e5c45b9d2906531bc2065e724c", + "rev": "a2ca2b3c866bc781b12c334a9f949b3db6d7c943", "type": "github" }, "original": { @@ -1072,11 +1090,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1761724527, - "narHash": "sha256-nB500dSUaNBtOsu5JI1PDNmjuFD6Kdbkh648q0FoaIY=", + "lastModified": 1762341801, + "narHash": "sha256-zx7UxreMz646qikxw+So7eGRQeWccKFZxuMvJowJuFs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1ff74954f559bb2da63e28b3fcffd3b09ec32842", + "rev": "20aadad64b8b8cbebc71371713c141d91d7f8172", "type": "github" }, "original": { @@ -1088,11 +1106,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1761721311, - "narHash": "sha256-fXBALdA4CKAYslcuamjzQZLUTCNBIKWybj+/2rwe3Z0=", + "lastModified": 1762146685, + "narHash": "sha256-anRlNG6t7esBbF1+ALDeathVBSclA0PEL52Vo0WnN5g=", "owner": "YaLTeR", "repo": "niri", - "rev": "6e8fd153395036c2daa7c214695ed9baf2409a2e", + "rev": "a2ca2b3c866bc781b12c334a9f949b3db6d7c943", "type": "github" }, "original": { @@ -1141,6 +1159,27 @@ "type": "github" } }, + "nix-gaming": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1762480511, + "narHash": "sha256-NIFQhQG7quJiysxPNP7k/3rRMaRKSL2x8qR8jjvk6yk=", + "owner": "fufexan", + "repo": "nix-gaming", + "rev": "cf716e9b2f0fda1b1809156121037f646815eb26", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "nix-gaming", + "type": "github" + } + }, "nix-ld": { "inputs": { "nixpkgs": [ @@ -1148,11 +1187,11 @@ ] }, "locked": { - "lastModified": 1761554027, - "narHash": "sha256-LMnsUobJtqhNnHc9FAp4V/MPMb82+YiXnjbUreg/0n8=", + "lastModified": 1762158525, + "narHash": "sha256-hIaHeP7I4vGYDOmPO2xlzs3XnrgP6e6gbdOdmXQAw2w=", "owner": "Mic92", "repo": "nix-ld", - "rev": "e7d1eba1d561ada0bdb1177ff5d7ce2f8447e974", + "rev": "15c9dee03626498873a8f07d47f01ae402b63ea0", "type": "github" }, "original": { @@ -1163,11 +1202,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1761827175, - "narHash": "sha256-XdPVSYyIBK4/ruoqujaQmmSGg3J2/EenexV9IEXhr6o=", + "lastModified": 1762336257, + "narHash": "sha256-2u5rstcMTqpAr4UF+exs5WGOT62VJRb4yauR6JJHJXs=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "43ffe9ac82567512abb83187cb673de1091bdfa8", + "rev": "d48e8f0e1691e0200a675c13df7c85e275090a15", "type": "github" }, "original": { @@ -1184,11 +1223,11 @@ ] }, "locked": { - "lastModified": 1761563673, - "narHash": "sha256-d+1TpVAmRjcNBfjZsh2yQSdwUfN7Xgz1blJ185g73+A=", + "lastModified": 1762251193, + "narHash": "sha256-CmSddz8e2kM+ITbYutluhKZyXXwI9Sg2lf7XXSvc8oY=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "a518cf710e5ebb935518dc7ac98e07e7ee5014c3", + "rev": "e001844d4553aef268f97b32d3a825b6370eed91", "type": "github" }, "original": { @@ -1199,11 +1238,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1761672384, + "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "type": "github" }, "original": { @@ -1215,11 +1254,11 @@ }, "nixpkgs-25_05": { "locked": { - "lastModified": 1759143472, - "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=", + "lastModified": 1761999846, + "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23", + "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", "type": "github" }, "original": { @@ -1247,11 +1286,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "type": "github" }, "original": { @@ -1260,13 +1299,44 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-master": { + "locked": { + "lastModified": 1762354115, + "narHash": "sha256-fspW/Tf4250M4FjSt1TFgn5A7J4/gPFrYHK94lLgVZk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1d2686608d9f67b2f8f368c05f6ce1c87a0addd9", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1761468971, - "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", + "lastModified": 1762233356, + "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", + "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", "type": "github" }, "original": { @@ -1278,11 +1348,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1761672384, - "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -1310,11 +1380,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1761672384, - "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -1326,11 +1396,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -1429,11 +1499,13 @@ "nh-flake": "nh-flake", "niri": "niri", "niri-flake": "niri-flake", + "nix-gaming": "nix-gaming", "nix-ld": "nix-ld", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_3", "nixpkgs-latest-factorio": "nixpkgs-latest-factorio", + "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix", @@ -1447,11 +1519,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1761849405, - "narHash": "sha256-igXdvC+WCUN+3gnfk+ptT7rMmxQuY6WbIg1rXMUN1DM=", + "lastModified": 1762274641, + "narHash": "sha256-upzIY3p+q/NRziTmyQ0fUaKkUJrT81JruB0IxgzdQ7o=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "f7de8ae045a5fe80f1203c5a1c3015b05f7c3550", + "rev": "5ffe3f45ce89355dc4289e620273ea8b53ca2078", "type": "github" }, "original": { @@ -1491,11 +1563,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1759489698, - "narHash": "sha256-2lT2i5ha23I2vrolEaBaAS/63ChgZPh181Awt6q1bDY=", + "lastModified": 1762302830, + "narHash": "sha256-f3xe6CRPT51vCQFZotJOXi/JpGOiukz0WIa86arJSE8=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "6005d88bed7a5418f9772b4058a73cd0fd1e69a1", + "rev": "58659fbdfd8aba9bd8f4517d3e5c388c4d8266c4", "type": "gitlab" }, "original": { @@ -1587,11 +1659,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1761311587, - "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=", + "lastModified": 1762352490, + "narHash": "sha256-hOP4GxAmeXI43U1lIrKbWI2k35M1/T/i8iJrO9m/GzY=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc", + "rev": "4ef3dfdbb5ddfb9e39999a2f2b0c2637277859d4", "type": "github" }, "original": { @@ -1628,11 +1700,11 @@ ] }, "locked": { - "lastModified": 1760713634, - "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=", + "lastModified": 1761431178, + "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "753bbbdf6a052994da94062e5b753288cef28dfb", + "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", "type": "github" }, "original": { @@ -1661,11 +1733,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1761622056, - "narHash": "sha256-fBrUszJXmB4MY+wf3QsCnqWHcz7u7fLq0QMAWCltIQg=", + "lastModified": 1762302024, + "narHash": "sha256-F+4W0J5r7fbEl+VmATFqAA5+4dFSNAmLJB7tAtrTIkY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0728d59ff6463a502e001fb090f6eb92dbc04756", + "rev": "53b6072bd995b5b4017999cf247f9eb6660c72a2", "type": "github" }, "original": { @@ -1680,11 +1752,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1761859061, - "narHash": "sha256-5C2x+ZQQZAAy0LowYgacT1KG83nXxjcYKMzedx89Wtw=", + "lastModified": 1762341281, + "narHash": "sha256-lbNi1N90hKCsFNKn7i9CAehyEfohmTHlvztKvTY0pDc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "26142b84460636c55bd612ae67225056c7faf134", + "rev": "21a72764b637a936a1b2a056082e36c6ceb07aed", "type": "github" }, "original": { @@ -1702,11 +1774,11 @@ ] }, "locked": { - "lastModified": 1761870842, - "narHash": "sha256-tZH+gSx3jbgtMp58EYYdQ8vAPmNav2Fwu0ekMfGLl50=", + "lastModified": 1762172059, + "narHash": "sha256-pbiHim+MF2IKiwiQeC5pkW+oIqJoDHKHrKECYHhOXsI=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "ae1fddbb9bce72065b67331efff583651bd1b123", + "rev": "e51b3a1fe90c07ba039a3be49e974aa3d8899e57", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index edbe3c9..07b0c5e 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; systems.url = "github:nix-systems/default-linux"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-master.url = "github:nixos/nixpkgs/master"; flake-parts.url = "github:hercules-ci/flake-parts"; import-tree.url = "github:vic/import-tree"; @@ -40,6 +41,11 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + nix-gaming = { + url = "github:fufexan/nix-gaming"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + ### # hyprland stuff hyprland = { diff --git a/modules/base/system/helix.nix b/modules/base/system/helix.nix index 370613d..c04fa48 100644 --- a/modules/base/system/helix.nix +++ b/modules/base/system/helix.nix @@ -7,7 +7,7 @@ ... }: let - helix-pkg = inputs.helix.packages.${pkgs.system}.default; + helix-pkg = inputs.helix.packages.${pkgs.stdenv.hostPlatform.system}.default; in { environment = { @@ -26,7 +26,7 @@ ... }: let - helix-pkg = inputs.helix.packages.${pkgs.system}.default; + helix-pkg = inputs.helix.packages.${pkgs.stdenv.hostPlatform.system}.default; in { home.file.".config/helix/ignore".text = '' diff --git a/modules/base/system/nixdaemon.nix b/modules/base/system/nixdaemon.nix index ed765e9..da0bffe 100644 --- a/modules/base/system/nixdaemon.nix +++ b/modules/base/system/nixdaemon.nix @@ -27,7 +27,7 @@ programs.nh = { enable = true; - package = inputs.nh-flake.packages.${pkgs.system}.nh; + package = inputs.nh-flake.packages.${pkgs.stdenv.hostPlatform.system}.nh; flake = "/home/${username}/projects/config"; }; @@ -59,12 +59,14 @@ "https://nix-community.cachix.org" "https://nixcache.christophhollizeck.dev" "https://hyprland.cachix.org" + "https://nix-gaming.cachix.org" ]; trusted-public-keys = [ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "christophhollizeck.dev:7pPAvm9xqFQB8FDApVNL6Tii1Jsv+Sj/LjEIkdeGhbA=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ]; } // (lib.optionalAttrs config.programs.direnv.enable { diff --git a/modules/desktop/addons/hyprlock.nix b/modules/desktop/addons/hyprlock.nix index fda7404..16277e5 100644 --- a/modules/desktop/addons/hyprlock.nix +++ b/modules/desktop/addons/hyprlock.nix @@ -33,7 +33,7 @@ ... }: let - hyprlock-package = inputs.hyprlock.packages.${pkgs.system}.hyprlock; + hyprlock-package = inputs.hyprlock.packages.${pkgs.stdenv.hostPlatform.system}.hyprlock; in { config = lib.mkIf (osConfig.networking.hostName == "yggdrasil") { diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 81a9868..7f2ad76 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -9,7 +9,7 @@ ... }: let - zenbrowser = inputs.zen-browser.packages."${pkgs.system}".default; + zenbrowser = inputs.zen-browser.packages."${pkgs.stdenv.hostPlatform.system}".default; in { diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 2aef42e..fa78d9d 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -8,7 +8,7 @@ ... }: let - hyprland-package = inputs.hyprland.packages.${pkgs.system}.hyprland; + hyprland-package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; focus-1password = pkgs.writeShellScriptBin "focus-or-open-1pass" '' running=$(hyprctl -j clients | jq -r '.[] | select(.class == "1password") | .workspace.id') @@ -64,7 +64,7 @@ hyprland = { enable = true; package = hyprland-package; - portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; + portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; withUWSM = true; }; }; @@ -124,14 +124,14 @@ ... }: let - hyprland-package = inputs.hyprland.packages.${pkgs.system}.hyprland; + hyprland-package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; in { config = lib.mkIf osConfig.programs.hyprland.enable { wayland.windowManager.hyprland = { enable = true; package = hyprland-package; - plugins = [ inputs.hy3.packages.${pkgs.system}.hy3 ]; + plugins = [ inputs.hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3 ]; systemd.variables = [ "--all" ]; settings = { "$mod" = "SUPER"; diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix index 1455b82..4a36ee2 100644 --- a/modules/desktop/niri.nix +++ b/modules/desktop/niri.nix @@ -6,13 +6,13 @@ programs.niri = { enable = true; - package = inputs.niri-flake.packages.${pkgs.system}.niri-unstable; + package = inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.niri-unstable; }; environment.systemPackages = with pkgs; [ kitty - inputs.niri-flake.packages.${pkgs.system}.xwayland-satellite-unstable + inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.xwayland-satellite-unstable wl-clipboard xsel diff --git a/modules/dev/devenv.nix b/modules/dev/devenv.nix index edca6dc..862a2ba 100644 --- a/modules/dev/devenv.nix +++ b/modules/dev/devenv.nix @@ -3,7 +3,7 @@ { inputs, pkgs, ... }: { environment.systemPackages = [ - inputs.devenv.packages.${pkgs.system}.devenv + inputs.devenv.packages.${pkgs.stdenv.hostPlatform.system}.devenv ]; }; } diff --git a/modules/games/steam.nix b/modules/games/steam.nix index 019b105..3a9af22 100644 --- a/modules/games/steam.nix +++ b/modules/games/steam.nix @@ -4,6 +4,9 @@ { programs.steam = { enable = true; + package = pkgs.steam.override { + extraBwrapArgs = [ "--unsetenv TZ" ]; + }; remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; extraCompatPackages = with pkgs; [ proton-ge-bin ]; diff --git a/modules/games/various-games.nix b/modules/games/various-games.nix index ef45bca..ab97c78 100644 --- a/modules/games/various-games.nix +++ b/modules/games/various-games.nix @@ -1,6 +1,6 @@ { flake.modules.nixos.games = - { pkgs, ... }: + { inputs, pkgs, ... }: { environment.systemPackages = with pkgs; [ prismlauncher @@ -8,7 +8,7 @@ # gaming tools pyfa - path-of-building + inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.rusty-path-of-building ]; }; } diff --git a/modules/hosts/loptland/default.nix b/modules/hosts/loptland/default.nix index 94a0a0a..8b15dd0 100644 --- a/modules/hosts/loptland/default.nix +++ b/modules/hosts/loptland/default.nix @@ -34,10 +34,13 @@ in base server hydra - factorio-server forgejo forgejo-runner + # game server + minecraft-server + factorio-server + # apps # Users diff --git a/modules/hosts/yggdrasil/default.nix b/modules/hosts/yggdrasil/default.nix index 51fcb24..d06773a 100644 --- a/modules/hosts/yggdrasil/default.nix +++ b/modules/hosts/yggdrasil/default.nix @@ -23,8 +23,9 @@ in obsidian diebahn - path-of-building termscp + nixpkgs-review + # inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.star-citizen ]; services.teamviewer.enable = true; @@ -53,7 +54,7 @@ in bluetooth amdgpu - # dektops + # desktops # hyprland niri @@ -86,7 +87,7 @@ in settings.builders-use-substitutes = true; buildMachines = [ { - hostName = "nixberry"; + hostName = "192.168.178.2"; sshUser = "remotebuild"; sshKey = "/root/.ssh/remotebuild"; systems = [ "aarch64-linux" ]; diff --git a/modules/server/minecraft.nix b/modules/server/minecraft.nix new file mode 100644 index 0000000..a6583fb --- /dev/null +++ b/modules/server/minecraft.nix @@ -0,0 +1,25 @@ +{ + flake.modules.nixos.minecraft-server = + { ... }: + { + services.minecraft-server = { + enable = true; + eula = true; + openFirewall = true; # Opens the port the server is running on (by default 25565 but in this case 43000) + declarative = true; + whitelist = { + # This is a mapping from Minecraft usernames to UUIDs. You can use https://mcuuid.net/ to get a Minecraft UUID for a username + Daholli = "9e206940-3dfc-4331-b781-b43a9905087a"; + }; + serverProperties = { + server-port = 43000; + difficulty = 3; + gamemode = 1; + max-players = 5; + motd = "NixOS Minecraft server!"; + white-list = true; + }; + jvmOpts = "-Xms2048M -Xmx4096M"; + }; + }; +}