diff --git a/flake.lock b/flake.lock index e53a1da9..4d72302a 100644 --- a/flake.lock +++ b/flake.lock @@ -808,6 +808,22 @@ "type": "github" } }, + "flake-compat_10": { + "flake": false, + "locked": { + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_2": { "flake": false, "locked": { @@ -904,19 +920,17 @@ } }, "flake-compat_8": { - "flake": false, "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", - "type": "github" + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, "flake-compat_9": { @@ -977,6 +991,24 @@ "type": "github" } }, + "flake-parts_11": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_4" + }, + "locked": { + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "4524271976b625a4a605beefd893f270620fd751", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -1210,7 +1242,10 @@ }, "flake-utils_13": { "inputs": { - "systems": "systems_17" + "systems": [ + "nixpkgs-xr", + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -1228,7 +1263,7 @@ }, "flake-utils_14": { "inputs": { - "systems": "systems_19" + "systems": "systems_18" }, "locked": { "lastModified": 1731533236, @@ -1245,12 +1280,15 @@ } }, "flake-utils_15": { + "inputs": { + "systems": "systems_20" + }, "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -1275,15 +1313,12 @@ } }, "flake-utils_17": { - "inputs": { - "systems": "systems_23" - }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -1297,11 +1332,11 @@ "systems": "systems_24" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -1315,11 +1350,11 @@ "systems": "systems_25" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -1346,6 +1381,24 @@ "type": "github" } }, + "flake-utils_20": { + "inputs": { + "systems": "systems_26" + }, + "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" + } + }, "flake-utils_3": { "inputs": { "systems": "systems_4" @@ -2733,6 +2786,21 @@ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, + "nixpkgs-lib_4": { + "locked": { + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-master": { "locked": { "lastModified": 1762757922, @@ -2765,6 +2833,30 @@ "type": "github" } }, + "nixpkgs-xr": { + "inputs": { + "flake-compat": "flake-compat_8", + "flake-utils": "flake-utils_13", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_17", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1762824669, + "narHash": "sha256-24Hmh+dog/bfQgQ1jDoEGws5q4ZomWIZHcElcqEOGWg=", + "owner": "nix-community", + "repo": "nixpkgs-xr", + "rev": "cf195268904c9f9ddfb666b062bf2512153eaf63", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs-xr", + "type": "github" + } + }, "nixpkgs_10": { "locked": { "lastModified": 1644486793, @@ -2797,6 +2889,22 @@ "type": "github" } }, + "nixpkgs_12": { + "locked": { + "lastModified": 1762596750, + "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 315532800, @@ -2926,7 +3034,7 @@ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "systems": "systems_18" + "systems": "systems_19" }, "locked": { "lastModified": 1762691346, @@ -2944,7 +3052,7 @@ }, "nno": { "inputs": { - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_15", "neorg": "neorg", "neorg-telescope": "neorg-telescope", "nixpkgs": [ @@ -2969,8 +3077,8 @@ }, "norg": { "inputs": { - "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_15", + "flake-compat": "flake-compat_9", + "flake-utils": "flake-utils_16", "nixpkgs": "nixpkgs_9" }, "locked": { @@ -2990,8 +3098,8 @@ }, "norg-meta": { "inputs": { - "flake-compat": "flake-compat_9", - "flake-utils": "flake-utils_16", + "flake-compat": "flake-compat_10", + "flake-utils": "flake-utils_17", "nixpkgs": "nixpkgs_10" }, "locked": { @@ -3062,7 +3170,7 @@ "stylix-stable", "nixpkgs" ], - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1751320053, @@ -3080,7 +3188,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_13", + "flake-utils": "flake-utils_14", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -3106,7 +3214,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_20" + "systems": "systems_21" }, "locked": { "lastModified": 1756860511, @@ -3258,6 +3366,7 @@ "nixpkgs": "nixpkgs_8", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-xr": "nixpkgs-xr", "nixvim": "nixvim", "nno": "nno", "nur": "nur", @@ -3277,6 +3386,7 @@ "tree-sitter-slint": "tree-sitter-slint", "typr": "typr", "volt": "volt", + "wivrn": "wivrn", "yabai": "yabai", "zen-browser": "zen-browser", "zeronsd": "zeronsd", @@ -3564,7 +3674,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_21", + "systems": "systems_22", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -3598,7 +3708,7 @@ "nixpkgs-stable" ], "nur": "nur_3", - "systems": "systems_22", + "systems": "systems_23", "tinted-foot": "tinted-foot_2", "tinted-kitty": "tinted-kitty_2", "tinted-schemes": "tinted-schemes_2", @@ -3742,16 +3852,16 @@ }, "systems_17": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -3890,6 +4000,21 @@ "type": "github" } }, + "systems_26": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -4161,7 +4286,7 @@ "inputs": { "advisory-db": "advisory-db_5", "crane": "crane_6", - "flake-utils": "flake-utils_17", + "flake-utils": "flake-utils_18", "nix-github-actions": "nix-github-actions_4", "nixpkgs": [ "nixpkgs" @@ -4263,6 +4388,27 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs-xr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1762410071, + "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "97a30861b13c3731a84e09405414398fbf3e109f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "stylix-stable", @@ -4334,6 +4480,26 @@ "type": "github" } }, + "wivrn": { + "inputs": { + "flake-parts": "flake-parts_11", + "nixpkgs": "nixpkgs_12" + }, + "locked": { + "lastModified": 1762796646, + "narHash": "sha256-pEKMeRdI9UhdZ+NksRBcF7yPC7Ys2haE+B4PPGQ4beE=", + "owner": "WiVRn", + "repo": "WiVRn", + "rev": "09031b9aa5296d3be45c996fada9347f5ccb6f66", + "type": "github" + }, + "original": { + "owner": "WiVRn", + "ref": "v25.11.1", + "repo": "WiVRn", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -4416,7 +4582,7 @@ "inputs": { "advisory-db": "advisory-db_6", "crane": "crane_7", - "flake-utils": "flake-utils_18", + "flake-utils": "flake-utils_19", "nix-github-actions": "nix-github-actions_5", "nixpkgs": [ "nixpkgs" @@ -4469,7 +4635,7 @@ "zjstatus": { "inputs": { "crane": "crane_8", - "flake-utils": "flake-utils_19", + "flake-utils": "flake-utils_20", "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index c25c300f..87d4713d 100644 --- a/flake.nix +++ b/flake.nix @@ -230,6 +230,14 @@ url = "github:numtide/nix-auth"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixpkgs-xr = { + url = "github:nix-community/nixpkgs-xr"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + wivrn = { + url = "github:WiVRn/WiVRn/v25.11.1"; + flake = false; + }; }; outputs = { diff --git a/home/services/hyprland.nix b/home/services/hyprland.nix index 1a594c8b..212a53e7 100644 --- a/home/services/hyprland.nix +++ b/home/services/hyprland.nix @@ -203,7 +203,7 @@ "$mainMod, Space, exec, ${lib.getExe pkgs.anyrun}" "$mainMod, p, pseudo, # dwindle" "$mainMod, v, togglesplit," - # "$mainMod, a, exec, swaync-client -t" + "$mainMod, a, exec, swaync-client -t" "$mainMod, Tab, cyclenext" # Audio ",xf86audiomute, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume mute-toggle" diff --git a/nixos/default.nix b/nixos/default.nix index 276c3d93..bca7eba7 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -20,6 +20,7 @@ inputs.lanzaboote.nixosModules.lanzaboote inputs.musnix.nixosModules.musnix inputs.nix-minecraft.nixosModules.minecraft-servers + inputs.nixpkgs-xr.nixosModules.nixpkgs-xr inputs.nur.modules.nixos.default inputs.sops-nix.nixosModules.sops inputs.stylix.nixosModules.stylix diff --git a/nixos/ryu/services/wivrn.nix b/nixos/ryu/services/wivrn.nix index 1e86fc94..7b33c64d 100644 --- a/nixos/ryu/services/wivrn.nix +++ b/nixos/ryu/services/wivrn.nix @@ -1,8 +1,9 @@ -{...}: { +{pkgs, ...}: { services.wivrn = { enable = true; openFirewall = true; defaultRuntime = true; autoStart = true; + package = pkgs.wivrn; }; } diff --git a/overlays.nix b/overlays.nix index 632724db..f2dcec74 100644 --- a/overlays.nix +++ b/overlays.nix @@ -265,8 +265,16 @@ src = inputs.immich; }); }; + vr = final: prev: { + wivrn = prev.wivrn.overrideAttrs (oldAttrs: { + version = "v25.11.1"; + src = inputs.wivrn; + }); + # inputs.wivrn.packages.${prev.system}.default; + }; in [ + vr anyrun-overlay catppuccinThemes csshacks