From fa636e3eafd90aac38e33f14bf965e675fb4b7c9 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Sun, 1 Jun 2025 12:45:58 -0400 Subject: [PATCH 01/29] Disable VR-related settings --- hosts/default/configuration.nix | 14 +++++------ hosts/default/home.nix | 42 ++++++++++++++++----------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index c48d659..fcb37a6 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -271,8 +271,8 @@ lutris # game launcher (EA/Humble/Ubi++) cruft # python-based template processor nmap # network mapping/scanning tool - basalt-monado # tracking for VR - opencomposite # compatibility layer for VR + # basalt-monado # tracking for VR + # opencomposite # compatibility layer for VR # why did these two disappear??? usbutils # provide lsusb, etc. pciutils # provide lspci, etc. @@ -440,11 +440,11 @@ }; # VR #Commmand: `renice -20 -p $(pgrep monado)` may help w/issues - 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) - }; + # 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 diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 271a2a6..3d0f956 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -73,30 +73,30 @@ # EDITOR = "emacs"; }; # For Monado: - xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.monado}/share/openxr/1/openxr_monado.json"; + # xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.monado}/share/openxr/1/openxr_monado.json"; # For WiVRn: - #xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json"; + # xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json"; - xdg.configFile."openvr/openvrpaths.vrpath".text = '' - { - "config" : - [ - "${config.xdg.dataHome}/Steam/config" - ], - "external_drivers" : null, - "jsonid" : "vrpathreg", - "log" : - [ - "${config.xdg.dataHome}/Steam/logs" - ], - "runtime" : - [ - "${pkgs.opencomposite}/lib/opencomposite" - ], - "version" : 1 - } - ''; + # xdg.configFile."openvr/openvrpaths.vrpath".text = '' + # { + # "config" : + # [ + # "${config.xdg.dataHome}/Steam/config" + # ], + # "external_drivers" : null, + # "jsonid" : "vrpathreg", + # "log" : + # [ + # "${config.xdg.dataHome}/Steam/logs" + # ], + # "runtime" : + # [ + # "${pkgs.opencomposite}/lib/opencomposite" + # ], + # "version" : 1 + # } + # ''; # Let Home Manager install and manage itself. programs.home-manager.enable = true; } From 881db84a264cd2423b0aba75f01202dac355371c Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Sun, 1 Jun 2025 12:55:07 -0400 Subject: [PATCH 02/29] Update nix flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 18ba42e..d1201d6 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { From 6dfade4734cc1f228758a6d88fe0a17a1d925762 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Mon, 2 Jun 2025 13:35:32 -0400 Subject: [PATCH 03/29] Ensure firewall is active ...it was, but there's still a rule I don't understand, despite nmap results looking good --- hosts/default/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index fcb37a6..b0e61c5 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -190,6 +190,7 @@ #networking.firewall.allowedTCPPorts = [ 9003 ]; networking.firewall = { + enable = true; allowedTCPPorts = [ 9003 ]; allowedUDPPorts = [ 51820 ]; # if packets are still dropped, they will show up in dmesg From 73146c6a5db9f95ecf00480545e2a700dd3ffbd8 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Mon, 2 Jun 2025 13:35:59 -0400 Subject: [PATCH 04/29] Clean up comments and yes, it existed --- hosts/default/configuration.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index b0e61c5..9ef43bd 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -250,7 +250,6 @@ libreoffice-qt # libreoffice - qt is best for KDE hunspell # spell checking hunspellDicts.en_US # spell check dictionary - #corectl # this doesn't exist???? magic-wormhole # transfer files with ease screen # terminal multiplexer...from GNU gnumake # build automation tool @@ -460,12 +459,6 @@ programs.steam.gamescopeSession.enable = true; - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave From 16b16673731bb5db2d1538403bb10ce5253ab34a Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Sun, 8 Jun 2025 12:15:56 -0400 Subject: [PATCH 05/29] Update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d1201d6..177b3f9 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1748737919, - "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", + "lastModified": 1749243446, + "narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=", "owner": "nix-community", "repo": "home-manager", - "rev": "5675a9686851d9626560052a032c4e14e533c1fa", + "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { From 5d831405a07aed758e965e9de9713696d1725966 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Sun, 8 Jun 2025 12:16:37 -0400 Subject: [PATCH 06/29] Add disable panel self-refresh to fix AMDGPU bug/hang and switch back to zen kernel --- hosts/default/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 9ef43bd..3aca732 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -55,11 +55,14 @@ # 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; - # boot.kernelPackages = pkgs.linuxPackages_zen; + boot.kernelPackages = pkgs.linuxPackages_zen; # nct6775 - for monitoring functions on ASUS ROG STRIX B550-F GAMING WIFI II # kvm-amd - AMD virtualization support boot.kernelModules = [ "kvm-amd" "nct6775" ]; + # Problems with hangs on RX6700 + boot.kernelParams = [ "amdgpu.dcdebugmask=0x10" ]; + # Direct patching for enabling for async reprojection (for SteamVR) on AMD # boot.kernelPatches = [ # { From 50e1cab1758acb3a85ac32fdef07865b2d1e2086 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Sun, 8 Jun 2025 12:16:54 -0400 Subject: [PATCH 07/29] Update firewall rules for Ollama server --- hosts/default/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 3aca732..f9b648e 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -201,8 +201,8 @@ checkReversePath = "loose"; extraCommands = '' # Enable connections to Ollama for VPN users: + iptables -t filter -I INPUT --protocol TCP --source 10.40.4.0/24 --destination 10.40.4.2 --dport 8080 -j ACCEPT iptables -t filter -I INPUT --protocol TCP --source 10.40.4.2/32 --destination 10.40.4.2 --dport 11434 -j ACCEPT - iptables -t filter -I INPUT --protocol TCP --source 10.0.7.0/24 --destination 10.40.4.2 --dport 11434 -j ACCEPT ''; # wireguard trips rpfilter up #extraCommands = '' From 430d2fdb1f850e7061238c2c996675e30443a8d3 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 27 Jun 2025 20:38:28 -0400 Subject: [PATCH 08/29] Update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 177b3f9..40aeb2b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1749243446, - "narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=", + "lastModified": 1750973805, + "narHash": "sha256-BZXgag7I0rnL/HMHAsBz3tQrfKAibpY2vovexl2lS+Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", + "rev": "080e8b48b0318b38143d5865de9334f46d51fce3", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { From c583bee02db8b5d849bd272791c3d7581898df99 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Mon, 2 Jun 2025 13:35:32 -0400 Subject: [PATCH 09/29] Ensure firewall is active ...it was, but there's still a rule I don't understand, despite nmap results looking good --- hosts/default/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index c48d659..fce8bac 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -190,6 +190,7 @@ #networking.firewall.allowedTCPPorts = [ 9003 ]; networking.firewall = { + enable = true; allowedTCPPorts = [ 9003 ]; allowedUDPPorts = [ 51820 ]; # if packets are still dropped, they will show up in dmesg From 72c8b7993f89202adf5033ce49efdad939e3dc96 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Mon, 2 Jun 2025 13:35:59 -0400 Subject: [PATCH 10/29] Clean up comments and yes, it existed --- hosts/default/configuration.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index fce8bac..98f13a3 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -250,7 +250,6 @@ libreoffice-qt # libreoffice - qt is best for KDE hunspell # spell checking hunspellDicts.en_US # spell check dictionary - #corectl # this doesn't exist???? magic-wormhole # transfer files with ease screen # terminal multiplexer...from GNU gnumake # build automation tool @@ -460,12 +459,6 @@ programs.steam.gamescopeSession.enable = true; - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave From 6dc683484ddcf85047d4c86a6ebe914c8429bca4 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Sun, 8 Jun 2025 12:16:37 -0400 Subject: [PATCH 11/29] Add disable panel self-refresh to fix AMDGPU bug/hang and switch back to zen kernel --- hosts/default/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 98f13a3..5633617 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -55,11 +55,14 @@ # 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; - # boot.kernelPackages = pkgs.linuxPackages_zen; + boot.kernelPackages = pkgs.linuxPackages_zen; # nct6775 - for monitoring functions on ASUS ROG STRIX B550-F GAMING WIFI II # kvm-amd - AMD virtualization support boot.kernelModules = [ "kvm-amd" "nct6775" ]; + # Problems with hangs on RX6700 + boot.kernelParams = [ "amdgpu.dcdebugmask=0x10" ]; + # Direct patching for enabling for async reprojection (for SteamVR) on AMD # boot.kernelPatches = [ # { From aa5e020a300a2ec0185b629a97f979febb8252fa Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Sun, 8 Jun 2025 12:16:54 -0400 Subject: [PATCH 12/29] Update firewall rules for Ollama server --- hosts/default/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 5633617..10e4288 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -201,8 +201,8 @@ checkReversePath = "loose"; extraCommands = '' # Enable connections to Ollama for VPN users: + iptables -t filter -I INPUT --protocol TCP --source 10.40.4.0/24 --destination 10.40.4.2 --dport 8080 -j ACCEPT iptables -t filter -I INPUT --protocol TCP --source 10.40.4.2/32 --destination 10.40.4.2 --dport 11434 -j ACCEPT - iptables -t filter -I INPUT --protocol TCP --source 10.0.7.0/24 --destination 10.40.4.2 --dport 11434 -j ACCEPT ''; # wireguard trips rpfilter up #extraCommands = '' From 74f8e773118b9710ce18e3814f5d63394425484d Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 27 Jun 2025 20:45:52 -0400 Subject: [PATCH 13/29] Update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 18ba42e..40aeb2b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1748737919, - "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", + "lastModified": 1750973805, + "narHash": "sha256-BZXgag7I0rnL/HMHAsBz3tQrfKAibpY2vovexl2lS+Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "5675a9686851d9626560052a032c4e14e533c1fa", + "rev": "080e8b48b0318b38143d5865de9334f46d51fce3", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { From cb97b90ca3b807f402f8f3ec0f18f3d2a8a1862f Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 27 Jun 2025 21:05:08 -0400 Subject: [PATCH 14/29] Attempt individual kernel module build --- hosts/default/amdgpu.nix | 38 +++++++++++++++++++ hosts/default/configuration.nix | 15 +++++++- .../default/patches/cap_sys_nice_begone.patch | 26 +++++++++++++ 3 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 hosts/default/amdgpu.nix create mode 100644 hosts/default/patches/cap_sys_nice_begone.patch diff --git a/hosts/default/amdgpu.nix b/hosts/default/amdgpu.nix new file mode 100644 index 0000000..08d7dd4 --- /dev/null +++ b/hosts/default/amdgpu.nix @@ -0,0 +1,38 @@ +{ pkgs +, lib +, kernel ? pkgs.linuxPackages_latest.kernel +}: + +pkgs.stdenv.mkDerivation { + pname = "amdgpu-kernel-module"; + inherit (kernel) src version postPatch nativeBuildInputs; + + kernel_dev = kernel.dev; + kernelVersion = kernel.modDirVersion; + + modulePath = "drivers/gpu/drm/amd/amdgpu"; + + buildPhase = '' + BUILT_KERNEL=$kernel_dev/lib/modules/$kernelVersion/build + + cp $BUILT_KERNEL/Module.symvers . + cp $BUILT_KERNEL/.config . + cp $kernel_dev/vmlinux . + + make "-j$NIX_BUILD_CORES" modules_prepare + make "-j$NIX_BUILD_CORES" M=$modulePath modules + ''; + + installPhase = '' + make \ + INSTALL_MOD_PATH="$out" \ + XZ="xz -T$NIX_BUILD_CORES" \ + M="$modulePath" \ + modules_install + ''; + + meta = { + description = "AMD GPU kernel module"; + license = lib.licenses.gpl3; + }; +} diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 10e4288..bfb9e8b 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -10,6 +10,13 @@ { config, pkgs, inputs, ... }: +# Direct patching to enable async reprojection (for SteamVR) on AMD +let + amdgpu-kernel-module = pkgs.callPackage ./amdgpu.nix { + # Make sure the module targets the same kernel as your system is using. + kernel = config.boot.kernelPackages.kernel; + }; +in { imports = [ # Include the results of the hardware scan. @@ -60,9 +67,15 @@ # kvm-amd - AMD virtualization support boot.kernelModules = [ "kvm-amd" "nct6775" ]; - # Problems with hangs on RX6700 + # Fix problems with hanging on RX6700 (disables PSR - Panel Self Refresh) boot.kernelParams = [ "amdgpu.dcdebugmask=0x10" ]; + boot.extraModulePackages = [ + (amdgpu-kernel-module.overrideAttrs (_: { + patches = [ ./patches/cap_sys_nice_begone.patch ]; + })) + ]; + # Direct patching for enabling for async reprojection (for SteamVR) on AMD # boot.kernelPatches = [ # { diff --git a/hosts/default/patches/cap_sys_nice_begone.patch b/hosts/default/patches/cap_sys_nice_begone.patch new file mode 100644 index 0000000..c1457fd --- /dev/null +++ b/hosts/default/patches/cap_sys_nice_begone.patch @@ -0,0 +1,26 @@ +From fe059b4c373639fc5d69067e62de3f2a0e44a037 Mon Sep 17 00:00:00 2001 +From: Sefa Eyeoglu +Date: Fri, 17 Mar 2023 16:50:57 +0100 +Subject: [PATCH] amdgpu: allow any ctx priority + +Signed-off-by: Sefa Eyeoglu +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +index d2139ac12159..c7f1d36329c8 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +@@ -107,7 +107,7 @@ static int amdgpu_ctx_priority_permit(struct drm_file *filp, + if (drm_is_current_master(filp)) + return 0; + +- return -EACCES; ++ return 0; + } + + static enum amdgpu_gfx_pipe_priority amdgpu_ctx_prio_to_gfx_pipe_prio(int32_t prio) +-- +2.39.2 + From dcd50a4b96799b368747cc31abd96e268e57b657 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Sat, 28 Jun 2025 01:00:21 -0400 Subject: [PATCH 15/29] Working VR holy heck...never thought this would happen --- hosts/default/configuration.nix | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index bfb9e8b..172a03f 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -460,13 +460,30 @@ in enable = true; defaultRuntime = true; # Register as default OpenXR runtime forceDefaultRuntime = true; # Register as default OpenXR runtime for each user (remove home-manager file) + highPriority = true; + package = (pkgs.monado.overrideAttrs { + pname = "monado-wmr-controllers"; # optional but helps distinguishing between packages + + src = pkgs.fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "thaytan"; + repo = "monado"; + rev = "467166935eea0183a8c8f5884c4ecd20c0eeacfb"; + hash = "sha256-IKO/bhUsISmRb3k+wAEscuTUXDyrzyVYQG1eJkLCIUI="; + }; + + patches = []; + }); + }; + systemd.user.services.monado.environment = { + WMR_HANDTRACKING = "0"; # Enable for hand tracking + XRT_PRINT_OPTIONS = "1"; # Enable printing env vars set/available + VIT_SYSTEM_LIBRARY_PATH = "${pkgs.basalt-monado}/lib/libbasalt.so"; + XRT_COMPOSITOR_COMPUTE = "1"; + STEAMVR_LH_ENABLE = "0"; + U_PACING_COMP_MIN_TIME_MS = "5"; + XRT_COMPOSITOR_DESIRED_MODE = "1"; }; - #systemd.user.services.monado.environment = { - # WMR_HANDTRACKING = "0"; # Enable for hand tracking - # XRT_PRINT_OPTIONS = "1"; # Enable printing env vars set/available - # VIT_SYSTEM_LIBRARY_PATH = "${pkgs.basalt-monado}/lib/libbasalt.so"; - # #U_PACING_COMP_MIN_TIME_MS = "5"; # This is a tweak for something...I forgot - #}; # allow clock adjustments/priority change, etc (gamemoderun ./game) # https://wiki.nixos.org/wiki/GameMode programs.gamemode.enable = true; # for performance mode From c242703350f3fc7b12c25fcc29a0dd69ab851d72 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Mon, 30 Jun 2025 15:28:00 -0400 Subject: [PATCH 16/29] Finally realized I had these backwards --- hosts/default/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 172a03f..a2d73be 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -29,12 +29,12 @@ in 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"; + { device = "/dev/disk/by-uuid/4eda05c2-d434-495d-97a0-8a81e8a533ec"; fsType = "btrfs"; #options = [ "subvolid=5" ]; }; fileSystems."/mnt/arch/home" = - { device = "/dev/disk/by-uuid/4eda05c2-d434-495d-97a0-8a81e8a533ec"; + { device = "/dev/disk/by-uuid/72db20ba-4dbd-4fb7-891c-b457e2cf9648"; fsType = "btrfs"; #options = [ "subvolid=5" ]; }; From ababc0bca5dc27f8dc6aed80846d6ff6d333a37a Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Thu, 3 Jul 2025 20:25:47 -0400 Subject: [PATCH 17/29] Update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 40aeb2b..9a55eb6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1750973805, - "narHash": "sha256-BZXgag7I0rnL/HMHAsBz3tQrfKAibpY2vovexl2lS+Y=", + "lastModified": 1751580393, + "narHash": "sha256-oRipTA4/JGeDGI31GNNVGFx0uhuR7h/R9SvkR4K8Axc=", "owner": "nix-community", "repo": "home-manager", - "rev": "080e8b48b0318b38143d5865de9334f46d51fce3", + "rev": "402333d5ec2f9eed0f2584555936361f39d2f93e", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { From 24116371597acdd564dcbd5a10e57ca7ee9c445c Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Tue, 15 Jul 2025 17:01:07 -0400 Subject: [PATCH 18/29] Update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 9a55eb6..5760506 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1751580393, - "narHash": "sha256-oRipTA4/JGeDGI31GNNVGFx0uhuR7h/R9SvkR4K8Axc=", + "lastModified": 1752603129, + "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", "owner": "nix-community", "repo": "home-manager", - "rev": "402333d5ec2f9eed0f2584555936361f39d2f93e", + "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { From 92eeee91e065adcbb96988c5a0e4822a33eb2a9b Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Sat, 19 Jul 2025 20:47:41 -0400 Subject: [PATCH 19/29] Update flake.lock (previous did not build) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 5760506..77f12c3 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1752814804, + "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1752687322, + "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", "type": "github" }, "original": { From eced26c2ed1bce062eaaa5d6030b130227b6de7b Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Mon, 28 Jul 2025 22:44:08 -0400 Subject: [PATCH 20/29] Update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 77f12c3..9a10920 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1752814804, - "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", + "lastModified": 1753387274, + "narHash": "sha256-Y1hAI9h+9DLBbgKvZBsHaeptFIcRw4iC6ySPmzyqmlM=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", + "rev": "a35f6b60430ff0c7803bd2a727df84c87569c167", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { From c58549dc3385ecde4d2a671b950f2e1d45474768 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Mon, 28 Jul 2025 22:44:15 -0400 Subject: [PATCH 21/29] Add kdeconnect app --- hosts/default/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index a2d73be..41fb2c4 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -190,7 +190,8 @@ in "wolcen" = import ./home.nix; }; }; - + # Install kdeconnect (also opens firewall ports) + programs.kdeconnect.enable = true; # Install firefox. programs.firefox.enable = true; From f65be28fa7542e48baff46e009505634948fc6b5 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 8 Aug 2025 12:24:43 -0400 Subject: [PATCH 22/29] Update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 9a10920..efd2578 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1753387274, - "narHash": "sha256-Y1hAI9h+9DLBbgKvZBsHaeptFIcRw4iC6ySPmzyqmlM=", + "lastModified": 1753732062, + "narHash": "sha256-vojVM0SgFP8crFh1LDDXkzaI9/er/1cuRfbNPhfBHyc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a35f6b60430ff0c7803bd2a727df84c87569c167", + "rev": "f49e872f55e36e67ebcb906ff65f86c7a1538f7c", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", + "lastModified": 1753549186, + "narHash": "sha256-Znl7rzuxKg/Mdm6AhimcKynM7V3YeNDIcLjBuoBcmNs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "17f6bd177404d6d43017595c5264756764444ab8", "type": "github" }, "original": { From 6ef14395453b7be0a387f644606718dc71bc6b77 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Mon, 11 Aug 2025 11:04:17 -0400 Subject: [PATCH 23/29] Update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index efd2578..ed8bb87 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1753732062, - "narHash": "sha256-vojVM0SgFP8crFh1LDDXkzaI9/er/1cuRfbNPhfBHyc=", + "lastModified": 1754613544, + "narHash": "sha256-ueR1mGX4I4DWfDRRxxMphbKDNisDeMPMusN72VV1+cc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f49e872f55e36e67ebcb906ff65f86c7a1538f7c", + "rev": "cc2fa2331aebf9661d22bb507d362b39852ac73f", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753549186, - "narHash": "sha256-Znl7rzuxKg/Mdm6AhimcKynM7V3YeNDIcLjBuoBcmNs=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "17f6bd177404d6d43017595c5264756764444ab8", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { From 866c7d3f8f63626688c751ad464e7b5c7eaddc10 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Mon, 11 Aug 2025 11:04:51 -0400 Subject: [PATCH 24/29] Add conda --- hosts/default/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 41fb2c4..db6cc89 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -235,6 +235,7 @@ in # $ nix search wget environment.systemPackages = with pkgs; [ binutils # gnu bin utils + conda # python environment management neovim # next gen vim w/lua wget # url fetcher/spider curl # url fetcher From ba3052d4d28fcdf19ffc8619a03306138ad0550f Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Mon, 11 Aug 2025 11:09:06 -0400 Subject: [PATCH 25/29] Update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ed8bb87..ddc414e 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1754613544, - "narHash": "sha256-ueR1mGX4I4DWfDRRxxMphbKDNisDeMPMusN72VV1+cc=", + "lastModified": 1754924470, + "narHash": "sha256-asI/or9AcUMydwzodCgpHGytnMSNUlciw3uaycpXm4E=", "owner": "nix-community", "repo": "home-manager", - "rev": "cc2fa2331aebf9661d22bb507d362b39852ac73f", + "rev": "67393957c27b4e4c6c48a60108a201413ced7800", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1754725699, + "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", "type": "github" }, "original": { From 3213932772dfdf3e395833b633dffc3000b70ebe Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 15 Aug 2025 14:48:05 -0400 Subject: [PATCH 26/29] Add a bunch of baby ducks --- hosts/default/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index db6cc89..d61c228 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -236,6 +236,7 @@ in environment.systemPackages = with pkgs; [ binutils # gnu bin utils conda # python environment management + duckdb # wanted mostly as cli for SQL on csv files neovim # next gen vim w/lua wget # url fetcher/spider curl # url fetcher From d2b21227a3aea4bb2d032d12c8a169108133f600 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 15 Aug 2025 14:48:13 -0400 Subject: [PATCH 27/29] Update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ddc414e..b7aac96 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1754924470, - "narHash": "sha256-asI/or9AcUMydwzodCgpHGytnMSNUlciw3uaycpXm4E=", + "lastModified": 1755229570, + "narHash": "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=", "owner": "nix-community", "repo": "home-manager", - "rev": "67393957c27b4e4c6c48a60108a201413ced7800", + "rev": "11626a4383b458f8dc5ea3237eaa04e8ab1912f3", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { From e1b8df4a30b1814a7647e2cf4c3b5b0d982aedca Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 22 Aug 2025 21:48:50 -0400 Subject: [PATCH 28/29] Update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index b7aac96..9d84693 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1755229570, - "narHash": "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=", + "lastModified": 1755810213, + "narHash": "sha256-QdenO8f0PTg+tC6HuSvngKcbRZA5oZKmjUT+MXKOLQg=", "owner": "nix-community", "repo": "home-manager", - "rev": "11626a4383b458f8dc5ea3237eaa04e8ab1912f3", + "rev": "6911d3e7f475f7b3558b4f5a6aba90fa86099baa", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { From 43a9eaed266292ca45035cb475fe73ebe0f27d58 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 22 Aug 2025 21:49:12 -0400 Subject: [PATCH 29/29] Switch conda->uv and add sqlite cli --- hosts/default/configuration.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index d61c228..28d673f 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -235,7 +235,9 @@ in # $ nix search wget environment.systemPackages = with pkgs; [ binutils # gnu bin utils - conda # python environment management + # conda # python environment management + uv # alternative for python env management... + sqlite-interactive # sqlite cli duckdb # wanted mostly as cli for SQL on csv files neovim # next gen vim w/lua wget # url fetcher/spider