Compare commits
No commits in common. "063ce150a574b045c03514e82b99b48c50af6448" and "ef4473d3804dc19e8c1af894f5c296e4f5e35108" have entirely different histories.
063ce150a5
...
ef4473d380
3 changed files with 50 additions and 73 deletions
12
flake.lock
generated
12
flake.lock
generated
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745593878,
|
"lastModified": 1744987093,
|
||||||
"narHash": "sha256-Rq5qNnUWuhQTqzXDcminu7Z1FPSB1wUaKIEfPTyZkAs=",
|
"narHash": "sha256-IVioWVz5qVtHiqosesW7CJW//m/yADr7cVdgF1P4N8s=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "542078066b1a99cdc5d5fce1365f98b847ca0b5a",
|
"rev": "5e6a8203cee7cc33b2e0d9a0adb7268f46447292",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -22,11 +22,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745391562,
|
"lastModified": 1744932701,
|
||||||
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
|
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
|
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -18,40 +18,27 @@
|
||||||
./main-user.nix
|
./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."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";
|
|
||||||
};
|
|
||||||
|
|
||||||
# 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
|
# 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;
|
||||||
|
@ -61,18 +48,20 @@
|
||||||
boot.kernelModules = [ "kvm-amd" "nct6775" ];
|
boot.kernelModules = [ "kvm-amd" "nct6775" ];
|
||||||
|
|
||||||
# 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 = [
|
||||||
# {
|
{
|
||||||
# name = "amdgpu-ignore-ctx-privileges";
|
name = "amdgpu-ignore-ctx-privileges";
|
||||||
# patch = pkgs.fetchpatch {
|
patch = pkgs.fetchpatch {
|
||||||
# name = "cap_sys_nice_begone.patch";
|
name = "cap_sys_nice_begone.patch";
|
||||||
# url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch";
|
url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch";
|
||||||
# hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo=";
|
hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo=";
|
||||||
# };
|
};
|
||||||
# }
|
}
|
||||||
#];
|
];
|
||||||
services.fwupd.enable = true;
|
services.fwupd.enable = true;
|
||||||
services.hardware.openrgb.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:
|
# Feel like I should be sure this is safe w/flakes first:
|
||||||
#system.autoUpgrade.enable = true;
|
#system.autoUpgrade.enable = true;
|
||||||
|
@ -284,10 +273,13 @@
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
};
|
};
|
||||||
# Orchestrator for FOSS VR stack
|
# Orchestrator for FOSS VR stack
|
||||||
#programs.envision = {
|
programs.envision = {
|
||||||
# enable = true;
|
enable = true;
|
||||||
# openFirewall = true; # This is set true by default
|
openFirewall = true; # This is set true by default
|
||||||
#};
|
};
|
||||||
|
#nixpkgs.config.permittedInsecurePackages = [
|
||||||
|
# "electron-27.3.11"
|
||||||
|
#];
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
anonymousPro
|
anonymousPro
|
||||||
corefonts
|
corefonts
|
||||||
|
@ -433,11 +425,10 @@
|
||||||
};
|
};
|
||||||
# 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)
|
#};
|
||||||
};
|
|
||||||
#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
|
||||||
|
@ -465,5 +456,6 @@
|
||||||
# Before changing this value read the documentation for this option
|
# Before changing this value read the documentation for this option
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
system.stateVersion = "24.05"; # Did you read the comment?
|
system.stateVersion = "24.05"; # Did you read the comment?
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
15
vr.nix
15
vr.nix
|
@ -1,15 +0,0 @@
|
||||||
{
|
|
||||||
inputs = {
|
|
||||||
nixpkgs-xr.url = "github:nix-community/nixpkgs-xr";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = { nixpkgs, nixpkgs-xr, ... }: {
|
|
||||||
nixosConfigurations.foo = nixpkgs.lib.nixosSystem {
|
|
||||||
# ...
|
|
||||||
modules = [
|
|
||||||
# ...
|
|
||||||
nixpkgs-xr.nixosModules.nixpkgs-xr
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue