diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index ce31284..942e075 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1733319615, - "narHash": "sha256-QWQPdJiC6ab3J2rThuLoFJivkEOvMNkzOIn5qJLhIQg=", + "lastModified": 1733919451, + "narHash": "sha256-CDz8tg4Qf85qzPhjSOwelxl1TAwn/T9IX9dO06OKi3g=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "d6a32b476215dbe915ccfa123fcd16d59d21a2c6", + "rev": "b95d66a950fd7b9d72a5ee6ee911cc3080b81997", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1732739177, - "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=", + "lastModified": 1733491721, + "narHash": "sha256-n4fTKTYXeGRngeanNDxSxbuWSRCQ6l74IwOBlqp8dcw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75", + "rev": "0f415721ee427270bc078ef3a5ba2a308d47461f", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733481457, - "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", + "lastModified": 1733861262, + "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", + "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -350,8 +350,7 @@ "chaotic": "chaotic", "lanzaboote": "lanzaboote", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "wivrn": "wivrn" + "nixpkgs": "nixpkgs" } }, "rust-overlay": { @@ -389,22 +388,6 @@ "repo": "default", "type": "github" } - }, - "wivrn": { - "locked": { - "lastModified": 1733023508, - "narHash": "sha256-z2bFIHL2wkuZKuOZvN1jqcTxFdyGo1Ps5Q0OKFqQsvo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b6991a56cb742bc8237db48578dd281224e01b94", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "pull/350069/head", - "repo": "nixpkgs", - "type": "github" - } } }, "root": "root", diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index 81d2001..cda24ab 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -12,8 +12,6 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - wivrn.url = "github:NixOS/nixpkgs/pull/350069/head"; - chaotic = { url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs"; @@ -41,12 +39,17 @@ system = "x86_64-linux"; pkgs = import nixpkgs { - config.allowUnfreePredicate = - pkg: - builtins.elem (nixpkgs.lib.getName pkg) [ - "steam-unwrapped" - "steam" - ]; + # config.allowUnfreePredicate = + # pkg: + # builtins.elem (nixpkgs.lib.getName pkg) [ + # "steam-unwrapped" + # "steam" + # ]; + + # idk pkgs.wivrn pulls a bunch of cuda stuff even though cudaSupport is disabled? + config.allowUnfree = true; + + config.cudaSupport = false; }; in { diff --git a/etcnixos/hardware_laptop.nix b/etcnixos/hardware_laptop.nix index a83a530..0a492ea 100644 --- a/etcnixos/hardware_laptop.nix +++ b/etcnixos/hardware_laptop.nix @@ -28,7 +28,8 @@ ]; }; - boot.initrd.luks.devices."luks-0f481d5f-528c-4838-bd8a-d2780b4ba234".device = "/dev/disk/by-uuid/0f481d5f-528c-4838-bd8a-d2780b4ba234"; + boot.initrd.luks.devices."luks-0f481d5f-528c-4838-bd8a-d2780b4ba234".device = + "/dev/disk/by-uuid/0f481d5f-528c-4838-bd8a-d2780b4ba234"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/4D19-520E"; diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix index f0a36a1..fbfd264 100644 --- a/etcnixos/vr.nix +++ b/etcnixos/vr.nix @@ -1,11 +1,15 @@ -{ pkgs, inputs, ... }: +{ + pkgs, + inputs, + lib, + ... +}: { services.wivrn = { enable = true; openFirewall = true; - # WiVRn 0.20 - package = inputs.wivrn.legacyPackages.${pkgs.system}.wivrn; + package = pkgs.wivrn; # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications # will automatically read this and work with wivrn diff --git a/home-manager/flake.lock b/home-manager/flake.lock index e5fa70b..f31ebcb 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1733873195, + "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1733474926, - "narHash": "sha256-OYp5iaVJc13jEndTrTRVq/C5jNLLW4B4bwJVRNJRsdU=", + "lastModified": 1733946118, + "narHash": "sha256-yoUPXWTO/DXU58yY48CTtuQ7jF/Nmp+Fc/z6HSTjrkE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "5a93128d0685e0582428b573bb67f601b11b2ca0", + "rev": "459933ba5e572d047ccb9a06760b431728433b20", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1733234028, - "narHash": "sha256-YITDP4Jr+sWuQ29WudIBDci7Mh6Ro70XcwYVkxQ1VVU=", + "lastModified": 1733942398, + "narHash": "sha256-/77/rEaihWmhCFBXQQ5cMSzH/pQXJ9cGydUOH/qAk9Q=", "owner": "YaLTeR", "repo": "niri", - "rev": "34ce6d0b02420a8e4a5394cb4c4c603b6efef221", + "rev": "82e30246c1c86b6d20861ede98c8fac4df141aff", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1733220138, - "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", + "lastModified": 1733730953, + "narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", + "rev": "7109b680d161993918b0a126f38bc39763e5a709", "type": "github" }, "original": { @@ -159,11 +159,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1733452419, - "narHash": "sha256-eh2i2GtqdWVOP7yjiWtB8FMUWktCZ4vjo81n6g5mSiE=", + "lastModified": 1733884434, + "narHash": "sha256-8GXR9kC07dyOIshAyfZhG11xfvBRSZzYghnZ2weOKJU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "020701e6057992329a7cfafc6e3c5d5658bbcf79", + "rev": "d0483df44ddf0fd1985f564abccbe568e020ddf2", "type": "github" }, "original": { @@ -256,11 +256,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1732933979, - "narHash": "sha256-Z7X++lKZMNBu67BJl2LP23e7RBadp2C/RuRrygLehaE=", + "lastModified": 1733840403, + "narHash": "sha256-j5hmZ/Oudzr4/HB383uUvY86PxB4c94+7QRV109kOpE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5a765451af1db68acceae07b98e5c768f238210c", + "rev": "ddbfcd69583724e6d142af98010411ac26c2029d", "type": "github" }, "original": { diff --git a/home-manager/system-yarn.nix b/home-manager/system-yarn.nix index bc65ec1..ba456d5 100644 --- a/home-manager/system-yarn.nix +++ b/home-manager/system-yarn.nix @@ -10,7 +10,7 @@ home.packages = with pkgs; [ protontricks - beatsabermodmanager + # beatsabermodmanager ]; programs.alacritty.settings = {