Compare commits
8 commits
Author | SHA1 | Date | |
---|---|---|---|
|
430d2fdb1f | ||
|
50e1cab175 | ||
|
5d831405a0 | ||
|
16b1667373 | ||
|
73146c6a5d | ||
|
6dfade4734 | ||
|
881db84a26 | ||
|
fa636e3eaf |
3 changed files with 40 additions and 43 deletions
12
flake.lock
generated
12
flake.lock
generated
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748737919,
|
"lastModified": 1750973805,
|
||||||
"narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=",
|
"narHash": "sha256-BZXgag7I0rnL/HMHAsBz3tQrfKAibpY2vovexl2lS+Y=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "5675a9686851d9626560052a032c4e14e533c1fa",
|
"rev": "080e8b48b0318b38143d5865de9334f46d51fce3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -22,11 +22,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748460289,
|
"lastModified": 1750776420,
|
||||||
"narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=",
|
"narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102",
|
"rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -55,11 +55,14 @@
|
||||||
# Temporarily pin to 6.12 to fix llvm/rocm build
|
# Temporarily pin to 6.12 to fix llvm/rocm build
|
||||||
# https://github.com/NixOS/nixpkgs/issues/368672#issuecomment-2608697421
|
# https://github.com/NixOS/nixpkgs/issues/368672#issuecomment-2608697421
|
||||||
# boot.kernelPackages = pkgs.linuxPackages_6_12;
|
# 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
|
# nct6775 - for monitoring functions on ASUS ROG STRIX B550-F GAMING WIFI II
|
||||||
# kvm-amd - AMD virtualization support
|
# kvm-amd - AMD virtualization support
|
||||||
boot.kernelModules = [ "kvm-amd" "nct6775" ];
|
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
|
# Direct patching for enabling for async reprojection (for SteamVR) on AMD
|
||||||
# boot.kernelPatches = [
|
# boot.kernelPatches = [
|
||||||
# {
|
# {
|
||||||
|
@ -190,6 +193,7 @@
|
||||||
#networking.firewall.allowedTCPPorts = [ 9003 ];
|
#networking.firewall.allowedTCPPorts = [ 9003 ];
|
||||||
|
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
|
enable = true;
|
||||||
allowedTCPPorts = [ 9003 ];
|
allowedTCPPorts = [ 9003 ];
|
||||||
allowedUDPPorts = [ 51820 ];
|
allowedUDPPorts = [ 51820 ];
|
||||||
# if packets are still dropped, they will show up in dmesg
|
# if packets are still dropped, they will show up in dmesg
|
||||||
|
@ -197,8 +201,8 @@
|
||||||
checkReversePath = "loose";
|
checkReversePath = "loose";
|
||||||
extraCommands = ''
|
extraCommands = ''
|
||||||
# Enable connections to Ollama for VPN users:
|
# 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.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
|
# wireguard trips rpfilter up
|
||||||
#extraCommands = ''
|
#extraCommands = ''
|
||||||
|
@ -249,7 +253,6 @@
|
||||||
libreoffice-qt # libreoffice - qt is best for KDE
|
libreoffice-qt # libreoffice - qt is best for KDE
|
||||||
hunspell # spell checking
|
hunspell # spell checking
|
||||||
hunspellDicts.en_US # spell check dictionary
|
hunspellDicts.en_US # spell check dictionary
|
||||||
#corectl # this doesn't exist????
|
|
||||||
magic-wormhole # transfer files with ease
|
magic-wormhole # transfer files with ease
|
||||||
screen # terminal multiplexer...from GNU
|
screen # terminal multiplexer...from GNU
|
||||||
gnumake # build automation tool
|
gnumake # build automation tool
|
||||||
|
@ -271,8 +274,8 @@
|
||||||
lutris # game launcher (EA/Humble/Ubi++)
|
lutris # game launcher (EA/Humble/Ubi++)
|
||||||
cruft # python-based template processor
|
cruft # python-based template processor
|
||||||
nmap # network mapping/scanning tool
|
nmap # network mapping/scanning tool
|
||||||
basalt-monado # tracking for VR
|
# basalt-monado # tracking for VR
|
||||||
opencomposite # compatibility layer for VR
|
# opencomposite # compatibility layer for VR
|
||||||
# why did these two disappear???
|
# why did these two disappear???
|
||||||
usbutils # provide lsusb, etc.
|
usbutils # provide lsusb, etc.
|
||||||
pciutils # provide lspci, etc.
|
pciutils # provide lspci, etc.
|
||||||
|
@ -440,11 +443,11 @@
|
||||||
};
|
};
|
||||||
# VR
|
# VR
|
||||||
#Commmand: `renice -20 -p $(pgrep monado)` may help w/issues
|
#Commmand: `renice -20 -p $(pgrep monado)` may help w/issues
|
||||||
services.monado = {
|
# services.monado = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
defaultRuntime = true; # Register as default OpenXR runtime
|
# defaultRuntime = true; # Register as default OpenXR runtime
|
||||||
forceDefaultRuntime = true; # Register as default OpenXR runtime for each user (remove home-manager file)
|
# forceDefaultRuntime = true; # Register as default OpenXR runtime for each user (remove home-manager file)
|
||||||
};
|
# };
|
||||||
#systemd.user.services.monado.environment = {
|
#systemd.user.services.monado.environment = {
|
||||||
# WMR_HANDTRACKING = "0"; # Enable for hand tracking
|
# WMR_HANDTRACKING = "0"; # Enable for hand tracking
|
||||||
# XRT_PRINT_OPTIONS = "1"; # Enable printing env vars set/available
|
# XRT_PRINT_OPTIONS = "1"; # Enable printing env vars set/available
|
||||||
|
@ -459,12 +462,6 @@
|
||||||
|
|
||||||
programs.steam.gamescopeSession.enable = true;
|
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
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
|
|
@ -73,30 +73,30 @@
|
||||||
# EDITOR = "emacs";
|
# EDITOR = "emacs";
|
||||||
};
|
};
|
||||||
# For Monado:
|
# 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:
|
# 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 = ''
|
# xdg.configFile."openvr/openvrpaths.vrpath".text = ''
|
||||||
{
|
# {
|
||||||
"config" :
|
# "config" :
|
||||||
[
|
# [
|
||||||
"${config.xdg.dataHome}/Steam/config"
|
# "${config.xdg.dataHome}/Steam/config"
|
||||||
],
|
# ],
|
||||||
"external_drivers" : null,
|
# "external_drivers" : null,
|
||||||
"jsonid" : "vrpathreg",
|
# "jsonid" : "vrpathreg",
|
||||||
"log" :
|
# "log" :
|
||||||
[
|
# [
|
||||||
"${config.xdg.dataHome}/Steam/logs"
|
# "${config.xdg.dataHome}/Steam/logs"
|
||||||
],
|
# ],
|
||||||
"runtime" :
|
# "runtime" :
|
||||||
[
|
# [
|
||||||
"${pkgs.opencomposite}/lib/opencomposite"
|
# "${pkgs.opencomposite}/lib/opencomposite"
|
||||||
],
|
# ],
|
||||||
"version" : 1
|
# "version" : 1
|
||||||
}
|
# }
|
||||||
'';
|
# '';
|
||||||
# Let Home Manager install and manage itself.
|
# Let Home Manager install and manage itself.
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue