From 09912bafce2bd8b3b1af406fd61b2456076873d8 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 25 Apr 2025 12:18:36 -0400 Subject: [PATCH 1/5] Update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 19ac581..4434310 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1744987093, - "narHash": "sha256-IVioWVz5qVtHiqosesW7CJW//m/yADr7cVdgF1P4N8s=", + "lastModified": 1745593878, + "narHash": "sha256-Rq5qNnUWuhQTqzXDcminu7Z1FPSB1wUaKIEfPTyZkAs=", "owner": "nix-community", "repo": "home-manager", - "rev": "5e6a8203cee7cc33b2e0d9a0adb7268f46447292", + "rev": "542078066b1a99cdc5d5fce1365f98b847ca0b5a", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { From ffa50804fe80b8ad00122938540be6ac6f6533a5 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 25 Apr 2025 12:20:14 -0400 Subject: [PATCH 2/5] Update filesystem mounts ...and memtest got thrown in the mix --- hosts/default/configuration.nix | 51 ++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 5eb3e78..63e19f6 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -17,28 +17,39 @@ inputs.home-manager.nixosModules.default ./main-user.nix ]; - - #fileSystems."/mnt/arch" = - # { device = "/dev/disk/by-uuid/72db20ba-4dbd-4fb7-891c-b457e2cf9648"; - # fsType = "btrfs"; - # options = [ "subvol=5" ]; - # }; - #fileSystems."/mnt/arch/home" = - # { device = "/dev/disk/by-uuid/4eda05c2-d434-495d-97a0-8a81e8a533ec"; - # fsType = "btrfs"; - # options = [ "subvol=5" ]; - # }; - #fileSystems."/mnt/bulk" = - # { device = "/dev/disk/by-uuid/xxxx"; - # fsType = "ext4"; - # }; - #fileSystems."/mnt/slow" = - # { device = "/dev/disk/by-uuid/xxxx"; - # fsType = "etx4"; - # }; - + boot.initrd.luks.devices."nvme2n1p2_oldcrypt".device = "/dev/disk/by-uuid/44235dca-99e8-4ea8-9516-97d9f5a2d702"; + boot.initrd.luks.devices."altssd".device = "/dev/disk/by-partuuid/c0500656-1527-a84d-82f0-8ad764dddc92"; + fileSystems."/mnt/arch" = + { device = "/dev/disk/by-uuid/72db20ba-4dbd-4fb7-891c-b457e2cf9648"; + fsType = "btrfs"; + options = [ "subvol=5" ]; + }; + fileSystems."/mnt/arch/home" = + { device = "/dev/disk/by-uuid/4eda05c2-d434-495d-97a0-8a81e8a533ec"; + fsType = "btrfs"; + options = [ "subvol=5" ]; + }; + fileSystems."/mnt/bulk" = + { device = "/dev/disk/by-partuuid/d3fc1045-9f5e-f745-afd0-9cc9872f043d"; + fsType = "ext4"; + }; + fileSystems."/mnt/slow" = + { device = "/dev/disk/by-partuuid/b47703cb-01"; + fsType = "etx4"; + }; + fileSystems."/mnt/fast" = + { device = "/dev/disk/by-partuuid/000eede2-01"; + fsType = "ext4"; + }; + fileSystems."/mnt/usb" = + { device = "/dev/disk/by-partuuid/8a735e2c-01"; + fsType = "ext4"; + }; + + + boot.loader.systemd-boot.memtest86.enable = true; # Temporarily pin to 6.12 to fix llvm/rocm build # https://github.com/NixOS/nixpkgs/issues/368672#issuecomment-2608697421 # boot.kernelPackages = pkgs.linuxPackages_6_12; From b0dd468c51be16d470c1c1d023597ef03cfe9753 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 25 Apr 2025 12:20:40 -0400 Subject: [PATCH 3/5] Rearrange a bit --- hosts/default/configuration.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 63e19f6..829a548 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -48,6 +48,8 @@ fsType = "ext4"; }; + # Add flakes + nix.settings.experimental-features = [ "nix-command" "flakes" ]; boot.loader.systemd-boot.memtest86.enable = true; # Temporarily pin to 6.12 to fix llvm/rocm build @@ -71,8 +73,6 @@ ]; services.fwupd.enable = true; services.hardware.openrgb.enable = true; - # Add flakes - nix.settings.experimental-features = [ "nix-command" "flakes" ]; # Feel like I should be sure this is safe w/flakes first: #system.autoUpgrade.enable = true; @@ -467,6 +467,5 @@ # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "24.05"; # Did you read the comment? - } From 973eebac90405377b39562f169732698da6f6071 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 25 Apr 2025 12:21:35 -0400 Subject: [PATCH 4/5] Switch back to monado service from envision Temporarily disable kernel patching...make this a module, it takes too long --- hosts/default/configuration.nix | 40 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 829a548..39c110c 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -61,16 +61,16 @@ boot.kernelModules = [ "kvm-amd" "nct6775" ]; # Direct patching for enabling for async reprojection (for SteamVR) on AMD - boot.kernelPatches = [ - { - name = "amdgpu-ignore-ctx-privileges"; - patch = pkgs.fetchpatch { - name = "cap_sys_nice_begone.patch"; - url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch"; - hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo="; - }; - } - ]; + #boot.kernelPatches = [ + # { + # name = "amdgpu-ignore-ctx-privileges"; + # patch = pkgs.fetchpatch { + # name = "cap_sys_nice_begone.patch"; + # url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch"; + # hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo="; + # }; + # } + #]; services.fwupd.enable = true; services.hardware.openrgb.enable = true; @@ -284,13 +284,10 @@ lfs.enable = true; }; # Orchestrator for FOSS VR stack - programs.envision = { - enable = true; - openFirewall = true; # This is set true by default - }; - #nixpkgs.config.permittedInsecurePackages = [ - # "electron-27.3.11" - #]; + #programs.envision = { + # enable = true; + # openFirewall = true; # This is set true by default + #}; fonts.packages = with pkgs; [ anonymousPro corefonts @@ -436,10 +433,11 @@ }; # VR #Commmand: `renice -20 -p $(pgrep monado)` may help w/issues - #services.monado = { - # enable = true; - # defaultRuntime = true; # Register as default OpenXR runtime - #}; + services.monado = { + enable = true; + defaultRuntime = true; # Register as default OpenXR runtime + forceDefaultRuntime = true; # Register as default OpenXR runtime for each user (remove home-manager file) + }; #systemd.user.services.monado.environment = { # WMR_HANDTRACKING = "0"; # Enable for hand tracking # XRT_PRINT_OPTIONS = "1"; # Enable printing env vars set/available From 063ce150a574b045c03514e82b99b48c50af6448 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 25 Apr 2025 12:21:58 -0400 Subject: [PATCH 5/5] Add example vr flake thingy (not yet included) --- vr.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 vr.nix diff --git a/vr.nix b/vr.nix new file mode 100644 index 0000000..b610434 --- /dev/null +++ b/vr.nix @@ -0,0 +1,15 @@ +{ + inputs = { + nixpkgs-xr.url = "github:nix-community/nixpkgs-xr"; + }; + + outputs = { nixpkgs, nixpkgs-xr, ... }: { + nixosConfigurations.foo = nixpkgs.lib.nixosSystem { + # ... + modules = [ + # ... + nixpkgs-xr.nixosModules.nixpkgs-xr + ]; + }; + }; +}