From 902fb6e3eafbf4e2b770293e77399849a102f901 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Mon, 9 Feb 2026 11:09:33 +0100 Subject: [PATCH] Added ALVR for VR --- dev-flakes/cpp/flake.nix | 8 +++ dev-flakes/python/flake.nix | 2 +- flake.lock | 110 ++++++++++++++---------------------- flake.nix | 10 +++- hosts/framework/modules.nix | 1 + modules/default.nix | 1 + modules/nixos/gaming/vr.nix | 7 +++ 7 files changed, 67 insertions(+), 72 deletions(-) create mode 100644 dev-flakes/cpp/flake.nix create mode 100644 modules/nixos/gaming/vr.nix diff --git a/dev-flakes/cpp/flake.nix b/dev-flakes/cpp/flake.nix new file mode 100644 index 0000000..aaa626c --- /dev/null +++ b/dev-flakes/cpp/flake.nix @@ -0,0 +1,8 @@ +{ + description = "General C++ dev enviroment"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = + }; +} diff --git a/dev-flakes/python/flake.nix b/dev-flakes/python/flake.nix index 8aa74a6..2d79203 100644 --- a/dev-flakes/python/flake.nix +++ b/dev-flakes/python/flake.nix @@ -1,5 +1,5 @@ { - description = "Python ML dev environment"; + description = "General Python dev environment"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; diff --git a/flake.lock b/flake.lock index f0c1dc4..f3c8747 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1769813945, - "narHash": "sha256-9ABv9Lo9t6MrFjlnRnU8Zw1C6LVj2+R8PipQ/rxGLHk=", + "lastModified": 1770491427, + "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=", "owner": "nix-community", "repo": "home-manager", - "rev": "475921375def3eb930e1f8883f619ff8609accb6", + "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860", "type": "github" }, "original": { @@ -220,17 +220,19 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1769802121, - "narHash": "sha256-P2KVccrXznyha83gPQeVJ3k+3+/hYXIPQ91DwuRmFF4=", + "lastModified": 1770470830, + "narHash": "sha256-6Nh0HrMoM7wdCpByaBDMo2fvndlrCZke2VNp69gX0G0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ec120d57328e5ae4bfc93a7e809ace47d98f2dc3", + "rev": "f68ac7ef7589e1536d438f7fbfb3ad987538fe0f", "type": "github" }, "original": { @@ -475,16 +477,16 @@ "flake-parts": "flake-parts", "nix-gaming": "nix-gaming", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1769832985, - "narHash": "sha256-PKONM6JUGWviRsv3tZWj72HE0aeHKcHTrzTskj58MRM=", + "lastModified": 1770329357, + "narHash": "sha256-Z5bDEg5TwVF+v7LHS6PaKO6+2eekNGc4Y6kvKHSOt6c=", "owner": "LovingMelody", "repo": "nix-citizen", - "rev": "47823c1ea4c53153dabd43f08b26f3c67c557542", + "rev": "f5f929f6b1d8c292e450f217e98e5c0a4fd5557a", "type": "github" }, "original": { @@ -500,11 +502,11 @@ ] }, "locked": { - "lastModified": 1768764703, - "narHash": "sha256-5ulSDyOG1U+1sJhkJHYsUOWEsmtLl97O0NTVMvgIVyc=", + "lastModified": 1770184146, + "narHash": "sha256-DsqnN6LvXmohTRaal7tVZO/AKBuZ02kPBiZKSU4qa/k=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "0fc4e7ac670a0ed874abacf73c4b072a6a58064b", + "rev": "0d7874ef7e3ba02d58bebb871e6e29da36fa1b37", "type": "github" }, "original": { @@ -523,11 +525,11 @@ ] }, "locked": { - "lastModified": 1769653948, - "narHash": "sha256-vOKkxlAREINxBVFzsj+8D3WZkoOPHLcjhweE0hDMwbg=", + "lastModified": 1769914377, + "narHash": "sha256-8wH3ZYNs36V0A3f/ikraqdoVE++BfnXg9Ql8nAuUkHw=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "60855f0c988b2b4b787f54ddda18a3af44134623", + "rev": "f7d17740ed90663b11ae907d33b3fed9fc9e15a9", "type": "github" }, "original": { @@ -575,11 +577,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -606,27 +608,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -636,22 +622,6 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts_3", @@ -704,7 +674,7 @@ "nix-citizen": "nix-citizen", "nix-darwin": "nix-darwin", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", @@ -718,11 +688,11 @@ ] }, "locked": { - "lastModified": 1769469829, - "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=", + "lastModified": 1770526836, + "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff", + "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d", "type": "github" }, "original": { @@ -733,15 +703,17 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_4" }, "locked": { - "lastModified": 1769316930, - "narHash": "sha256-4EOGHYLpIscwr+6drHE28Qj7NDjjowp2Vd8QkXjdBBE=", + "lastModified": 1770528352, + "narHash": "sha256-KO51BALxgLUlhg1CqQgA3Rj8vgAcDvoLxzNLTxD65cc=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "b2ce438f386943ef611e196a178af2d79042903b", + "rev": "9f4ab243968118026f4ff82f7ce41d30319e2bf0", "type": "github" }, "original": { @@ -818,11 +790,11 @@ ] }, "locked": { - "lastModified": 1769515380, - "narHash": "sha256-CWWK3PaQ7zhr+Jcf5zyaTR2cfRBXPo09H7+5nWApL8s=", + "lastModified": 1770228511, + "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "9911802c2822def2eec3d22e2cafd1619ede94a5", + "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8db3444..52f6d20 100644 --- a/flake.nix +++ b/flake.nix @@ -8,10 +8,16 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # Hyprland - hyprland.url = "github:hyprwm/Hyprland"; + hyprland = { + url = "github:hyprwm/Hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Spicetify - spicetify-nix.url = "github:Gerg-L/spicetify-nix"; + spicetify-nix = { + url = "github:Gerg-L/spicetify-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Sops-nix sops-nix = { diff --git a/hosts/framework/modules.nix b/hosts/framework/modules.nix index 7588bae..0901272 100644 --- a/hosts/framework/modules.nix +++ b/hosts/framework/modules.nix @@ -10,6 +10,7 @@ in modules.nixos.secrets modules.nixos.gaming.starCitizen modules.nixos.gaming.steam + modules.nixos.gamong.vr modules.common.spotify ]; } diff --git a/modules/default.nix b/modules/default.nix index 36b0ac6..0cb4874 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -27,6 +27,7 @@ nvidia = ./nixos/gaming/nvidia.nix; starCitizen = ./nixos/gaming/starCitizen.nix; steam = ./nixos/gaming/steam.nix; + vr = ./nixos/gaming/vr.nix; }; bootloader = ./nixos/bootloader.nix; locale = ./nixos/locale.nix; diff --git a/modules/nixos/gaming/vr.nix b/modules/nixos/gaming/vr.nix new file mode 100644 index 0000000..09a5f67 --- /dev/null +++ b/modules/nixos/gaming/vr.nix @@ -0,0 +1,7 @@ +{pkgs, ...}; + +{ + environment.systemPackages = with pkgs; [ alvr ]; + +# EOF +}